Commit Graph

288 Commits

Author SHA1 Message Date
Angelo Dini 38741aab09 Merge pull request #44 from FinalAngel/master
Fixes issues with plugin data
2013-07-11 09:01:13 -07:00
Angelo Dini a3cec0ec86 fixes an issue where icon and plugin data are not set correctly 2013-07-11 17:40:07 +02:00
Angelo Dini 90aced8b1f remove plugins 2013-07-11 17:35:29 +02:00
Iacopo Spalletti 632350e26c Merge pull request #42 from yakky/feature/fix_readme
Fix formatting issue in README

Fixes #43, #41
2013-07-11 04:16:12 -07:00
Iacopo Spalletti 47fa914504 Fix formatting issue in README 2013-07-11 13:12:57 +02:00
Iacopo Spalletti 2b6883cf52 Update README.rst
Document compatibility with django CMS versions
2013-07-11 13:11:14 +02:00
Patrick Lauber 1b341e3d98 version bump to 2.0 2013-07-10 17:10:27 +02:00
Iacopo Spalletti 50a2687f2c Merge pull request #40 from yakky/feature/fix_plugin_id
Fix parent_it in POST
2013-07-10 06:48:24 -07:00
Iacopo Spalletti ca55b9a776 Fix parent_it in POST 2013-07-10 15:47:24 +02:00
Iacopo Spalletti 30c94d0f9e Merge pull request #39 from FinalAngel/master
This fixes plugin insertion for 3.0
Fixes #38, #37, #33
2013-07-10 06:40:11 -07:00
Angelo Dini c1f832021e remove console.log 2013-07-10 10:15:04 +02:00
Angelo Dini 031bafe14c add current icons for plugin preview 2013-07-10 08:49:59 +02:00
Angelo Dini 5e59859461 this makes plugins-in-plugins work again 2013-07-10 08:49:34 +02:00
Angelo Dini 9a2e9bc58d ignore DS_Store files 2013-07-10 08:49:16 +02:00
Angelo Dini 3c2d2647f8 add placeholder to context 2013-07-09 18:04:00 +02:00
Angelo Dini 0f03d4f958 first approach to get plugins working 2013-07-09 18:03:47 +02:00
Angelo Dini 8ec5887b2f add correct namespacing for 3.0 2013-07-09 18:03:28 +02:00
Angelo Dini 54d0ae9470 remove not required admin form 2013-07-09 18:03:06 +02:00
Patrick Lauber ffb8830429 1.0.10 2013-06-10 14:35:08 +02:00
Patrick Lauber 6eb6d91019 locales updated 2013-06-10 14:34:07 +02:00
Patrick Lauber 5ff5eaf9b0 Merge pull request #30 from ojii/master
What's better than 2 Pythons? 3000 Pythons!
2013-06-10 05:20:04 -07:00
Jonas Obrist 4c12e12419 What's better than 2 Pythons? 3000 Pythons! 2013-06-10 20:41:01 +09:00
Patrick Lauber 3fc08e4cac Merge pull request #29 from ojii/master
Python 3.3 support
2013-06-10 04:39:19 -07:00
Jonas Obrist 4962cd1b21 Update html.py 2013-06-08 22:25:48 +09:00
Jonas Obrist 6b8cc876cc more py3 imports 2013-06-08 00:46:28 +09:00
Jonas Obrist 04b8d41f8e python 3 compatible import 2013-06-08 00:37:30 +09:00
Jonas Obrist 29cfa7d116 python 3 compatibility with StringIO 2013-06-08 00:35:11 +09:00
Jonas Obrist 4b6cb48da2 fixed regex not working on 3.3 (syntax error) 2013-06-07 22:38:53 +09:00
Marco Paolini b93e2a7c3b Optionally disable the Drag And Drop image feature. 2013-06-03 10:46:59 +01:00
Patrick Lauber 8041250893 Merge pull request #27 from czpython/patch-1
Fixes incompatibility with CMS 2.x
2013-05-28 06:17:15 -07:00
Paulo Alvarado a5b1455f7d Fixed error in tempalte. 2013-05-28 09:30:20 +02:00
Paulo Alvarado 82a5d726c0 Provide extra context variable to override template path. 2013-05-28 09:09:33 +02:00
Paulo Alvarado 73aa7198ad Restored backwards compatibility with CMS 2.x. 2013-05-27 16:22:54 +02:00
Patrick Lauber 86198852a5 fixed further tests for 3.0 2013-05-15 14:49:17 +02:00
Patrick Lauber 8b0d234118 make it 3.0 ready 2013-05-15 11:35:32 +02:00
Patrick Lauber 4ba21189f9 django 1.5 compatibility and version bump 2013-04-19 13:03:20 +02:00
Patrick Lauber d36b8d02fc new version 2013-04-10 16:18:40 +02:00
Patrick Lauber 8041186ca6 Merge pull request #18 from alesdotio/master
south support
2013-04-10 07:15:22 -07:00
Aleš Kocjančič d2949c9c1f added south introspection rules to the field 2013-03-22 16:24:38 +01:00
Angelo Dini f320e4bffa added example for how to add custom styles and show styles dropdown (removed font as it can be handeled through styles) partially fixes #3 2013-02-19 19:15:17 +01:00
Angelo Dini 47dd8211c0 reduce min-height so the plugin modal window fits inside the admin edit page. Fixes #14 2013-02-19 18:58:20 +01:00
Aleš Kocjančič bfc1334917 Merge branch 'master' of github.com:divio/djangocms-text-ckeditor 2013-02-15 14:09:00 +01:00
Aleš Kocjančič b679e45316 clean the fields value 2013-02-15 14:08:44 +01:00
Patrick Lauber 2853bb3d1f version bump 2013-01-29 11:37:01 +01:00
Patrick Lauber 77950686eb Merge pull request #11 from alesdotio/master
required css and js fixes
2013-01-29 02:35:04 -08:00
Aleš Kocjančič 3f068ae337 css and js fixes 2013-01-29 11:14:39 +01:00
Patrick Lauber 4fbfb656fa Merge pull request #10 from alesdotio/master
fixes initialisation problems
2013-01-28 07:29:05 -08:00
Aleš Kocjančič fea23afdf4 fixes editor initialisation when in an inline 2013-01-28 16:11:07 +01:00
Ales Kocjancic c51d6d6fb1 Merge branch 'master' of github.com:divio/djangocms-text-ckeditor 2013-01-18 09:09:57 +01:00
Ales Kocjancic baa4d94421 expanded example in README 2013-01-18 09:09:33 +01:00