Merge branch 'develop'

froala · Jul 15, 2018 · e2f4719 · e2f4719
2 parents 7c0a26c + 873e3bd
commit e2f4719
Show file tree

Hide file tree

Showing 185 changed files with 11,371 additions and 59,064 deletions.
diff --git a/FroalaEditorPlugin.php b/FroalaEditorPlugin.php
@@ -26,23 +26,23 @@ public function getName()
      */
     public function getEditorVersion()
     {
-        return '2.8.1';
+        return '2.8.2';
     }
 
     /**
      * {@inheritdoc}
      */
     public function getVersion()
     {
-        return $this->getEditorVersion() . '.2';
+        return $this->getEditorVersion();
     }
 
     /**
      * {@inheritdoc}
      */
     public function getSchemaVersion()
     {
-        return $this->getVersion();
+        return '2.8.1';
     }
 
     /**

diff --git a/releases.json b/releases.json
@@ -1,4 +1,13 @@
 [
+  {
+    "version": "2.8.2",
+    "downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.8.2.zip",
+    "date": "2018-07-15T21:45:00+02:00",
+    "notes": [
+      "[Improved] Updated editor to version 2.8.2 along with the plugin version.",
+      "[Improved] Fixed setting plugin's schema version."
+    ]
+  },
   {
     "version": "2.8.1.2",
     "downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.8.1.2.zip",

diff --git a/resources/lib/.gitignore b/resources/lib/.gitignore
@@ -5,13 +5,19 @@ v*/img/
 
 v*/css/*.css
 !v*/css/*.min.css
-!v*/css/*.pkgd.css
 v*/css/plugins/*.css
 !v*/css/plugins/*.min.css
-!v*/css/plugins/*.pkgd.css
+v*/css/third_party/*.css
+!v*/css/third_party/*.min.css
+v*/css/themes/*.css
+!v*/css/themes/*.min.css
 v*/js/*.js
+v*/js/*.js.map
+v*/js/languages/*.js.map
 !v*/js/*.min.js
-!v*/js/*.pkgd.js
 v*/js/plugins/*.js
+v*/js/plugins/*.js.map
 !v*/js/plugins/*.min.js
-!v*/js/plugins/*.pkgd.js
+v*/js/third_party/*.js
+v*/js/third_party/*.js.map
+!v*/js/third_party/*.min.js