9d5cc540b4
migration for new db_tables
2014-02-01 16:58:35 +01:00
9006bf355d
Merge pull request #100 from timgraham/readme
...
Fixed some formatting in the README.
2014-01-31 13:49:20 -08:00
380882295f
Fixed some formatting in the README.
2014-01-31 14:18:46 -05:00
d240e5c7ab
Merge pull request #99 from webu/issue2516-of-cms
...
add notify_on_autoadd_children for issue divio/django-cms#2516
2014-01-29 12:53:06 -08:00
43c2846edc
correction of doc display
2014-01-29 19:25:51 +01:00
7e158de1ae
add documentation about using the plugin with default_plugins from CMS_PLACEHOLDER_CONF
2014-01-29 19:22:18 +01:00
41a19867c1
Merge pull request #94 from yakky/feature/sanitizer
...
Configurable sanitizer
2014-01-29 07:57:38 -08:00
d14eb72b9b
add notify_on_autoadd_children for issue divio/django-cms#2516
2014-01-28 10:41:20 +01:00
72179b80c1
Push version
2014-01-16 15:57:07 +01:00
cae45cbef1
Merge pull request #96 from divio/feature/translatable-content
...
Added get/set_translatable_content overwrites for the link plugin
2014-01-16 06:54:36 -08:00
8aa4a9ffc0
You should only call this with an instance already so this is not needed anymore
2014-01-15 12:03:16 +01:00
1d7d215338
Added get/set_translatable_content overwrites for the link plugin
2014-01-15 11:50:08 +01:00
99f5f77191
Fixes after proofreading
2014-01-07 18:01:34 +01:00
a94e26d5fb
Merge pull request #95 from igloox/master
...
Fixed the 'Edit Plugin' context menu option from breaking
2014-01-02 09:35:03 -08:00
55caf8cea4
Fixed the 'Edit Plugin' context menu option from breaking when trying to decide whether or not to display.
2014-01-02 15:09:05 +00:00
c9f3c436ed
Configurable sanitizer
2013-12-28 23:45:30 +01:00
8de6fa7b1e
Merge pull request #91 from timgraham/django.utils.simplejson
...
Removed use of django.utils.simplejson which is deprecated.
2013-12-28 01:51:04 -08:00
10e92478d4
Removed use of django.utils.simplejson which is deprecated.
2013-12-14 12:15:41 -05:00
c2fba71969
Merge branch 'master' of github.com:divio/djangocms-text-ckeditor
2013-12-13 16:40:20 +01:00
dec47072ea
2.0.5
2013-12-13 16:40:00 +01:00
4e15d55770
updated locales
2013-12-13 16:39:40 +01:00
963e188c42
removed unused import
2013-12-11 17:13:22 +01:00
dfca9d0b6e
remove not required text/javascript
2013-12-09 08:21:49 +01:00
0b0cb169c8
add additional api option for cms3
2013-12-09 08:21:49 +01:00
b10020f4c9
Merge pull request #71 from jrief/fix-issue-300
...
Possible solution to fix long outstanding issue 300
2013-12-02 04:20:25 -08:00
acc0462648
Renamed CMSPlaceholder -> CMS
2013-12-02 09:56:36 +01:00
cf175a9b88
Use deprecation warning to warn against the usage of toolbar=CMS
2013-12-02 09:47:51 +01:00
a72e66d0c7
version bump
2013-11-28 10:54:29 +01:00
5184850468
Merge pull request #58 from mpaolini/disable_image_dnd
...
Optionally disable the Drag And Drop image feature.
2013-11-28 01:14:47 -08:00
6374188d9b
Merge pull request #88 from yourcelf/patch-1
...
Handle blank mime_type's in inline image data
2013-11-28 01:12:14 -08:00
741c33294a
Merge branch 'master' of https://github.com/divio/djangocms-text-ckeditor into fix-issue-300
2013-11-27 23:30:21 +01:00
ee4e153a99
Merge pull request #89 from ollb/bugfix/auto_maximize_ckeditor
...
Handle auto-maximizing ckeditor directly in plugin
2013-11-26 23:07:02 -08:00
b639b98250
Rename a cms.ckeditor.js function
2013-11-26 20:23:36 +01:00
7684c5b525
Handle auto-maximizing ckeditor directly in plugin
...
Two fixes :
- we haven't to rely on timeout to maximize ckeditor.
- when editing a custom model with a ckeditor and other fields, the
ckeditor is no longer maximized when modal is maximized.
2013-11-26 01:51:44 +01:00
5de845ad2b
Fix js typo
2013-11-26 01:50:21 +01:00
6f739b5db7
remove reload as this issue has been fixed within the cms: https://github.com/divio/django-cms/pull/2337
2013-11-22 07:38:49 +01:00
70286e2055
Merge pull request #86 from divio/feature/ckeditor_4.3
...
update to 4.3
2013-11-21 22:37:43 -08:00
f877f1cdee
Handle blank mime_type's in inline image data
...
Addresses issue #79 . Fall back to an attempt to open the given image data with PIL and convert to JPEG if no image type is specified in the mime_type for Base64 inline images.
2013-11-21 16:47:26 -07:00
e515447730
Merge pull request #84 from mpaolini/fix_depends_south_migration
...
Make migration dependant on `cms`.
2013-11-16 23:48:03 -08:00
9452b89d6a
Make it dependent on `cms:0001_initial` as advised by @yakky.
2013-11-16 22:35:50 +01:00
822bd1b326
Merge branch 'master' into fix-issue-300
...
Conflicts:
djangocms_text_ckeditor/templates/cms/plugins/widgets/ckeditor.html
2013-11-15 20:37:56 +01:00
20f57c5242
Merge branch 'master' of https://github.com/divio/djangocms-text-ckeditor
2013-11-15 20:29:18 +01:00
5a6749a2b0
update to 4.3
2013-11-15 09:01:57 +01:00
d08bf8bc38
Merge pull request #82 from ianare/ckeditor_4.2.1
...
Update ckeditor to version 4.2.1
2013-11-14 23:50:14 -08:00
b2e03b6422
Update README.rst
...
added CKEditor informations
2013-11-15 08:43:32 +01:00
888c53e4a8
Merge pull request #76 from taigh/patch-1
...
Update plugin.js
2013-11-13 00:45:12 -08:00
f8e4c2a60a
Merge pull request #85 from crooksey/master
...
adding missing requirement
2013-11-13 00:11:04 -08:00
e61da74936
changing pil to pillow
2013-10-31 16:51:49 +00:00
949e1116f9
adding missing requirement
2013-10-30 11:46:47 +00:00
38990fbe71
Make migration dependant on `cms`.
2013-10-28 11:49:26 +01:00
Patrick Lauber
Iacopo Spalletti
Tim Graham
DylannCordel
Dylann CORDEL
Kim Thoenen
Iacopo Spalletti
Stephen Watkin
FinalAngel
Jacob Rief
Angelo Dini
Olivier Le Brouster
yourcelf
Marco Paolini
Luke Crooks