Merge branch 'dev#160166_newsletters_placeholders' into 'master'
dev#160166 : CkEditor placeholders plugin See merge request !4823
Showing
- ckeditor/config.js 1 addition, 0 deletionsckeditor/config.js
- library/Class/Article/MailRenderer.php 27 additions, 0 deletionslibrary/Class/Article/MailRenderer.php
- library/Class/Newsletter/Dispatch.php 1 addition, 1 deletionlibrary/Class/Newsletter/Dispatch.php
- library/Class/Newsletter/TemplateHelper.php 41 additions, 31 deletionslibrary/Class/Newsletter/TemplateHelper.php
- library/Class/Notice/MailRenderer.php 32 additions, 0 deletionslibrary/Class/Notice/MailRenderer.php
- library/Class/Url.php 41 additions, 0 deletionslibrary/Class/Url.php
- library/ZendAfi/Form/Admin/Newsletter.php 17 additions, 27 deletionslibrary/ZendAfi/Form/Admin/Newsletter.php
- library/ZendAfi/View/Helper/Accueil/Kiosque.php 1 addition, 1 deletionlibrary/ZendAfi/View/Helper/Accueil/Kiosque.php
- library/ZendAfi/View/Helper/CkEditor.php 13 additions, 11 deletionslibrary/ZendAfi/View/Helper/CkEditor.php
- library/templates/Intonation/Library/Widget/Carousel/Record/View.php 1 addition, 1 deletion...plates/Intonation/Library/Widget/Carousel/Record/View.php
- public/opac/js/ckeditor_plugins/bokeh_placeholders/icons/articles.png 0 additions, 0 deletions...js/ckeditor_plugins/bokeh_placeholders/icons/articles.png
- public/opac/js/ckeditor_plugins/bokeh_placeholders/icons/records.png 0 additions, 0 deletions.../js/ckeditor_plugins/bokeh_placeholders/icons/records.png
- public/opac/js/ckeditor_plugins/bokeh_placeholders/lang/en.js 4 additions, 0 deletions...ic/opac/js/ckeditor_plugins/bokeh_placeholders/lang/en.js
- public/opac/js/ckeditor_plugins/bokeh_placeholders/lang/fr.js 4 additions, 0 deletions...ic/opac/js/ckeditor_plugins/bokeh_placeholders/lang/fr.js
- public/opac/js/ckeditor_plugins/bokeh_placeholders/plugin.js 32 additions, 0 deletionspublic/opac/js/ckeditor_plugins/bokeh_placeholders/plugin.js
- tests/application/modules/admin/controllers/NewsletterControllerTest.php 221 additions, 8 deletions...on/modules/admin/controllers/NewsletterControllerTest.php
- tests/application/modules/admin/controllers/newsletter_placeholder_content_expected.html 6 additions, 0 deletions.../controllers/newsletter_placeholder_content_expected.html
- tests/application/modules/admin/controllers/newsletter_placeholder_content_expected.txt 18 additions, 0 deletions...n/controllers/newsletter_placeholder_content_expected.txt
- tests/application/modules/admin/controllers/newsletter_placeholder_content_without_articles.txt 11 additions, 0 deletions...llers/newsletter_placeholder_content_without_articles.txt
- tests/application/modules/admin/controllers/newsletter_placeholder_content_without_catalogue_expected.txt 14 additions, 0 deletions...letter_placeholder_content_without_catalogue_expected.txt
Please register or sign in to comment