Merge remote-tracking branch 'refs/remotes/afi/hotline_16499_karvi' into afi-hotline_6.54
Conflicts: VERSIONS cosmogramme/php/classes/classe_notice_integration.php cosmogramme/tests/php/classes/NoticeIntegrationTest.php library/Class/AdminVar.php library/Class/WebService/SIGB/AbstractService.php library/ZendAfi/Controller/Plugin/InspectorGadget.php library/ZendAfi/View/Helper/AbsoluteUrl.php library/startup.php
Branches
Tags
Showing
- application/modules/opac/controllers/NoticeajaxController.php 1 addition, 1 deletion...ication/modules/opac/controllers/NoticeajaxController.php
- cosmogramme/php/fonctions/objets_saisie.php 1 addition, 1 deletioncosmogramme/php/fonctions/objets_saisie.php
- library/Class/WebService/SIGB/Carthame.php 4 additions, 3 deletionslibrary/Class/WebService/SIGB/Carthame.php
- library/Class/WebService/SIGB/Carthame/Service.php 19 additions, 9 deletionslibrary/Class/WebService/SIGB/Carthame/Service.php
- library/ZendAfi/View/Helper/Notice/Exemplaires.php 13 additions, 12 deletionslibrary/ZendAfi/View/Helper/Notice/Exemplaires.php
- tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 1 addition, 1 deletion...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
- tests/library/Class/WebService/SIGB/CarthameTest.php 84 additions, 36 deletionstests/library/Class/WebService/SIGB/CarthameTest.php
Please register or sign in to comment