Commit Graph

209 Commits

Author SHA1 Message Date
Patrick Lauber dcb1a2e2c8 bump version 2014-08-27 11:42:42 +02:00
Jacob Rief 5a58b78124 Fixes #166 2014-08-27 00:37:31 +02:00
Iacopo Spalletti 2bfac7901e Change migration dependency 2014-08-19 19:06:28 +02:00
Iacopo Spalletti 0f733067de Recreate migrations 2014-08-16 14:08:12 +02:00
Patrick Lauber 5732349dd1 version bump 2014-08-14 11:43:44 +02:00
Patrick Lauber 1ae036d592 Merge pull request #157 from maestrofjp/doco_updates
Doco updates and updated ckeditor
2014-08-14 11:40:14 +02:00
Patrick Lauber 981d5dc52e Merge pull request #161 from yakky/django_17_migrations
Support Django 1.7 migrations
2014-08-14 11:37:59 +02:00
Patrick Lauber ad9eed7d15 Merge pull request #162 from yakky/feature/translated_link
Translate 'Link' string to handle link plugin in different languages
2014-08-14 11:37:47 +02:00
Iacopo Spalletti 70834259f1 Merge pull request #153 from marekmalek/master
Fixes #150. Fix for migration 0002 to handle non default database connec...
2014-08-13 15:47:16 +02:00
Iacopo Spalletti 3a93332053 Translate 'Link' string to handle link plugin in different languages 2014-08-07 23:04:32 +02:00
Horst Gutmann 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
Mateusz Marzantowicz 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
peterfarrell af28df8581 Updated ckeditor to 4.4.3 for security XSS patch and problems with 9998 family of issues with Chrome / Webkit 2014-07-30 17:04:36 -05:00
Mateusz Marzantowicz 16ae4b34ca Fixed: TypeError: initial_value must be str or None, not bytes 2014-07-29 14:47:40 +02:00
Iacopo Spalletti 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
Marek Malek 0476cfcadf Fixes #150. Fix for migration 0002 to handle non default database connections. 2014-07-25 17:39:12 +02:00
Iacopo Spalletti 0ea56f4eb7 Support Django 1.7 migrations 2014-07-25 03:48:04 +02:00
Iacopo Spalletti 6babddec17 Remove logging 2014-06-20 09:06:28 +02:00
Iacopo Spalletti 5caf84c10d Fix ckeditor path issues 2014-06-20 00:50:44 +02:00
Mateusz Marzantowicz b6fb880aed Import StringIO from django.utils.six.moves 2014-06-19 17:55:55 +02:00
Mateusz Marzantowicz fd1d8d1f00 Import urljoin from django.utils.six.moves 2014-06-19 17:52:37 +02:00
Iacopo Spalletti 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
Mateusz Marzantowicz a38754193d fix URLs to reflect new static file location 2014-06-15 16:58:55 +02:00
Mateusz Marzantowicz 698561316e move static files to djangocms_text_ckeditor subdirectory 2014-06-15 16:40:37 +02:00
Jeffrey Goettsch 4fa93f0deb Fixes #139. Properly construct ckeditor_basepath in cms_plugins.py to eliminate the double slashes. 2014-06-13 12:32:29 -07:00
Patrick Lauber 6990bd4968 locales and wheel support and version bump 2014-06-06 10:19:35 +02:00
Iacopo Spalletti f61af7305d Minor code cleanups. Restoring Py3 2014-06-06 08:02:54 +02:00
Iacopo Spalletti 70597cc8b4 Fix sanitizer 2014-06-06 08:02:18 +02:00
Marco Paolini a2e8fbd2c6 Optionally disable HTML sanitizing. 2014-06-05 20:05:07 +02:00
Iacopo Spalletti 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
Kim Thoenen 1ceafc941b version bump to 2.1.5 2014-06-04 17:15:07 +02:00
Iacopo Spalletti 65d43a3249 Better handling of CMS/HTMLField toolbar selection 2014-06-04 16:31:04 +02:00
Jonathan Liuti be659a9df5 Use force_text for django 1.5+ on yakky's recommendation 2014-05-25 16:12:04 +02:00
Jonathan Liuti 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
Iacopo Spalletti 3a9a98e66a Allow custom configuration for CMS plugin widget 2014-05-18 11:51:45 +02:00
Iacopo Spalletti e648d80924 Fix switch between CMS and HTMLField toolbar 2014-05-18 11:51:45 +02:00
Iacopo Spalletti c35290ca45 Allow ckeditor customization in HTMLField 2014-05-18 11:51:45 +02:00
Iacopo Spalletti 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
Jeffrey Goettsch ad91c0fe24 Introduce CKEDITOR_BASEPATH to the text_plugin_change_form.html template. Fixes #124. 2014-05-15 12:49:34 -07:00
Jeffrey Goettsch eeaee308b5 Set window.CKEDITOR_BASEPATH in text_plugin_change_form.html to fix #124. 2014-05-14 16:50:37 -07:00
Arcady Usov 5ccf6ca00b Small fixes. 2014-05-05 21:09:20 +06:00
Arcady Usov 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
Arcady Usov a54a5882e3 Remove loop from ".add-row" buttons. 2014-05-05 19:22:44 +06:00
Arcady Usov 6ec6e1acf0 Fix check equals. 2014-04-28 18:57:14 +06:00
Arcady Usov f81e415dd0 Code styling. 2014-04-28 18:55:06 +06:00
Arcady Usov c8ecf8f6b6 Fix not started CKEditor when I used plugins extending "TextPlugin". 2014-04-15 23:52:13 +06:00
Arcady Usov 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
Arcady Usov 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
Arcady Usov 6f4f59655a Move initial CKEditor code to function and run it when '#container' ready. 2014-04-13 23:39:51 +06:00
Arcady Usov 47dc1824da fix for admin inline when on page many ckeditors. 2014-04-12 22:46:20 +06:00