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 cca6c46 commit 7b0287e
Show file tree
Hide file tree
Showing 83 changed files with 167 additions and 167 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Froala Editor comes with the plugins: block style, text & background colors, fon

.. code-block:: python
FROALA_EDITOR_PLUGINS = ('align', 'char_counter', 'code_beautifier' ,'code_view', 'colors', 'emoticons',
FROALA_EDITOR_PLUGINS = ('align', 'char_counter', 'code_beautifier' ,'code_view', 'colors', 'draggable', 'emoticons',
'entities', 'file', 'font_family', 'font_size', 'fullscreen', 'image_manager', 'image', 'inline_style',
'line_breaker', 'link', 'lists', 'paragraph_format', 'paragraph_style', 'quick_insert', 'quote', 'save', 'table',
'url', 'video')
Expand Down
4 changes: 2 additions & 2 deletions froala_editor/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PLUGINS = (
'align', 'char_counter', 'code_beautifier', 'code_view', 'colors', 'emoticons', 'entities', 'file', 'font_family',
'align', 'char_counter', 'code_beautifier', 'code_view', 'colors', 'draggable', 'emoticons', 'entities', 'file', 'font_family',
'font_size', 'fullscreen', 'image', 'image_manager', 'inline_style', 'line_breaker', 'link', 'lists',
'paragraph_format', 'paragraph_style', 'quick_insert', 'quote', 'save', 'table', 'url', 'video'
)

PLUGINS_WITH_CSS = (
'char_counter', 'code_view', 'colors', 'emoticons', 'file', 'fullscreen', 'image', 'image_manager', 'line_breaker',
'char_counter', 'code_view', 'colors', 'draggable', 'emoticons', 'file', 'fullscreen', 'image', 'image_manager', 'line_breaker',
'quick_insert', 'table', 'video',
)
4 changes: 2 additions & 2 deletions froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/css/froala_style.min.css

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.

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

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,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
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 froala_editor/static/froala_editor/css/plugins/file.min.css

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,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 froala_editor/static/froala_editor/css/plugins/image.min.css

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,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

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

4 changes: 2 additions & 2 deletions froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/js/froala_editor.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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 froala_editor/static/froala_editor/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
Loading

0 comments on commit 7b0287e

Please sign in to comment.