Merge pull request #137 from plone/tinymce-plone43-fix

update mockup resources - tinymce fix
plone · Apr 5, 2016 · 31b7cb8 · 31b7cb8 · seanupton · May 27, 2016
2 parents 2c016b7 + 9b7f407
commit 31b7cb8
Show file tree

Hide file tree

Showing 22 changed files with 57,349 additions and 46,594 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,11 @@ Changelog
 1.8.1 (unreleased)
 ------------------
 
+- update mockup widgets bundle and fix ``get_tinymce_options``
+  to return plugins as list (like Plone 5 does ...
+  see https://github.com/plone/mockup/commit/efd02e50904f55299eb7f00eddc6c9fcf762ffb1)
+  [petschki]
+
 - fix vocabulary lookup for related items widget.
   [petschki]
 

diff --git a/plone/app/widgets/static/widgets-bootstrap-glyphicons-halflings-regular.eot b/plone/app/widgets/static/widgets-bootstrap-glyphicons-halflings-regular.eot
diff --git a/plone/app/widgets/static/widgets-bootstrap-glyphicons-halflings-regular.svg b/plone/app/widgets/static/widgets-bootstrap-glyphicons-halflings-regular.svg
diff --git a/plone/app/widgets/static/widgets-bootstrap-glyphicons-halflings-regular.ttf b/plone/app/widgets/static/widgets-bootstrap-glyphicons-halflings-regular.ttf
diff --git a/plone/app/widgets/static/widgets-bootstrap-glyphicons-halflings-regular.woff b/plone/app/widgets/static/widgets-bootstrap-glyphicons-halflings-regular.woff
diff --git a/plone/app/widgets/static/widgets-tinymce-content.min.css b/plone/app/widgets/static/widgets-tinymce-content.min.css
diff --git a/plone/app/widgets/static/widgets-tinymce-font-tinymce-small.eot b/plone/app/widgets/static/widgets-tinymce-font-tinymce-small.eot