Merge branch 'develop'

froala · Jan 31, 2019 · cab3df3 · cab3df3
2 parents 6e3945b + d84d216
commit cab3df3
Show file tree

Hide file tree

Showing 126 changed files with 697 additions and 537 deletions.
diff --git a/FroalaEditorPlugin.php b/FroalaEditorPlugin.php
@@ -26,7 +26,7 @@ public function getName()
      */
     public function getEditorVersion()
     {
-        return '2.8.5';
+        return '2.9.0';
     }
 
     /**

diff --git a/releases.json b/releases.json
@@ -1,4 +1,12 @@
 [
+  {
+    "version": "2.9.0",
+    "downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.9.0.zip",
+    "date": "2019-01-31T20:45:00+02:00",
+    "notes": [
+      "[Improved] Updated editor to version 2.9.0 along with the plugin version."
+    ]
+  },
   {
     "version": "2.8.5",
     "downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.8.4.zip",

diff --git a/resources/lib/v2.8.5/css/froala_editor.min.css b/resources/lib/v2.8.5/css/froala_editor.min.css
diff --git a/resources/lib/v2.8.5/css/froala_editor.pkgd.min.css b/resources/lib/v2.8.5/css/froala_editor.pkgd.min.css
diff --git a/resources/lib/v2.8.5/css/froala_style.min.css b/resources/lib/v2.8.5/css/froala_style.min.css
diff --git a/resources/lib/v2.8.5/css/plugins/image.min.css b/resources/lib/v2.8.5/css/plugins/image.min.css
diff --git a/resources/lib/v2.8.5/css/themes/dark.min.css b/resources/lib/v2.8.5/css/themes/dark.min.css
diff --git a/resources/lib/v2.8.5/css/themes/gray.min.css b/resources/lib/v2.8.5/css/themes/gray.min.css
diff --git a/resources/lib/v2.8.5/css/themes/red.min.css b/resources/lib/v2.8.5/css/themes/red.min.css
diff --git a/resources/lib/v2.8.5/css/themes/royal.min.css b/resources/lib/v2.8.5/css/themes/royal.min.css
diff --git a/resources/lib/v2.8.5/js/froala_editor.min.js b/resources/lib/v2.8.5/js/froala_editor.min.js
diff --git a/resources/lib/v2.8.5/js/froala_editor.pkgd.min.js b/resources/lib/v2.8.5/js/froala_editor.pkgd.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ public function getName() @@
          */
         public function getEditorVersion()
         {
-            return '2.8.5';
+            return '2.9.0';
         }
         /**
@@ Expand Down @@