Merge remote-tracking branch 'refs/remotes/origin/master' into dev#14279_integrations_exemplaires
Conflicts: VERSIONS cosmogramme/php/_init.php cosmogramme/sql/patch/patch_212.sql cosmogramme/tests/php/classes/NoticeIntegrationTest.php
Branches
Tags
Showing
- VERSIONS 26 additions, 0 deletionsVERSIONS
- application/modules/admin/views/scripts/accueil/_options_catalogue_panier.phtml 1 addition, 1 deletion...min/views/scripts/accueil/_options_catalogue_panier.phtml
- application/modules/admin/views/scripts/menus/catalogue.phtml 1 addition, 1 deletion...ication/modules/admin/views/scripts/menus/catalogue.phtml
- application/modules/opac/controllers/JavaController.php 1 addition, 2 deletionsapplication/modules/opac/controllers/JavaController.php
- application/modules/opac/controllers/PanierController.php 1 addition, 1 deletionapplication/modules/opac/controllers/PanierController.php
- application/modules/opac/controllers/RechercheController.php 44 additions, 42 deletionsapplication/modules/opac/controllers/RechercheController.php
- application/modules/opac/controllers/RssController.php 52 additions, 50 deletionsapplication/modules/opac/controllers/RssController.php
- application/modules/opac/views/scripts/panier/creer-panier-ajax.phtml 1 addition, 1 deletion...modules/opac/views/scripts/panier/creer-panier-ajax.phtml
- application/modules/opac/views/scripts/panier/edit.phtml 1 addition, 1 deletionapplication/modules/opac/views/scripts/panier/edit.phtml
- cosmogramme/php/_init.php 3 additions, 3 deletionscosmogramme/php/_init.php
- cosmogramme/php/classes/classe_unimarc.php 15 additions, 14 deletionscosmogramme/php/classes/classe_unimarc.php
- cosmogramme/sql/patch/patch_212.sql 1 addition, 3 deletionscosmogramme/sql/patch/patch_212.sql
- cosmogramme/sql/patch/patch_213.sql 3 additions, 0 deletionscosmogramme/sql/patch/patch_213.sql
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 228 additions, 145 deletionscosmogramme/tests/php/classes/NoticeIntegrationTest.php
- cosmogramme/tests/php/classes/test-genre-multiple-902.txt 1 addition, 0 deletionscosmogramme/tests/php/classes/test-genre-multiple-902.txt
- cosmogramme/tests/php/classes/unimarc_archeo_animaux.txt 1 addition, 1 deletioncosmogramme/tests/php/classes/unimarc_archeo_animaux.txt
- cosmogramme/tests/php/classes/unimarc_dossier64.txt 1 addition, 0 deletionscosmogramme/tests/php/classes/unimarc_dossier64.txt
- library/Class/Album.php 1 addition, 0 deletionslibrary/Class/Album.php
- library/Class/Autocomplete/IndexSearcher.php 11 additions, 7 deletionslibrary/Class/Autocomplete/IndexSearcher.php
- library/Class/AvisNotice.php 1 addition, 2 deletionslibrary/Class/AvisNotice.php
Please register or sign in to comment