1051f72a5c
Add TEXT_ADDITIONAL_PROTOCOLS setting
...
html5lib by default restricts what protocols are allowed in links et al.
It also offers a way to extend this list which previously was not
exposed to djangocms_text_ckeditor but can now be manipulated with the
TEXT_ADDITIONAL_PROTOCOLS setting.
2014-08-03 17:25:19 +02:00
adf4a7c104
Merge pull request #158 from mmarzantowicz/feature/fix-urlib-for-django-1.4
...
django.utils.six supports urllib since 1.5 - we need to do imports the old way
2014-07-31 18:59:52 +02:00
f8700bf147
django.utils.six supports urlib since 1.5 - we need to do imports the old way
2014-07-31 15:07:40 +02:00
93e9b22a17
Merge pull request #154 from mmarzantowicz/feature/fix_stringio_error
...
Fixed: TypeError: initial_value must be str or None, not bytes
2014-07-30 22:40:31 +02:00
97ea29deab
Merge pull request #155 from maestrofjp/master
...
DOCO: Added information about usage of HTMLField
2014-07-30 22:40:05 +02:00
8cd18af3f2
DOCO: Added information about usage of HTMLField
...
Spent quite a bit of time trying to figure out why additional plugins were showing up inside the text editor when using HTMLField. Found out it isn't supported when using this field in this issue:
https://github.com/divio/djangocms-text-ckeditor/issues/72
Decided that I'm not the first person to run into this question, so I'm documenting it for future reference.
2014-07-30 12:20:59 -05:00
16ae4b34ca
Fixed: TypeError: initial_value must be str or None, not bytes
2014-07-29 14:47:40 +02:00
a61a5b48e1
Merge pull request #144 from mmarzantowicz/feature/django-utils-six
...
Make use of django.utils.six
2014-07-29 09:59:45 +02:00
d88a170be4
Merge pull request #145 from yakky/fix_merge
...
Fix ckeditor path issues
2014-06-20 09:06:46 +02:00
6babddec17
Remove logging
2014-06-20 09:06:28 +02:00
5caf84c10d
Fix ckeditor path issues
2014-06-20 00:50:44 +02:00
b6fb880aed
Import StringIO from django.utils.six.moves
2014-06-19 17:55:55 +02:00
fd1d8d1f00
Import urljoin from django.utils.six.moves
2014-06-19 17:52:37 +02:00
b1ea5551bd
Merge pull request #140 from ucdavis-agecon/master
...
Fixes #139 . Properly construct ckeditor_basepath in cms_plugins.py to eliminate the double slashes
2014-06-17 07:45:13 +02:00
0658a059ff
Merge pull request #142 from mmarzantowicz/feature/static_move
...
Move static files to djangocms_text_ckeditor directory
2014-06-16 09:30:33 +02:00
a38754193d
fix URLs to reflect new static file location
2014-06-15 16:58:55 +02:00
698561316e
move static files to djangocms_text_ckeditor subdirectory
2014-06-15 16:40:37 +02:00
4fa93f0deb
Fixes #139 . Properly construct ckeditor_basepath in cms_plugins.py to eliminate the double slashes.
2014-06-13 12:32:29 -07:00
6990bd4968
locales and wheel support and version bump
2014-06-06 10:19:35 +02:00
b415e447d0
Merge pull request #136 from yakky/feature/cleanup
...
Minor code cleanups. Restoring Py3
2014-06-06 08:04:35 +02:00
20f97b5bcd
Merge pull request #135 from yakky/feature/sanitizer_2
...
Fix sanitizer
2014-06-06 08:03:26 +02:00
f61af7305d
Minor code cleanups. Restoring Py3
2014-06-06 08:02:54 +02:00
70597cc8b4
Fix sanitizer
2014-06-06 08:02:18 +02:00
e8dc34bf3c
Merge pull request #134 from mpaolini/option_disable_html_sanitizer_take_4
...
Optionally disable HTML sanitizing.
Fix #128
2014-06-05 20:09:24 +02:00
a2e8fbd2c6
Optionally disable HTML sanitizing.
2014-06-05 20:05:07 +02:00
05408380e6
Merge pull request #130 from johnraz/Issue129-body-should-not-be-a-proxy
...
Fix #129 , force_unicode on body to make sure it's not a proxy object anymore
2014-06-04 17:17:04 +02:00
1ceafc941b
version bump to 2.1.5
2014-06-04 17:15:07 +02:00
02bc269dfd
Merge pull request #121 from yakky/feature/configuration
...
Allow ckeditor customization in HTMLField
thanks @yakky, closes #132
2014-06-04 17:13:02 +02:00
65d43a3249
Better handling of CMS/HTMLField toolbar selection
2014-06-04 16:31:04 +02:00
be659a9df5
Use force_text for django 1.5+ on yakky's recommendation
2014-05-25 16:12:04 +02:00
65c9934936
Fix #129 , force_unicode on body to make sure it's not a proxy object anymore
2014-05-25 15:39:43 +02:00
3e41c226a3
Add documentation
2014-05-18 12:11:27 +02:00
3a9a98e66a
Allow custom configuration for CMS plugin widget
2014-05-18 11:51:45 +02:00
e648d80924
Fix switch between CMS and HTMLField toolbar
2014-05-18 11:51:45 +02:00
c35290ca45
Allow ckeditor customization in HTMLField
2014-05-18 11:51:45 +02:00
f20f1aa810
Merge pull request #127 from jgoettsch/master
...
Set window.CKEDITOR_BASEPATH in text_plugin_change_form.html to fix #124 properly
2014-05-18 11:48:18 +02:00
c37187ac11
Merge pull request #119 from itcrab/bugfix/many-editors-in-inline-admin
...
fix for admin inline when on page many ckeditors.
2014-05-18 11:33:28 +02:00
ad91c0fe24
Introduce CKEDITOR_BASEPATH to the text_plugin_change_form.html template. Fixes #124 .
2014-05-15 12:49:34 -07:00
eeaee308b5
Set window.CKEDITOR_BASEPATH in text_plugin_change_form.html to fix #124 .
2014-05-14 16:50:37 -07:00
5ccf6ca00b
Small fixes.
2014-05-05 21:09:20 +06:00
6b15ad3385
Removed many places where we set class for CKEditor and make only one place for this.
2014-05-05 21:07:56 +06:00
a54a5882e3
Remove loop from ".add-row" buttons.
2014-05-05 19:22:44 +06:00
6ec6e1acf0
Fix check equals.
2014-04-28 18:57:14 +06:00
f81e415dd0
Code styling.
2014-04-28 18:55:06 +06:00
6182ea4d6a
Merge pull request #122 from mmarzantowicz/install-requires
...
Update INSTALL_REQUIRES in setup.py
2014-04-27 19:46:47 +02:00
c8ecf8f6b6
Fix not started CKEditor when I used plugins extending "TextPlugin".
2014-04-15 23:52:13 +06:00
f3b5188a1a
Fix "add-row" link in admin inline for initial CKEditor when it's placed in new row admin inline.
2014-04-13 23:53:47 +06:00
d3d0d102ca
Remove hard container relation with initialization CKEditor (initial CKEditor in all DOM-elements with class "CMS_CKEditor").
2014-04-13 23:51:09 +06:00
6f4f59655a
Move initial CKEditor code to function and run it when '#container' ready.
2014-04-13 23:39:51 +06:00
47dc1824da
fix for admin inline when on page many ckeditors.
2014-04-12 22:46:20 +06:00
Horst Gutmann
Iacopo Spalletti
Mateusz Marzantowicz
Peter Farrell
Iacopo Spalletti
Jeffrey Goettsch
Patrick Lauber
Marco Paolini
Kim Thoenen
Jonathan Liuti
Arcady Usov