Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bert Oost committed Jan 31, 2019
2 parents cab3df3 + 267230a commit 83e2ece
Show file tree
Hide file tree
Showing 109 changed files with 140 additions and 132 deletions.
2 changes: 1 addition & 1 deletion FroalaEditorPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function getName()
*/
public function getEditorVersion()
{
return '2.9.0';
return '2.9.1';
}

/**
Expand Down
8 changes: 8 additions & 0 deletions releases.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
[
{
"version": "2.9.1",
"downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.9.1.zip",
"date": "2019-01-31T20:50:00+02:00",
"notes": [
"[Improved] Updated editor to version 2.9.1 along with the plugin version."
]
},
{
"version": "2.9.0",
"downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.9.0.zip",
Expand Down
7 changes: 0 additions & 7 deletions resources/lib/v2.9.0/css/froala_editor.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions resources/lib/v2.9.0/css/froala_editor.pkgd.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions resources/lib/v2.9.0/js/froala_editor.pkgd.min.js

This file was deleted.

7 changes: 7 additions & 0 deletions resources/lib/v2.9.1/css/froala_editor.min.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions resources/lib/v2.9.1/css/froala_editor.pkgd.min.css

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions resources/lib/v2.9.1/js/froala_editor.pkgd.min.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.9.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.9.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2018 Froala Labs
*/
Expand Down
Loading

0 comments on commit 83e2ece

Please sign in to comment.