Merge branch 'hotline' into 'hotline#123924_gpsea_p2_responsive_murgrille_carrousel'
# Conflicts: # library/templates/Chili/Library/Settings.php
Branches
Tags
Showing
- VERSIONS_HOTLINE/122611 1 addition, 0 deletionsVERSIONS_HOTLINE/122611
- VERSIONS_HOTLINE/122685 1 addition, 0 deletionsVERSIONS_HOTLINE/122685
- VERSIONS_HOTLINE/123680 1 addition, 0 deletionsVERSIONS_HOTLINE/123680
- VERSIONS_HOTLINE/123836 1 addition, 0 deletionsVERSIONS_HOTLINE/123836
- VERSIONS_HOTLINE/123849 1 addition, 0 deletionsVERSIONS_HOTLINE/123849
- VERSIONS_HOTLINE/124421 1 addition, 0 deletionsVERSIONS_HOTLINE/124421
- application/modules/opac/controllers/AbonneController.php 2 additions, 1 deletionapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/FormulaireController.php 1 addition, 1 deletion...ication/modules/opac/controllers/FormulaireController.php
- cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php 47 additions, 13 deletions...n/modules/cosmo/controllers/DataProfileControllerTest.php
- cosmogramme/tests/php/classes/CarthameIntegrationTest.php 2 additions, 2 deletionscosmogramme/tests/php/classes/CarthameIntegrationTest.php
- cosmogramme/tests/php/classes/NanookRecordsIntegrationTest.php 1 addition, 1 deletion...gramme/tests/php/classes/NanookRecordsIntegrationTest.php
- library/Class/Notice.php 12 additions, 19 deletionslibrary/Class/Notice.php
- library/Class/NoticeUnimarc.php 1 addition, 1 deletionlibrary/Class/NoticeUnimarc.php
- library/Class/ProfilePrefs.php 3 additions, 6 deletionslibrary/Class/ProfilePrefs.php
- library/templates/Chili/Library/Settings.php 3 additions, 0 deletionslibrary/templates/Chili/Library/Settings.php
- library/templates/Chili/View/Abonne.php 3 additions, 5 deletionslibrary/templates/Chili/View/Abonne.php
- library/templates/Chili/View/AbstractHighlightCarousel.php 14 additions, 0 deletionslibrary/templates/Chili/View/AbstractHighlightCarousel.php
- library/templates/Intonation/Library/View/Wrapper/Abstract.php 4 additions, 4 deletions...ry/templates/Intonation/Library/View/Wrapper/Abstract.php
- library/templates/Intonation/Library/View/Wrapper/Article.php 4 additions, 9 deletions...ary/templates/Intonation/Library/View/Wrapper/Article.php
- library/templates/Intonation/Library/Widget/Carousel/View.php 0 additions, 1 deletion...ary/templates/Intonation/Library/Widget/Carousel/View.php
Please register or sign in to comment