Merge remote-tracking branch 'refs/remotes/origin/master' into...
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#25892_module_de_demande_de_consultation_sur_place Conflicts: library/Class/WebService/SIGB/VSmart/BorrowerReader.php tests/library/Class/WebService/SIGB/VSmartFixtures.php
Showing
- VERSIONS 17 additions, 0 deletionsVERSIONS
- cosmogramme/php/integration/pseudo_notices.php 1 addition, 3 deletionscosmogramme/php/integration/pseudo_notices.php
- cosmogramme/php/integre_traite_main.php 336 additions, 319 deletionscosmogramme/php/integre_traite_main.php
- library/Class/Import/Typo3.php 1 addition, 1 deletionlibrary/Class/Import/Typo3.php
- library/Class/Profil.php 8 additions, 6 deletionslibrary/Class/Profil.php
- library/Class/WebService/SIGB/AbstractRESTService.php 9 additions, 1 deletionlibrary/Class/WebService/SIGB/AbstractRESTService.php
- library/Class/WebService/SIGB/VSmart/BorrowerReader.php 8 additions, 3 deletionslibrary/Class/WebService/SIGB/VSmart/BorrowerReader.php
- library/startup.php 1 addition, 2 deletionslibrary/startup.php
- scripts/clean_domains_url.php 38 additions, 0 deletionsscripts/clean_domains_url.php
- tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 1 addition, 1 deletion...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
- tests/db/UpgradeDBTest.php 1 addition, 1 deletiontests/db/UpgradeDBTest.php
- tests/library/Class/Import/Typo3Test.php 2 additions, 1 deletiontests/library/Class/Import/Typo3Test.php
- tests/library/Class/ProfilTest.php 84 additions, 104 deletionstests/library/Class/ProfilTest.php
- tests/library/Class/WebService/SIGB/VSmartFixtures.php 12 additions, 1 deletiontests/library/Class/WebService/SIGB/VSmartFixtures.php
Please register or sign in to comment