Merge branch 'hotline_6.59' into 'master'
Hotline 6.59 See merge request !625
Showing
- VERSIONS 12 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/ModoController.php 3 additions, 3 deletionsapplication/modules/admin/controllers/ModoController.php
- application/modules/opac/controllers/AbonneController.php 62 additions, 78 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/BlogController.php 16 additions, 59 deletionsapplication/modules/opac/controllers/BlogController.php
- application/modules/opac/views/scripts/abonne/avis.phtml 4 additions, 18 deletionsapplication/modules/opac/views/scripts/abonne/avis.phtml
- application/modules/opac/views/scripts/abonne/avis_partial.phtml 17 additions, 1 deletion...tion/modules/opac/views/scripts/abonne/avis_partial.phtml
- ckeditor/core_five_filemanager/scripts/filemanager.js 2 additions, 2 deletionsckeditor/core_five_filemanager/scripts/filemanager.js
- ckeditor/core_five_filemanager/scripts/languages/fr.js 1 addition, 1 deletionckeditor/core_five_filemanager/scripts/languages/fr.js
- cosmogramme/php/classes/classe_notice_integration.php 4 additions, 0 deletionscosmogramme/php/classes/classe_notice_integration.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 51 additions, 0 deletionscosmogramme/tests/php/classes/NoticeIntegrationTest.php
- cosmogramme/tests/php/classes/unimarc_pomme_de_reinette.txt 1 addition, 0 deletionscosmogramme/tests/php/classes/unimarc_pomme_de_reinette.txt
- library/Class/Article.php 4 additions, 2 deletionslibrary/Class/Article.php
- library/Class/Avis.php 58 additions, 96 deletionslibrary/Class/Avis.php
- library/Class/CmsRank.php 9 additions, 11 deletionslibrary/Class/CmsRank.php
- library/Class/MultiUpload.php 5 additions, 14 deletionslibrary/Class/MultiUpload.php
- library/Class/Users.php 0 additions, 12 deletionslibrary/Class/Users.php
- library/ZendAfi/Controller/Plugin/AdminAuth.php 1 addition, 1 deletionlibrary/ZendAfi/Controller/Plugin/AdminAuth.php
- library/ZendAfi/View/Helper/AvisCms.php 27 additions, 50 deletionslibrary/ZendAfi/View/Helper/AvisCms.php
- library/startup.php 2 additions, 2 deletionslibrary/startup.php
- tests/application/modules/admin/controllers/ModoControllerTest.php 17 additions, 11 deletions...lication/modules/admin/controllers/ModoControllerTest.php
Please register or sign in to comment