From 7ef3d2d33ee043bc58a1e5a0685b6f79cb6635e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alejandro=20Alvarez=20Mendoza?= Date: Fri, 15 Apr 2016 07:56:53 -0500 Subject: [PATCH 1/2] Update CHANGELOG.md Adding release 1.3.0 and 1.4.0 information. --- CHANGELOG.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eaf5bb6..0f9fc03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ Changelog ========= +Release 1.4.0 +------------- + +https://github.com/CakeDC/TinyMCE/tree/1.4.0 + + * [b1858b7](https://github.com/CakeDC/TinyMCE/commit/b1858b7) Adding goblal setting to override TinyMCE version + * [ba7145e](https://github.com/CakeDC/TinyMCE/commit/ba7145e) Changing defaults setting from construct + +Release 1.3.0 +------------- + +https://github.com/CakeDC/TinyMCE/tree/1.3.0 + + * [65ea3c5](https://github.com/CakeDC/TinyMCE/commit/65ea3c5) Updating TinyMCE to 4.3.8 version and setting as default version. + Release 1.2.0 ------------- @@ -12,4 +27,4 @@ https://github.com/CakeDC/TinyMCE/tree/1.2.0 * [60c53a4](https://github.com/CakeDC/TinyMCE/commit/60c53a4) Updating TinyMCE to 4.0.26 * [12c5169](https://github.com/CakeDC/TinyMCE/commit/12c5169) Refactoring the helper a little * [299baed](https://github.com/CakeDC/TinyMCE/commit/299baed) Adding TinyMCE 4.0.10 Jquery, keeping the old version 3 as default. - * [92dd568](https://github.com/CakeDC/TinyMCE/commit/92dd568) Updating TinyMCE to 3.5.10 \ No newline at end of file + * [92dd568](https://github.com/CakeDC/TinyMCE/commit/92dd568) Updating TinyMCE to 3.5.10 From ff180167b3acf64b606728e9e513356f472f7ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alejandro=20Alvarez=20Mendoza?= Date: Fri, 15 Apr 2016 08:05:28 -0500 Subject: [PATCH 2/2] Correcting misspelling --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f9fc03..188a5e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Release 1.4.0 https://github.com/CakeDC/TinyMCE/tree/1.4.0 - * [b1858b7](https://github.com/CakeDC/TinyMCE/commit/b1858b7) Adding goblal setting to override TinyMCE version + * [b1858b7](https://github.com/CakeDC/TinyMCE/commit/b1858b7) Adding global setting to override TinyMCE version * [ba7145e](https://github.com/CakeDC/TinyMCE/commit/ba7145e) Changing defaults setting from construct Release 1.3.0