Merge branch 'origin-master' into origin-sandbox_multiple_articles_selection
Conflicts: library/ZendAfi/Form.php
Branches
Tags
Showing
- VERSIONS 89 additions, 1 deletionVERSIONS
- VERSIONS_HOTLINE/47256 0 additions, 1 deletionVERSIONS_HOTLINE/47256
- VERSIONS_WIP/31718 0 additions, 1 deletionVERSIONS_WIP/31718
- VERSIONS_WIP/37124 0 additions, 1 deletionVERSIONS_WIP/37124
- VERSIONS_WIP/46014 0 additions, 1 deletionVERSIONS_WIP/46014
- application/modules/admin/controllers/AccueilController.php 7 additions, 1 deletionapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/AlbumController.php 59 additions, 0 deletionsapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/controllers/BatchController.php 13 additions, 12 deletionsapplication/modules/admin/controllers/BatchController.php
- application/modules/admin/controllers/BibController.php 0 additions, 2 deletionsapplication/modules/admin/controllers/BibController.php
- application/modules/admin/controllers/CmsController.php 2 additions, 0 deletionsapplication/modules/admin/controllers/CmsController.php
- application/modules/admin/controllers/ModulesController.php 23 additions, 0 deletionsapplication/modules/admin/controllers/ModulesController.php
- application/modules/admin/controllers/ModulesnoticeController.php 16 additions, 57 deletions...ion/modules/admin/controllers/ModulesnoticeController.php
- application/modules/admin/controllers/NewsletterController.php 1 addition, 1 deletion...cation/modules/admin/controllers/NewsletterController.php
- application/modules/admin/controllers/RecordsController.php 64 additions, 0 deletionsapplication/modules/admin/controllers/RecordsController.php
- application/modules/admin/controllers/SitoController.php 0 additions, 57 deletionsapplication/modules/admin/controllers/SitoController.php
- application/modules/admin/controllers/SystemeController.php 1 addition, 1 deletionapplication/modules/admin/controllers/SystemeController.php
- application/modules/admin/controllers/UploadController.php 2 additions, 32 deletionsapplication/modules/admin/controllers/UploadController.php
- application/modules/admin/views/scripts/accueil/formations-widget.phtml 4 additions, 2 deletions...dules/admin/views/scripts/accueil/formations-widget.phtml
- application/modules/admin/views/scripts/accueil/login.phtml 4 additions, 24 deletionsapplication/modules/admin/views/scripts/accueil/login.phtml
- application/modules/admin/views/scripts/album/add-website.phtml 0 additions, 0 deletions...ation/modules/admin/views/scripts/album/add-website.phtml
Please register or sign in to comment