Commit Graph

219 Commits

Author SHA1 Message Date
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
Iacopo Spalletti 6182ea4d6a Merge pull request #122 from mmarzantowicz/install-requires
Update INSTALL_REQUIRES in setup.py
2014-04-27 19:46:47 +02:00
Mateusz Marzantowicz 2d7a3d6edd Update INSTALL_REQUIRES in setup.py 2014-04-10 11:07:58 +02:00
FinalAngel 28e5e10c16 adding HorizontalRule 2014-04-07 17:41:52 +02:00
Angelo Dini 98e31fa09e fixes #107 2014-03-17 08:17:10 +01:00
Patrick Lauber 2049a7d754 Merge pull request #111 from asmaps/patch-1
Extend README
2014-03-06 15:28:46 +01:00
Arne Schauf 263d1600ee Extend README
Add a hint to README to check django-cms doc on how to add a plugin to the "CMS Plugins" dropdown.
2014-03-06 15:27:00 +01:00
Patrick Lauber 8f410cb221 version bump 2014-03-06 14:59:27 +01:00
Patrick Lauber 5c4e0fc24f Merge pull request #110 from asmaps/patch-1
Fix a typo
2014-03-06 14:58:04 +01:00
Arne Schauf ea9622ce44 Fix a typo
Fix a typo I found while scrolling over the template.
2014-03-06 14:57:16 +01:00
Patrick Lauber d437a370b9 locales updated 2014-03-05 09:46:22 +01:00
FinalAngel df350c37b0 update cms paths 2014-03-05 08:49:21 +01:00
Iacopo Spalletti 2efd1b0439 Merge pull request #108 from jrief/fix-missing-unlocalize
Add missing unlocalize filters
2014-02-22 08:21:10 +01:00
Jacob Rief ff1afa5242 Removed debug info 2014-02-21 23:41:57 +01:00
Jacob Rief b6c80eda9b Add missing unlocalize filters 2014-02-21 23:33:01 +01:00
Kim Thoenen 9b57a11b1c Merge pull request #105 from divio/fix/broken-migrations
Fix/broken migrations
2014-02-11 16:18:12 +01:00
Kim Thoenen fc8eedc8e9 version bump 2014-02-11 15:33:34 +01:00
Kim Thoenen 092918f13d Fixed issue with migrations 2014-02-11 15:33:24 +01:00
Patrick Lauber d6eb801df3 version bump 2014-02-07 17:51:47 +01:00
Patrick Lauber 8061276558 Merge branch 'master' of github.com:divio/djangocms-text-ckeditor 2014-02-07 17:48:13 +01:00
Patrick Lauber bd12205ea9 Merge pull request #103 from divio/fix/removing-plugins
Added try/excepts for deprecated imports
2014-02-05 15:51:40 +01:00
Kim Thoenen fc43753d26 Removed warnings, added check for TEXT_SAVE_IMAGE_FUNCTION 2014-02-05 15:48:17 +01:00
Kim Thoenen 9301e196e3 Added try/excepts for deprecated imports 2014-02-05 15:36:32 +01:00
Kim Thoenen 174d822e06 Revert "fixed circular import"
This reverts commit fd57e018f5.
2014-02-05 14:30:12 +01:00
Kim Thoenen fd57e018f5 fixed circular import 2014-02-05 14:24:00 +01:00
Kim Thoenen 3a18396a77 updated import to match newest cms 2014-02-05 14:18:55 +01:00
Patrick Lauber a55948f65e version bump 2014-02-03 13:01:30 +01:00
Patrick Lauber 8aa7916ce1 Merge pull request #101 from digi604/db_rename
migration for new db_tables
2014-02-03 03:59:19 -08:00
Patrick Lauber acf0051d52 Merge pull request #102 from digi604/locales
locales updated
2014-02-01 08:02:12 -08:00
Patrick Lauber 8444608b51 locales updated 2014-02-01 17:00:19 +01:00
Patrick Lauber 9d5cc540b4 migration for new db_tables 2014-02-01 16:58:35 +01:00
Iacopo Spalletti 9006bf355d Merge pull request #100 from timgraham/readme
Fixed some formatting in the README.
2014-01-31 13:49:20 -08:00
Tim Graham 380882295f Fixed some formatting in the README. 2014-01-31 14:18:46 -05:00
Patrick Lauber 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
DylannCordel 43c2846edc correction of doc display 2014-01-29 19:25:51 +01:00
DylannCordel 7e158de1ae add documentation about using the plugin with default_plugins from CMS_PLACEHOLDER_CONF 2014-01-29 19:22:18 +01:00
Patrick Lauber 41a19867c1 Merge pull request #94 from yakky/feature/sanitizer
Configurable sanitizer
2014-01-29 07:57:38 -08:00
Dylann CORDEL d14eb72b9b add notify_on_autoadd_children for issue divio/django-cms#2516 2014-01-28 10:41:20 +01:00
Kim Thoenen 72179b80c1 Push version 2014-01-16 15:57:07 +01:00
Patrick Lauber 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
Kim Thoenen 8aa4a9ffc0 You should only call this with an instance already so this is not needed anymore 2014-01-15 12:03:16 +01:00
Kim Thoenen 1d7d215338 Added get/set_translatable_content overwrites for the link plugin 2014-01-15 11:50:08 +01:00
Iacopo Spalletti 99f5f77191 Fixes after proofreading 2014-01-07 18:01:34 +01:00
Iacopo Spalletti 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
Stephen Watkin 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
Iacopo Spalletti c9f3c436ed Configurable sanitizer 2013-12-28 23:45:30 +01:00
Iacopo Spalletti 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
Tim Graham 10e92478d4 Removed use of django.utils.simplejson which is deprecated. 2013-12-14 12:15:41 -05:00
Patrick Lauber c2fba71969 Merge branch 'master' of github.com:divio/djangocms-text-ckeditor 2013-12-13 16:40:20 +01:00