Merge branch 'master' into dev#12992_custom_fields
Conflicts: cosmogramme/php/_init.php
Branches
Tags
Showing
- CONTRIB.fr.md 176 additions, 0 deletionsCONTRIB.fr.md
- VERSIONS 2529 additions, 2479 deletionsVERSIONS
- application/modules/admin/controllers/AccueilController.php 1 addition, 1 deletionapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/AlbumController.php 1 addition, 3 deletionsapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/controllers/BatchController.php 14 additions, 0 deletionsapplication/modules/admin/controllers/BatchController.php
- application/modules/admin/controllers/FormationController.php 104 additions, 101 deletions...ication/modules/admin/controllers/FormationController.php
- application/modules/admin/controllers/MenusController.php 91 additions, 136 deletionsapplication/modules/admin/controllers/MenusController.php
- application/modules/admin/controllers/NewsletterController.php 179 additions, 146 deletions...cation/modules/admin/controllers/NewsletterController.php
- application/modules/admin/controllers/RssController.php 36 additions, 111 deletionsapplication/modules/admin/controllers/RssController.php
- application/modules/admin/controllers/SitoController.php 2 additions, 0 deletionsapplication/modules/admin/controllers/SitoController.php
- application/modules/admin/controllers/UsergroupController.php 4 additions, 6 deletions...ication/modules/admin/controllers/UsergroupController.php
- application/modules/admin/views/scripts/batch/index.phtml 8 additions, 6 deletionsapplication/modules/admin/views/scripts/batch/index.phtml
- application/modules/admin/views/scripts/batch/run-ajax.phtml 40 additions, 0 deletionsapplication/modules/admin/views/scripts/batch/run-ajax.phtml
- application/modules/admin/views/scripts/formation/inscriptions.phtml 5 additions, 3 deletions.../modules/admin/views/scripts/formation/inscriptions.phtml
- application/modules/admin/views/scripts/newsletter/_newsletter_list_subscribers.phtml 1 addition, 1 deletion...ews/scripts/newsletter/_newsletter_list_subscribers.phtml
- application/modules/admin/views/scripts/newsletter/_newsletter_row.phtml 16 additions, 22 deletions...ules/admin/views/scripts/newsletter/_newsletter_row.phtml
- application/modules/admin/views/scripts/newsletter/edit-subscribers.phtml 5 additions, 2 deletions...les/admin/views/scripts/newsletter/edit-subscribers.phtml
- application/modules/admin/views/scripts/newsletter/index.phtml 8 additions, 16 deletions...cation/modules/admin/views/scripts/newsletter/index.phtml
- application/modules/admin/views/scripts/newsletter/preview.phtml 0 additions, 6 deletions...tion/modules/admin/views/scripts/newsletter/preview.phtml
- application/modules/admin/views/scripts/newsletter/send.phtml 0 additions, 3 deletions...ication/modules/admin/views/scripts/newsletter/send.phtml
Please register or sign in to comment