7a1f3954f4
Updated to CKEditor 4.4.6
2014-11-26 14:22:37 +01:00
1983840b76
Merge pull request #148 from jsatt/exclude-hidden-directories
...
Exclude hidden directories from image browser
2014-11-23 02:56:13 +01:00
9b848266fb
exclude hidden directories from image browser
2014-11-22 19:47:43 -06:00
ec5d7e2a70
Merge pull request #147 from kevgathuku/patch-1
...
Provide Link and Unlink buttons in default config
2014-11-20 18:47:26 +01:00
41e2868292
Provide Link and Unlink buttons in default config
...
The Default config lacks the basic functionality of inserting links.
This adds these buttons in the default toolbar config
2014-11-20 13:03:10 +03:00
5b3b2e4143
Merge pull request #144 from shaunsephton/documentation
...
Documentation improvements
2014-11-07 11:59:28 -08:00
c23e4449cf
additional readme conversion, converted setext-style headers to atx-style for better nesting
2014-11-07 10:45:03 -08:00
1f487741c7
converting RST to MD
2014-11-07 10:38:26 -08:00
e12c8c6cc3
added docs dir with README.rst split out into two .md files (installation, usage) with index file
2014-11-07 10:36:03 -08:00
f322a62ac6
Merge pull request #140 from natejlong/master
...
Handle case where ckeditor-init.js is run with jQuery < 1.7
2014-11-07 10:08:30 -08:00
cb5ec66e0c
Merge pull request #143 from lqez/master
...
Update README.rst
2014-11-06 17:30:01 -08:00
65fab3f426
Update README.rst
...
Fix typo in README
2014-11-07 10:23:55 +09:00
a38a661921
[ close #133 ] Extend CKEDITOR_JQUERY_URL description in readme.
2014-11-02 17:55:22 +01:00
ca89d42126
[ close #141 ] Fix checking if thumbnail exists in management command.
2014-11-02 17:33:07 +01:00
8fe3c51662
Merge branch 'master' of https://github.com/shaunsephton/django-ckeditor
2014-11-02 17:18:28 +01:00
fad19780b0
[ close #139 ] Fix UnicodeErrors in management command.
2014-11-02 17:17:55 +01:00
01de6bea8a
replace .live with .delegate, more correct
2014-10-27 13:21:07 -04:00
09d593cc10
Merge branch 'master' of github.com:natejlong/django-ckeditor
2014-10-27 13:17:59 -04:00
4d03c18df5
Merge branch 'master' of https://github.com/shaunsephton/django-ckeditor
2014-10-27 13:17:36 -04:00
2c5de60f33
Merge branch 'master' of https://github.com/shaunsephton/django-ckeditor
2014-10-27 12:07:37 -04:00
18dd1f5331
include .delegate() case for jQuery < 1.7 users
2014-10-27 12:00:50 -04:00
615897a473
Merge pull request #138 from dessibelle/master
...
Added lazy JSON encoder in order to support i18n in CKEditor settings
2014-10-22 18:36:31 +02:00
a5f6d2fcad
Added lazy JSON encoder in order to support i18n in CKEditor settings
...
A LazyEncoder has been implemented based on Djangos DjangoJSONEncoder,
rather than json.JSONEncoder, as described [here](https://docs.djangoproject.com/en/dev/topics/serialization/#serialization-formats-json )
This allows us to use `ugettext_lazy` (and other laze functions) in
`settings.py` which adds the possibility to localize strings for use
in the `CKEDITOR_CONFIGS` settings etc.
**Example**
from django.utils.translation import ugettext_lazy as _
CKEDITOR_CONFIGS = {
'default': {
'stylesSet': [
{ 'name': _('Lead') , 'element': 'p', 'attributes': { 'class': 'lead' } },
...
]
...
}
2014-10-22 13:49:17 +02:00
3fb976a96d
Merge pull request #136 from dessibelle/master
...
Excluded hidden files from image browser and modified caching headers
2014-10-20 23:48:53 +02:00
5ebc347a54
Merge pull request #137 from natejlong/master
...
Fix ckeditor-init.js by giving it access to a valid jQuery instance, along with other minor changes to ckeditor-init.js
2014-10-18 23:01:09 +02:00
d441e27239
Set $ to django.jQuery if $ not defined, organize ckeditor-init.js, replace .click(...) with delegated .on(...) in case elements do not exist when code is run
2014-10-17 14:25:52 -04:00
0526219288
Added never_cache() decorator to browse view, as the it often did not display newly uploaded files after being loaded once.
2014-10-17 00:08:16 +02:00
253a9d7af6
Made get_image_files() exclude hidden files (leading . in filename).
2014-10-17 00:06:33 +02:00
bdb904ea08
Fix Readme formatting.
2014-10-16 00:46:05 +02:00
365de5ebe5
[ #134 ] Update readme.
2014-10-16 00:44:34 +02:00
a1903dbbac
[ close #135 ] Allow only POST requests to upload view.
2014-10-16 00:40:21 +02:00
7efe190d02
Bump version.
2014-09-23 01:48:47 +02:00
cc0a751425
Add info about versioning.
2014-09-23 01:48:40 +02:00
930423721a
Update changelog.
2014-09-23 01:46:32 +02:00
9f505a6ff3
Allow running selenium tests with Chromium.
2014-09-23 00:59:20 +02:00
ebba122926
Make django-ckeditor views staff_member_required.
2014-09-23 00:54:32 +02:00
795a87ff24
Add class name to editor widget div.
...
For easy custom styling and scripting.
If you have multiple editors filter by data-field-id in jQuery.
2014-09-23 00:29:15 +02:00
a45468731a
Support Grappelli in inline ckeditor initialisation.
2014-09-23 00:25:26 +02:00
89c9f78d72
Refactor ckeditor-init.js.
2014-09-23 00:23:21 +02:00
cc2ba13788
Refactor ckeditor-init.js.
2014-09-23 00:19:26 +02:00
05f05a3d33
Merge pull request #128 from devonwarren/master
...
Fix widget to show correctly in grappelli admin
2014-09-15 18:29:03 +02:00
680262e9cf
Fix widget to show correctly in grappelli admin
...
Will also work as intended in regular admin interface as well
2014-09-15 11:25:37 -04:00
3a1663424a
Bump version.
2014-09-13 01:43:28 +02:00
9b64861b7d
Fix package versions in readme.
2014-09-13 01:41:28 +02:00
44083b17f5
Update AUTHORS and README.
2014-09-13 01:37:57 +02:00
454dde910e
Merge branch 'riklaunim-master'
2014-09-13 01:33:30 +02:00
119e10ca23
Merge branch 'master' of https://github.com/riklaunim/django-ckeditor into riklaunim-master
2014-09-13 01:32:59 +02:00
c6f24927c1
Bump version.
2014-09-13 01:27:36 +02:00
d48139fd0b
Update CHANGELOG.
2014-09-13 01:25:11 +02:00
3bfef7df79
Correct package name
2014-09-10 15:34:09 +02:00
Simon Fransson
riklaunim
Jeremy Satterfield
Kevin Ndung'u
Peter Novotnak
Park Hyunwoo
Nathan Long
Devon Warren
Shaun Sephton