7.5.16
Merge branch 'stable' into hotline-master Conflicts: VERSIONS library/startup.php
Showing
- VERSIONS 19 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/39780 0 additions, 1 deletionVERSIONS_HOTLINE/39780
- VERSIONS_WIP/32668 0 additions, 3 deletionsVERSIONS_WIP/32668
- VERSIONS_WIP/37281 0 additions, 1 deletionVERSIONS_WIP/37281
- VERSIONS_WIP/37314 0 additions, 1 deletionVERSIONS_WIP/37314
- application/modules/opac/controllers/CmsController.php 2 additions, 2 deletionsapplication/modules/opac/controllers/CmsController.php
- application/modules/telephone/controllers/AuthController.php 1 addition, 1 deletionapplication/modules/telephone/controllers/AuthController.php
- application/modules/telephone/controllers/CmsController.php 1 addition, 1 deletionapplication/modules/telephone/controllers/CmsController.php
- application/modules/telephone/controllers/RechercheController.php 4 additions, 0 deletions...ion/modules/telephone/controllers/RechercheController.php
- application/modules/telephone/views/scripts/auth/login-reservation.phtml 9 additions, 3 deletions...ules/telephone/views/scripts/auth/login-reservation.phtml
- application/modules/telephone/views/scripts/cms/articlesview.phtml 14 additions, 0 deletions...on/modules/telephone/views/scripts/cms/articlesview.phtml
- application/modules/telephone/views/scripts/cms/articleviewbydate.phtml 2 additions, 21 deletions...dules/telephone/views/scripts/cms/articleviewbydate.phtml
- application/modules/telephone/views/scripts/recherche/viewnotice.phtml 6 additions, 4 deletions...odules/telephone/views/scripts/recherche/viewnotice.phtml
- library/Class/Album/Renderer.php 2 additions, 1 deletionlibrary/Class/Album/Renderer.php
- library/ZendAfi/View/Helper/Notice/LienRebondAuteur.php 3 additions, 2 deletionslibrary/ZendAfi/View/Helper/Notice/LienRebondAuteur.php
- library/ZendAfi/View/Helper/TagDilicomWidget.php 23 additions, 9 deletionslibrary/ZendAfi/View/Helper/TagDilicomWidget.php
- library/ZendAfi/View/Helper/Telephone/ArticleEventList.php 61 additions, 0 deletionslibrary/ZendAfi/View/Helper/Telephone/ArticleEventList.php
- library/ZendAfi/View/Helper/Telephone/Library.php 22 additions, 0 deletionslibrary/ZendAfi/View/Helper/Telephone/Library.php
- library/ZendAfi/View/Helper/Telephone/RenderAlbum.php 0 additions, 33 deletionslibrary/ZendAfi/View/Helper/Telephone/RenderAlbum.php
- library/ZendAfi/View/Helper/Telephone/TagAlbumMediaList.php 14 additions, 14 deletionslibrary/ZendAfi/View/Helper/Telephone/TagAlbumMediaList.php
Please register or sign in to comment