[fc] Repository: mockup

Branch: refs/heads/master Date: 2018-09-14T07:52:50+02:00 Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com> Commit: plone/mockup@7861923 include TinyMCE 4.7.13 Files changed: M CHANGES.rst M bower.json Repository: mockup Branch: refs/heads/master Date: 2018-09-14T15:51:55+02:00 Author: Sune Broendum Woeller (sunew) <sune@woeller.dk> Commit: plone/mockup@036f5f6 Merge pull request #866 from plone/erral-update-tinymce Update TinyMCE to version 4.7.13 Files changed: M CHANGES.rst M bower.json
plone · Sep 14, 2018 · 6b67b53 · 6b67b53
1 parent 4dd4a7b
commit 6b67b53
Showing 1 changed file with 25 additions and 6 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,15 +1,34 @@
-Repository: Products.CMFDynamicViewFTI
+Repository: mockup
 
 
 Branch: refs/heads/master
-Date: 2018-09-14T15:42:02+02:00
-Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
-Commit: https://github.com/plone/Products.CMFDynamicViewFTI/commit/8a6731bdf766991f7b45a5d2522fb08883caadce
+Date: 2018-09-14T07:52:50+02:00
+Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
+Commit: https://github.com/plone/mockup/commit/7861923401923e2a079276eee81e0a8621f2a6c4
 
-prepare merge
+include TinyMCE 4.7.13
 
 Files changed:
 M CHANGES.rst
+M bower.json
 
-b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 5e5cb33..c0ead5a 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -1,7 +1,7 @@\n Changelog\n =========\n \n-5.0.1 (unreleased)\n+6.0.0 (unreleased)\n ------------------\n \n Breaking changes:\n'
+b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex a9a824317..04913edaa 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -10,6 +10,9 @@ Breaking changes:\n \n New features:\n \n+- Include TinyMCE 4.7.13\n+  [erral]\n+\n - pat-structure: Use the datatables pattern for sorting columns \n   [frapell]\n \ndiff --git a/bower.json b/bower.json\nindex bff753fac..07da0f87e 100644\n--- a/bower.json\n+++ b/bower.json\n@@ -45,7 +45,7 @@\n     "requirejs-text": "2.0.15",\n     "select2": "3.5.4",\n     "selectivizr": "1.0.2",\n-    "tinymce-builded": "4.7.6",\n+    "tinymce-builded": "4.7.13",\n     "js-shortcuts": "^1.0.1",\n     "cs-jqtree-contextmenu": "^0.1.0"\n   },\n'
+
+Repository: mockup
+
+
+Branch: refs/heads/master
+Date: 2018-09-14T15:51:55+02:00
+Author: Sune Broendum Woeller (sunew) <sune@woeller.dk>
+Commit: https://github.com/plone/mockup/commit/036f5f6e80270796a6a13dfc21bdcb5e96ff080a
+
+Merge pull request #866 from plone/erral-update-tinymce
+
+Update TinyMCE to version 4.7.13
+
+Files changed:
+M CHANGES.rst
+M bower.json
+
+b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex cd2faaff1..cbe657204 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -10,6 +10,9 @@ Breaking changes:\n \n New features:\n \n+- Include TinyMCE 4.7.13\n+  [erral]\n+\n - pat-structure: Use the datatables pattern for sorting columns \n   [frapell]\n \ndiff --git a/bower.json b/bower.json\nindex bff753fac..07da0f87e 100644\n--- a/bower.json\n+++ b/bower.json\n@@ -45,7 +45,7 @@\n     "requirejs-text": "2.0.15",\n     "select2": "3.5.4",\n     "selectivizr": "1.0.2",\n-    "tinymce-builded": "4.7.6",\n+    "tinymce-builded": "4.7.13",\n     "js-shortcuts": "^1.0.1",\n     "cs-jqtree-contextmenu": "^0.1.0"\n   },\n'