Merge branch 'hotline-master' into 'master'
Hotline master See merge request !1265
Branches
Tags
Showing
- VERSIONS 15 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/AccueilController.php 6 additions, 0 deletionsapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/AlbumController.php 5 additions, 2 deletionsapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/controllers/ModoController.php 6 additions, 5 deletionsapplication/modules/admin/controllers/ModoController.php
- application/modules/admin/views/scripts/modo/avisnotice.phtml 45 additions, 29 deletions...ication/modules/admin/views/scripts/modo/avisnotice.phtml
- application/modules/opac/controllers/OaiController.php 18 additions, 18 deletionsapplication/modules/opac/controllers/OaiController.php
- library/Class/Article.php 0 additions, 1 deletionlibrary/Class/Article.php
- library/Class/Notice.php 2 additions, 2 deletionslibrary/Class/Notice.php
- library/Class/WebService/Fnac.php 1 addition, 1 deletionlibrary/Class/WebService/Fnac.php
- library/ZendAfi/Form/Album.php 9 additions, 4 deletionslibrary/ZendAfi/Form/Album.php
- library/ZendAfi/View/Helper/Article/RenderSummary.php 1 addition, 0 deletionslibrary/ZendAfi/View/Helper/Article/RenderSummary.php
- library/ZendAfi/View/Helper/Article/RenderTitleOnlyCalendar.php 5 additions, 5 deletions...y/ZendAfi/View/Helper/Article/RenderTitleOnlyCalendar.php
- library/ZendAfi/View/Helper/Article/RenderTitleOnlyCalendarWithBib.php 9 additions, 8 deletions...fi/View/Helper/Article/RenderTitleOnlyCalendarWithBib.php
- library/ZendAfi/View/Helper/Article/RenderTitleOnlyCalendarWithCatalogue.php 6 additions, 6 deletions...w/Helper/Article/RenderTitleOnlyCalendarWithCatalogue.php
- library/ZendAfi/View/Helper/AvisBloc.php 39 additions, 21 deletionslibrary/ZendAfi/View/Helper/AvisBloc.php
- library/ZendAfi/View/Helper/CalendarContent.php 2 additions, 2 deletionslibrary/ZendAfi/View/Helper/CalendarContent.php
- library/ZendAfi/View/Helper/Pager.php 1 addition, 3 deletionslibrary/ZendAfi/View/Helper/Pager.php
- library/startup.php 2 additions, 1 deletionlibrary/startup.php
- public/admin/css/global.css 17 additions, 1 deletionpublic/admin/css/global.css
- public/admin/js/notification/css/jquery_notification.css 15 additions, 7 deletionspublic/admin/js/notification/css/jquery_notification.css
Please register or sign in to comment