Commit Graph

288 Commits

Author SHA1 Message Date
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 3e41c226a3 Add documentation 2014-05-18 12:11:27 +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
Iacopo Spalletti 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
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
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
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
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