Merge remote-tracking branch 'refs/remotes/afi/hotline_6.54' into afi-master
Conflicts: library/storm
Showing
- VERSIONS_HOTLINE/17196 1 addition, 0 deletionsVERSIONS_HOTLINE/17196
- VERSIONS_HOTLINE/17262 1 addition, 0 deletionsVERSIONS_HOTLINE/17262
- application/modules/opac/controllers/NoticeajaxController.php 1 addition, 1 deletion...ication/modules/opac/controllers/NoticeajaxController.php
- cosmogramme/php/classes/classe_profil_donnees.php 29 additions, 64 deletionscosmogramme/php/classes/classe_profil_donnees.php
- cosmogramme/php/fonctions/objets_saisie.php 1 addition, 1 deletioncosmogramme/php/fonctions/objets_saisie.php
- cosmogramme/php/fonctions/variables.php 28 additions, 23 deletionscosmogramme/php/fonctions/variables.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 10 additions, 11 deletionscosmogramme/tests/php/classes/NoticeIntegrationTest.php
- cosmogramme/tests/php/classes/NoticeIntegrationTypeDocTest.php 44 additions, 0 deletions...gramme/tests/php/classes/NoticeIntegrationTypeDocTest.php
- cosmogramme/tests/php/classes/unimarc_musiques_europes.txt 1 addition, 0 deletionscosmogramme/tests/php/classes/unimarc_musiques_europes.txt
- library/Class/Batch/IndexRessourcesNumeriques.php 13 additions, 3 deletionslibrary/Class/Batch/IndexRessourcesNumeriques.php
- library/Class/WebService/BibNumerique/Cyberlibris/LivresNumeriquesReader.php 2 additions, 2 deletions...rvice/BibNumerique/Cyberlibris/LivresNumeriquesReader.php
- library/Class/WebService/BibNumerique/RessourceNumerique.php 12 additions, 10 deletionslibrary/Class/WebService/BibNumerique/RessourceNumerique.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/Entete.php 17 additions, 11 deletionslibrary/ZendAfi/View/Helper/Notice/Entete.php
- library/ZendAfi/View/Helper/Notice/Exemplaires.php 13 additions, 12 deletionslibrary/ZendAfi/View/Helper/Notice/Exemplaires.php
- library/storm 1 addition, 1 deletionlibrary/storm
- tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 1 addition, 1 deletion...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
- tests/application/modules/opac/controllers/RechercheControllerTest.php 10 additions, 0 deletions...tion/modules/opac/controllers/RechercheControllerTest.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