Merge branch 'hotline-master'
Conflicts: cosmogramme/php/_init.php cosmogramme/sql/patch/patch_252.php
Showing
- VERSIONS 10 additions, 2 deletionsVERSIONS
- application/modules/opac/controllers/CmsController.php 3 additions, 1 deletionapplication/modules/opac/controllers/CmsController.php
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/php/classes/classe_unimarc.php 1 addition, 1 deletioncosmogramme/php/classes/classe_unimarc.php
- cosmogramme/sql/patch/patch_236.php 1 addition, 1 deletioncosmogramme/sql/patch/patch_236.php
- cosmogramme/sql/patch/patch_253.php 10 additions, 0 deletionscosmogramme/sql/patch/patch_253.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 38 additions, 1 deletioncosmogramme/tests/php/classes/NoticeIntegrationTest.php
- cosmogramme/tests/php/classes/unimarc_petit_doucet.txt 1 addition, 0 deletionscosmogramme/tests/php/classes/unimarc_petit_doucet.txt
- library/Class/Album.php 1 addition, 1 deletionlibrary/Class/Album.php
- library/Class/Notice/SerialArticles.php 15 additions, 0 deletionslibrary/Class/Notice/SerialArticles.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- public/opac/css/global.css 5 additions, 0 deletionspublic/opac/css/global.css
- tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php 85 additions, 20 deletions...ules/opac/controllers/CmsControllerCalendarActionTest.php
- tests/library/Class/AlbumAuthorTest.php 0 additions, 61 deletionstests/library/Class/AlbumAuthorTest.php
Please register or sign in to comment