Merge remote-tracking branch...
Merge remote-tracking branch 'refs/remotes/afi/dev#43603_lille_metro_cosmogramme_possibilite_de_pointer_le_code_barre_dans_le_champ_9496' into afi-master # Conflicts: # cosmogramme/php/_init.php # cosmogramme/sql/patch/patch_300.php # tests/db/UpgradeDBTest.php
Showing
- VERSIONS_WIP/43603 1 addition, 0 deletionsVERSIONS_WIP/43603
- cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php 7 additions, 1 deletion...n/modules/cosmo/controllers/DataProfileControllerTest.php
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/php/classes/classe_notice_integration.php 18 additions, 27 deletionscosmogramme/php/classes/classe_notice_integration.php
- cosmogramme/php/classes/classe_notice_marc21.php 275 additions, 280 deletionscosmogramme/php/classes/classe_notice_marc21.php
- cosmogramme/php/classes/classe_unimarc.php 39 additions, 8 deletionscosmogramme/php/classes/classe_unimarc.php
- cosmogramme/sql/patch/patch_302.php 6 additions, 0 deletionscosmogramme/sql/patch/patch_302.php
- cosmogramme/tests/php/classes/NoticeIntegrationBiblixTest.php 7 additions, 9 deletions...ogramme/tests/php/classes/NoticeIntegrationBiblixTest.php
- cosmogramme/tests/php/classes/NoticeIntegrationLibermediaTest.php 74 additions, 0 deletions...mme/tests/php/classes/NoticeIntegrationLibermediaTest.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 1 addition, 0 deletionscosmogramme/tests/php/classes/NoticeIntegrationTest.php
- cosmogramme/tests/php/classes/marc21_libermedia_vocabulaire.txt 1 addition, 0 deletions...ramme/tests/php/classes/marc21_libermedia_vocabulaire.txt
- library/Class/IntBib.php 15 additions, 8 deletionslibrary/Class/IntBib.php
- library/Class/IntProfilDonnees.php 56 additions, 3 deletionslibrary/Class/IntProfilDonnees.php
- tests/db/UpgradeDBTest.php 16 additions, 0 deletionstests/db/UpgradeDBTest.php
Please register or sign in to comment