Merge remote-tracking branch 'refs/remotes/origin/master' into...
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64573_templates_pour_l_interface_publique_libraire_bootstrap Conflicts: library/Class/NoticeUnimarc.php
Branches
Tags
Showing
- VERSIONS 24 additions, 0 deletionsVERSIONS
- amber/afi/js/AFI-OPAC.deploy.js 37 additions, 31 deletionsamber/afi/js/AFI-OPAC.deploy.js
- amber/afi/js/AFI-OPAC.js 43 additions, 42 deletionsamber/afi/js/AFI-OPAC.js
- amber/afi/st/AFI-OPAC.st 9 additions, 16 deletionsamber/afi/st/AFI-OPAC.st
- application/modules/opac/controllers/AbonneController.php 9 additions, 9 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/views/scripts/head.phtml 5 additions, 2 deletionsapplication/modules/opac/views/scripts/head.phtml
- cosmogramme/cosmozend/application/modules/cosmo/controllers/DatabaseMigrationController.php 1 addition, 3 deletions...modules/cosmo/controllers/DatabaseMigrationController.php
- cosmogramme/cosmozend/application/modules/cosmo/views/scripts/module.phtml 1 addition, 0 deletions...zend/application/modules/cosmo/views/scripts/module.phtml
- cosmogramme/cosmozend/tests/CosmoControllerTestCase.php 1 addition, 0 deletionscosmogramme/cosmozend/tests/CosmoControllerTestCase.php
- cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DatabaseMigrationControllerTest.php 11 additions, 9 deletions...les/cosmo/controllers/DatabaseMigrationControllerTest.php
- cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DynamicFacetsControllerTest.php 27 additions, 1 deletion...modules/cosmo/controllers/DynamicFacetsControllerTest.php
- cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php 75 additions, 24 deletions...n/modules/cosmo/controllers/IntegrationControllerTest.php
- cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/MigrationFixture.php 216 additions, 0 deletions...pplication/modules/cosmo/controllers/MigrationFixture.php
- cosmogramme/css/main.css 6 additions, 0 deletionscosmogramme/css/main.css
- cosmogramme/php/_accueil.php 1 addition, 1 deletioncosmogramme/php/_accueil.php
- cosmogramme/tests/php/classes/KohaRecordIntegrationTest.php 4 additions, 2 deletionscosmogramme/tests/php/classes/KohaRecordIntegrationTest.php
- cosmogramme/tests/php/classes/ModelTestCase.php 2 additions, 0 deletionscosmogramme/tests/php/classes/ModelTestCase.php
- cosmogramme/tests/php/classes/NanookRecordsIntegrationTest.php 72 additions, 0 deletions...gramme/tests/php/classes/NanookRecordsIntegrationTest.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 8 additions, 0 deletionscosmogramme/tests/php/classes/NoticeIntegrationTest.php
- cosmogramme/tests/php/classes/NoticeUnimarcTest.php 0 additions, 11 deletionscosmogramme/tests/php/classes/NoticeUnimarcTest.php
Please register or sign in to comment