eb3d173d5d
Merge pull request #80 from yakky/feature/fix_docs
...
Remove the HTMLField south introspection paragraph from the docs
2013-10-05 08:46:21 -07:00
a17b3a3443
update ckeditor to version 4.2.1
2013-10-04 21:02:11 +02:00
cdc3a8a749
Remove the HTMLField south introspection paragraph from the docs
2013-10-02 15:17:02 +02:00
239e0a12b8
better comparison and issue fix proposal
2013-09-16 22:18:47 +02:00
bbd7178e72
Merge pull request #75 from yakky/feature/use_truncator
...
Fix model __unicode__
2013-09-12 10:59:28 -07:00
0802790be1
Update plugin.js
2013-09-11 13:25:40 +02:00
cda42d9770
Use Truncator class directly in unicode
2013-09-09 19:49:04 +02:00
ae7d9a4272
Fix the model __unicode__ method to avoid adding extra hellipsis. The Truncator class takes care of converting to unicode.
2013-09-09 19:46:23 +02:00
dd2baee313
Merge pull request #70 from meshy/patch-1
...
Fix django 1.6 truncate_words import.
2013-09-09 10:45:45 -07:00
e3442e931f
Mimic signature of deprecated truncate_words.
2013-09-07 01:11:53 +01:00
eaf692b42a
Do not configure the toolbar in your settings any more
2013-09-06 18:53:08 +02:00
1821ceade7
Added two different toolbar configurations: one for CMS placeholders and
...
one for HTMLFields. The editor for CMS placeholders does not offer any
CKEditor's plugin for Link/Unlink, since this shall be done through the
CMS plugin 'cms.plugins.link'.
2013-09-06 18:46:33 +02:00
24232504cd
Fixed typo: las -> last.
...
Fixed indention for consistency: whitespace -> tabs.
2013-09-06 17:11:51 +02:00
5432d13c35
Reordered fields to be consistent
2013-09-03 21:02:12 +02:00
fcaeb97a47
Selected text automatically is displayed in the name field
2013-09-03 21:01:49 +02:00
e1f2c9bab6
Possible solution to fix issue #300
2013-09-03 18:26:34 +02:00
f4c6ed0cab
version bump
2013-09-03 15:05:13 +02:00
6653ba7c8e
Use portable iconPath
2013-09-03 15:04:42 +02:00
a0cae02faf
partially fixes issue #19
2013-09-03 14:53:27 +02:00
78750ff247
Use Truncator for versions of django < 1.4.
2013-09-01 12:19:24 +01:00
1c5a2b9832
removed django cms 3.0 checks and version bump
2013-08-22 16:25:40 +02:00
5313711451
Merge pull request #64 from yakky/feature/doc
...
Update doc to reflect 2.0.1 release
2013-08-16 00:17:05 -07:00
c9bae25bfa
Update doc to reflect 2.0.1 release
2013-08-16 09:16:25 +02:00
79e505b4ef
Merge pull request #63 from yakky/feature/remove_leftover
...
Remove leftover file
2013-08-16 00:15:30 -07:00
3685d6ec93
Remove leftover file
2013-08-16 09:13:58 +02:00
f904b09f5a
version bump
2013-08-12 09:47:12 +02:00
67b258a5bd
ensures ckeditor also works inline (as widget) fixes #47
2013-08-09 18:11:53 +02:00
193c5b96e4
this fixes an issue where 4.1 is stripping our plugins from the editor
2013-08-09 18:07:25 +02:00
bb7cea3c2e
Merge branch 'master' of github.com:divio/djangocms-text-ckeditor
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-08-09 17:28:13 +02:00
09d40fb1ab
Merge pull request #62 from digi604/master
...
fixes missing language in add plugin
2013-08-09 08:27:47 -07:00
65dbaeaac4
cleanup
2013-08-09 16:34:38 +02:00
a0b8e7f810
removed a fixed language var
2013-08-09 15:12:39 +02:00
17fe429cb4
fixes language of add plugin and HTMLTextField
2013-08-09 15:01:35 +02:00
a61537b3cb
Merge pull request #61 from divio/feature/ckeditor_4.2
...
update to ckeditor 4.2
2013-08-09 05:50:15 -07:00
1bbe653345
fix to 200px
2013-08-09 14:46:28 +02:00
fbb446cbca
update to ckeditor 4.2
2013-08-09 14:41:55 +02:00
47b8a781ed
remove ds store
2013-08-09 14:39:58 +02:00
f2363827b1
make field larger
2013-08-09 14:39:46 +02:00
5c8448e039
csrf needs to be before the ckeditor
2013-08-05 14:11:06 +02:00
7172e8813d
Merge pull request #55 from yakky/master
...
Added documentation on how to extend the plugin
Fixes #26
2013-07-19 03:03:31 -07:00
16010a052a
Note about version
2013-07-19 12:02:25 +02:00
fad552b398
Add extending plugin documentation
...
Document the use of ``AbstractText`` class and how to extend the plugin
2013-07-19 12:00:44 +02:00
a4038c157b
Merge pull request #49 from yakky/feature/abstract_text
...
The return of AbstractText class
2013-07-19 02:52:44 -07:00
856779fa54
Merge pull request #53 from yakky/master
...
Clarify versions in readme
2013-07-19 02:42:02 -07:00
a5f1c194dc
Clarify versions
2013-07-19 11:39:02 +02:00
c931ef01c4
Merge pull request #50 from yakky/feature/fix_placeholder_id
...
Fix for empty placeholder_id
2013-07-18 01:16:40 -07:00
495f755f74
The return of AbstractText class
2013-07-17 20:44:12 +02:00
7ad25b48a2
Assign default empty value to placeholder_id, in effect when HTMLField is used in plain models
2013-07-17 20:42:29 +02:00
5f267f217c
Merge pull request #45 from FinalAngel/master
...
remove console log
2013-07-11 10:18:30 -07:00
1a1c1a08ea
remove console.log
2013-07-11 19:17:46 +02:00
Iacopo Spalletti
ianaré sévi
Iacopo Spalletti
Maciej Żuk
Maciej Żuk
Stefano Morandi
Charlie Denton
Jacob Rief
FinalAngel
Patrick Lauber
Angelo Dini
Benjamin Wohlwend