Merge remote-tracking branch 'refs/remotes/afi/community_slider_navigation_percent' into afi-master
# Conflicts: # tests/application/modules/admin/controllers/AccueilControllerCmsTest.php
Showing
- VERSIONS_DEV/community_slider_navigation_percent 1 addition, 0 deletionsVERSIONS_DEV/community_slider_navigation_percent
- library/ZendAfi/View/Helper/Accueil/Base.php 1 addition, 0 deletionslibrary/ZendAfi/View/Helper/Accueil/Base.php
- library/ZendAfi/View/Helper/Admin/ImageViewersOptions.php 10 additions, 10 deletionslibrary/ZendAfi/View/Helper/Admin/ImageViewersOptions.php
- public/opac/java/diaporama_navigation/defaults.ini 1 addition, 0 deletionspublic/opac/java/diaporama_navigation/defaults.ini
- public/opac/java/diaporama_navigation/properties.phtml 11 additions, 1 deletionpublic/opac/java/diaporama_navigation/properties.phtml
- public/opac/java/slider_navigation/slider_navigation.js 49 additions, 29 deletionspublic/opac/java/slider_navigation/slider_navigation.js
- public/opac/java/slider_navigation/tests/agenda_slider_test.js 16 additions, 3 deletions...c/opac/java/slider_navigation/tests/agenda_slider_test.js
- public/opac/java/slider_navigation/tests/news_slider_test.js 1 addition, 1 deletionpublic/opac/java/slider_navigation/tests/news_slider_test.js
- public/opac/java/slider_navigation/tests/preview_slider_test.js 1 addition, 1 deletion.../opac/java/slider_navigation/tests/preview_slider_test.js
- tests/application/modules/admin/controllers/AccueilControllerCmsTest.php 6 additions, 0 deletions...on/modules/admin/controllers/AccueilControllerCmsTest.php
- tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php 3 additions, 2 deletionstests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php
- tests/library/ZendAfi/View/Helper/Accueil/NewsTest.php 3 additions, 3 deletionstests/library/ZendAfi/View/Helper/Accueil/NewsTest.php
Please register or sign in to comment