Merge remote-tracking branch 'refs/remotes/origin/master' into origin-12091_domains_browsing
Conflicts: tests/library/Class/WebService/VodeclicTest.php
Branches
Tags
Showing
- application/modules/admin/controllers/OpdsController.php 1 addition, 1 deletionapplication/modules/admin/controllers/OpdsController.php
- application/modules/admin/views/scripts/opds/browse.phtml 2 additions, 2 deletionsapplication/modules/admin/views/scripts/opds/browse.phtml
- cosmogramme/php/_menu.php 0 additions, 1 deletioncosmogramme/php/_menu.php
- cosmogramme/php/classes/classe_abonne.php 15 additions, 4 deletionscosmogramme/php/classes/classe_abonne.php
- cosmogramme/php/classes/classe_sql.php 4 additions, 3 deletionscosmogramme/php/classes/classe_sql.php
- cosmogramme/php/integre_generation_pergame.php 11 additions, 9 deletionscosmogramme/php/integre_generation_pergame.php
- cosmogramme/tests/php/classes/AbonneIntegrationTest.php 35 additions, 21 deletionscosmogramme/tests/php/classes/AbonneIntegrationTest.php
- library/Class/IntMajAuto.php 27 additions, 0 deletionslibrary/Class/IntMajAuto.php
- library/Class/OpdsCatalog.php 1 addition, 6 deletionslibrary/Class/OpdsCatalog.php
- library/Class/WebService/BibNumerique/RessourceNumerique.php 1 addition, 1 deletionlibrary/Class/WebService/BibNumerique/RessourceNumerique.php
- library/Class/WebService/OPDS/CatalogEntry.php 11 additions, 0 deletionslibrary/Class/WebService/OPDS/CatalogEntry.php
- library/Class/WebService/OPDS/CatalogReader.php 2 additions, 0 deletionslibrary/Class/WebService/OPDS/CatalogReader.php
- scripts/emacs/phafi-mode.el 4 additions, 4 deletionsscripts/emacs/phafi-mode.el
- tests/application/modules/admin/controllers/HarvestControllerToutApprendreTest.php 19 additions, 32 deletions.../admin/controllers/HarvestControllerToutApprendreTest.php
- tests/application/modules/admin/controllers/HarvestControllerVodeclicTest.php 1 addition, 1 deletion...dules/admin/controllers/HarvestControllerVodeclicTest.php
- tests/application/modules/admin/controllers/OpdsControllerTest.php 3 additions, 2 deletions...lication/modules/admin/controllers/OpdsControllerTest.php
- tests/library/Class/WebService/NumilogTest.php 1 addition, 1 deletiontests/library/Class/WebService/NumilogTest.php
- tests/library/Class/WebService/ToutApprendreTest.php 1 addition, 1 deletiontests/library/Class/WebService/ToutApprendreTest.php
- tests/library/Class/WebService/VodeclicTest.php 5 additions, 2 deletionstests/library/Class/WebService/VodeclicTest.php
Please register or sign in to comment