Merge branch 'hotline_6.51'
Conflicts: cosmogramme/php/_init.php cosmogramme/tests/php/classes/NoticeIntegrationTest.php tests/application/modules/opac/controllers/CmsControllerTest.php
Showing
- VERSIONS 20 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/AuthController.php 19 additions, 25 deletionsapplication/modules/admin/controllers/AuthController.php
- application/modules/opac/controllers/CmsController.php 2 additions, 1 deletionapplication/modules/opac/controllers/CmsController.php
- application/modules/opac/controllers/ErrorController.php 3 additions, 3 deletionsapplication/modules/opac/controllers/ErrorController.php
- application/modules/opac/views/scripts/error/404.phtml 3 additions, 3 deletionsapplication/modules/opac/views/scripts/error/404.phtml
- application/modules/telephone/controllers/ErrorController.php 2 additions, 5 deletions...ication/modules/telephone/controllers/ErrorController.php
- application/modules/telephone/views/scripts/error/404.phtml 6 additions, 0 deletionsapplication/modules/telephone/views/scripts/error/404.phtml
- cosmogramme/php/classes/classe_notice_integration.php 9 additions, 8 deletionscosmogramme/php/classes/classe_notice_integration.php
- cosmogramme/sql/patch/patch_215.php 3 additions, 0 deletionscosmogramme/sql/patch/patch_215.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 32 additions, 0 deletionscosmogramme/tests/php/classes/NoticeIntegrationTest.php
- cosmogramme/tests/php/classes/RepairCodifAuthorTest.php 160 additions, 0 deletionscosmogramme/tests/php/classes/RepairCodifAuthorTest.php
- cosmogramme/tests/php/classes/unimarc_ledu_stephanie.txt 1 addition, 0 deletionscosmogramme/tests/php/classes/unimarc_ledu_stephanie.txt
- library/Class/CodifAuteur.php 35 additions, 3 deletionslibrary/Class/CodifAuteur.php
- library/Class/Notice.php 132 additions, 112 deletionslibrary/Class/Notice.php
- library/Class/Notice/Facette.php 9 additions, 10 deletionslibrary/Class/Notice/Facette.php
- library/Class/WebService/SIGB/Dynix/TitleInfoResponseReader.php 23 additions, 23 deletions...y/Class/WebService/SIGB/Dynix/TitleInfoResponseReader.php
- library/ZendAfi/Controller/Plugin/AdminAuth.php 12 additions, 18 deletionslibrary/ZendAfi/Controller/Plugin/AdminAuth.php
- library/ZendAfi/View/Helper/TagBanniere.php 8 additions, 4 deletionslibrary/ZendAfi/View/Helper/TagBanniere.php
- library/ZendAfi/View/Helper/TagCyberlibrisBook.php 2 additions, 3 deletionslibrary/ZendAfi/View/Helper/TagCyberlibrisBook.php
- library/ZendAfi/View/Helper/Telephone/Tags/Toolbar.php 9 additions, 6 deletionslibrary/ZendAfi/View/Helper/Telephone/Tags/Toolbar.php
Please register or sign in to comment