Skip to content

Commit

Permalink
Update to 2.2.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanneculai committed Mar 2, 2016
1 parent 1b6c274 commit c87ae48
Show file tree
Hide file tree
Showing 81 changed files with 164 additions and 164 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "froala/wysiwyg-cake",
"version": "2.2.0",
"version": "2.2.1",
"description": "A beautiful jQuery WYSIWYG text editor based on HTML5 technology. Cross browser, with mobile support, high performance and Retina Ready modern design.",
"type": "cakephp-plugin",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions webroot/css/froala_editor.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/froala_style.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/plugins/char_counter.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/plugins/code_view.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/plugins/colors.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/plugins/draggable.min.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
6 changes: 3 additions & 3 deletions webroot/css/plugins/emoticons.min.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

.clearfix::after{clear:both;display:block;content:""}.fr-popup .fr-emoticon{display:inline-block;font-size:20px;width:20px;padding:5px;line-height:1;cursor:default;font-weight:400;font-family:"Apple Color Emoji","Segoe UI Emoji",NotoColorEmoji,"Segoe UI Symbol","Android Emoji",EmojiSymbols;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}
.clearfix::after{clear:both;display:block;content:""}.fr-popup .fr-emoticon{display:inline-block;font-size:20px;width:20px;padding:5px;line-height:1;cursor:default;font-weight:400;font-family:"Apple Color Emoji","Segoe UI Emoji",NotoColorEmoji,"Segoe UI Symbol","Android Emoji",EmojiSymbols;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fr-popup .fr-emoticon img{height:20px}
4 changes: 2 additions & 2 deletions webroot/css/plugins/file.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/plugins/fullscreen.min.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/css/plugins/image.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/plugins/image_manager.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/plugins/line_breaker.min.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/css/plugins/quick_insert.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/plugins/table.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/plugins/video.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/themes/dark.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/themes/gray.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/themes/red.min.css

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

4 changes: 2 additions & 2 deletions webroot/css/themes/royal.min.css

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

8 changes: 4 additions & 4 deletions webroot/js/froala_editor.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions webroot/js/languages/ar.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/bs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/cs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/da.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/de.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/en_ca.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/en_gb.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/es.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/et.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/fa.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/fi.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/fr.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/he.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/hr.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/hu.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/id.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/it.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/ja.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/ko.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/me.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/nb.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/nl.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/pl.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
4 changes: 2 additions & 2 deletions webroot/js/languages/pt_br.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* froala_editor v2.2.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2016 Froala Labs
*/

Expand Down
Loading

0 comments on commit c87ae48

Please sign in to comment.