Merge branch 'hotline-master' into 'master'
Hotline master See merge request !947
Showing
- VERSIONS 11 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/25392 1 addition, 0 deletionsVERSIONS_HOTLINE/25392
- VERSIONS_HOTLINE/25460 1 addition, 0 deletionsVERSIONS_HOTLINE/25460
- VERSIONS_HOTLINE/25532_epub 1 addition, 0 deletionsVERSIONS_HOTLINE/25532_epub
- application/modules/admin/controllers/RssController.php 52 additions, 140 deletionsapplication/modules/admin/controllers/RssController.php
- application/modules/admin/views/scripts/rss/rssform.phtml 3 additions, 3 deletionsapplication/modules/admin/views/scripts/rss/rssform.phtml
- library/Class/Catalogue.php 16 additions, 5 deletionslibrary/Class/Catalogue.php
- library/Class/Notice.php 4 additions, 0 deletionslibrary/Class/Notice.php
- library/Class/Rss.php 10 additions, 71 deletionslibrary/Class/Rss.php
- library/Class/ScriptLoader.php 2 additions, 2 deletionslibrary/Class/ScriptLoader.php
- library/ZendAfi/Controller/Action/Helper/SitothequeListViewMode.php 20 additions, 2 deletions...ndAfi/Controller/Action/Helper/SitothequeListViewMode.php
- library/ZendAfi/Controller/Plugin/TogetherJS.php 2 additions, 2 deletionslibrary/ZendAfi/Controller/Plugin/TogetherJS.php
- library/ZendAfi/Form/Admin/AdminVar.php 0 additions, 1 deletionlibrary/ZendAfi/Form/Admin/AdminVar.php
- library/ZendAfi/View/Helper/Admin/ListViewMode.php 3 additions, 5 deletionslibrary/ZendAfi/View/Helper/Admin/ListViewMode.php
- library/ZendAfi/View/Helper/MonocleReaderServerSide.php 2 additions, 2 deletionslibrary/ZendAfi/View/Helper/MonocleReaderServerSide.php
- library/ZendAfi/View/Helper/Notice/LienReserver.php 13 additions, 4 deletionslibrary/ZendAfi/View/Helper/Notice/LienReserver.php
- library/ZendAfi/View/Helper/Notice/Mur.php 18 additions, 15 deletionslibrary/ZendAfi/View/Helper/Notice/Mur.php
- library/ZendAfi/View/Helper/PublicListViewMode.php 1 addition, 0 deletionslibrary/ZendAfi/View/Helper/PublicListViewMode.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- public/admin/js/efm/js/monocore.js 1 addition, 1 deletionpublic/admin/js/efm/js/monocore.js
Please register or sign in to comment