c38d62b804
Merge pull request #171 from yakky/feature/fix_setup
...
Fix setup.py to handle migrations_django package
2014-09-07 05:56:54 +02:00
b0fcb86062
Fix setup.py to handle migrations_django package
2014-09-07 05:56:30 +02:00
dcb1a2e2c8
bump version
2014-08-27 11:42:42 +02:00
8aea91cadb
Merge pull request #167 from jrief/master
...
Fixes #166
2014-08-27 09:34:26 +02:00
5a58b78124
Fixes #166
2014-08-27 00:37:31 +02:00
9b5c5bccc3
Merge pull request #165 from yakky/master
...
Recreate migrations
2014-08-20 18:44:03 +02:00
2bfac7901e
Change migration dependency
2014-08-19 19:06:28 +02:00
0f733067de
Recreate migrations
2014-08-16 14:08:12 +02:00
5732349dd1
version bump
2014-08-14 11:43:44 +02:00
1ae036d592
Merge pull request #157 from maestrofjp/doco_updates
...
Doco updates and updated ckeditor
2014-08-14 11:40:14 +02:00
981d5dc52e
Merge pull request #161 from yakky/django_17_migrations
...
Support Django 1.7 migrations
2014-08-14 11:37:59 +02:00
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
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
a479f33567
Merge pull request #163 from zerok/tox
...
Integrate test suite with tox
2014-08-13 08:30:04 +02:00
e549a3c7a8
Integrate test suite with tox
2014-08-10 16:58:06 +02:00
3a93332053
Translate 'Link' string to handle link plugin in different languages
2014-08-07 23:04:32 +02:00
4849794ac0
Merge pull request #149 from zerok/additional_protocols
...
Add TEXT_ADDITIONAL_PROTOCOLS setting
2014-08-04 20:57:09 +02:00
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
58908f40d3
Added doco regarding the usages of super.render
...
when using TextPlugin
2014-07-30 21:47:59 -05:00
96b5094ba3
Update README.rst
2014-07-30 21:46:18 -05:00
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
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
0476cfcadf
Fixes #150 . Fix for migration 0002 to handle non default database connections.
2014-07-25 17:39:12 +02:00
0ea56f4eb7
Support Django 1.7 migrations
2014-07-25 03:48:04 +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
Iacopo Spalletti
Iacopo Spalletti
Patrick Lauber
Jacob Rief
Horst Gutmann
Mateusz Marzantowicz
Peter Farrell
peterfarrell
Marek Malek
Jeffrey Goettsch
Marco Paolini
Kim Thoenen