entrouvert
/
debian-django-ckeditor
16
0
Fork 0
Code Issues Pull Requests Releases Activity
464 Commits 1 Branch 3 Tags 6.3 MiB
Commit Graph

464 Commits

Author SHA1 Message Date
Nathan Long 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
Simon Fransson 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
Simon Fransson 253a9d7af6 Made get_image_files() exclude hidden files (leading . in filename). 2014-10-17 00:06:33 +02:00
Piotr Maliński bdb904ea08 Fix Readme formatting. 2014-10-16 00:46:05 +02:00
Piotr Maliński 365de5ebe5 [#134] Update readme. 2014-10-16 00:44:34 +02:00
Piotr Maliński a1903dbbac [close #135] Allow only POST requests to upload view. 2014-10-16 00:40:21 +02:00
Piotr Maliński 7efe190d02 Bump version. 2014-09-23 01:48:47 +02:00
Piotr Maliński cc0a751425 Add info about versioning. 2014-09-23 01:48:40 +02:00
Piotr Maliński 930423721a Update changelog. 2014-09-23 01:46:32 +02:00
Piotr Maliński 9f505a6ff3 Allow running selenium tests with Chromium. 2014-09-23 00:59:20 +02:00
Piotr Maliński ebba122926 Make django-ckeditor views staff_member_required. 2014-09-23 00:54:32 +02:00
Piotr Maliński 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
Piotr Maliński a45468731a Support Grappelli in inline ckeditor initialisation. 2014-09-23 00:25:26 +02:00
Piotr Maliński 89c9f78d72 Refactor ckeditor-init.js. 2014-09-23 00:23:21 +02:00
Piotr Maliński cc2ba13788 Refactor ckeditor-init.js. 2014-09-23 00:19:26 +02:00
riklaunim 05f05a3d33 Merge pull request #128 from devonwarren/master 
Fix widget to show correctly in grappelli admin
 2014-09-15 18:29:03 +02:00
Devon Warren 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
Piotr Maliński 3a1663424a Bump version. 2014-09-13 01:43:28 +02:00
Piotr Maliński 9b64861b7d Fix package versions in readme. 2014-09-13 01:41:28 +02:00
Piotr Maliński 44083b17f5 Update AUTHORS and README. 2014-09-13 01:37:57 +02:00
Piotr Maliński 454dde910e Merge branch 'riklaunim-master' 2014-09-13 01:33:30 +02:00
Piotr Maliński 119e10ca23 Merge branch 'master' of https://github.com/riklaunim/django-ckeditor into riklaunim-master 2014-09-13 01:32:59 +02:00
Piotr Maliński c6f24927c1 Bump version. 2014-09-13 01:27:36 +02:00
Piotr Maliński d48139fd0b Update CHANGELOG. 2014-09-13 01:25:11 +02:00
Shaun Sephton 3bfef7df79 Correct package name 2014-09-10 15:34:09 +02:00
Egil Möller 73fc584d7b Merge pull request #123 from redhog/master 
Support for django 1.6
 2014-08-31 23:06:35 +02:00
Piotr Maliński 055f3a9053 Bump test requirements. 2014-08-24 21:10:31 +02:00
Piotr Maliński 0e224b439c Make jQuery loading configurable. 
CKEDITOR_JQUERY_URL becomes a required by default configuration variable.
 2014-08-24 21:03:06 +02:00
Piotr Maliński 5eb9729fea Merge branch 'whitescape-master' 2014-08-24 20:52:12 +02:00
Piotr Maliński 08a895bd3f Update jQuery URL. 2014-08-24 20:51:58 +02:00
Piotr Maliński f45462bba5 Merge branch 'master' of https://github.com/whitescape/django-ckeditor into whitescape-master 2014-08-24 20:41:23 +02:00
Piotr Maliński fa1c104980 Fix settings variable name in readme. 2014-08-24 19:51:23 +02:00
Piotr Maliński e52e07c522 [close #46] Validate image upload by extension in dummy image backend. 2014-08-24 19:43:20 +02:00
Piotr Maliński e7dbea8af6 [close #45] Fix order of configuration steps. 2014-08-24 19:30:36 +02:00
Piotr Maliński bc03b828cb [close #44] Use full package of ckeditor 4.4.4. 
Fixes some problems with missing plugins or missing images for the editor GUI.
 2014-08-24 19:26:44 +02:00
Piotr Maliński e4fc26a912 Update project files. 2014-06-01 01:01:20 +02:00
Piotr Maliński 41abd6060d Update tests. 2014-06-01 00:54:46 +02:00
Piotr Maliński 09ee04f22d Update ckeditor to 4.4.1. 2014-06-01 00:53:29 +02:00
Piotr Maliński 3c6a5cf970 Django 1.7 compatibility fix. 2014-05-04 15:21:58 +02:00
Raffaele Colace 440cda35d2 ckeditor for inline admin bug fixed with jquery 
Conflicts:
	ckeditor/templates/ckeditor/widget.html
 2014-04-30 17:55:40 +04:00
Piotr Maliński 71e96de3a1 Update readme. 2014-04-12 20:49:48 +02:00
riklaunim a073c9e0e8 Merge pull request #109 from riklaunim/master 
Latest changes to master branch code.
 2014-04-12 20:46:25 +02:00
Piotr Maliński d0dcff65ad Fix changes from upstream merge. 2014-04-12 20:42:23 +02:00
Piotr Maliński e33561c9b5 Merge remote-tracking branch 'upstream/master' 2014-04-12 20:36:29 +02:00
Piotr Maliński c1d42a504a Bump version to 4.2.8. 2014-03-13 20:37:21 +01:00
Piotr Maliński 3ebb5ab00e Update tests to work with latest ckeditor version. 2014-03-13 20:34:44 +01:00
Piotr Maliński 3174d530de Fix statement for browser template headline. 2014-03-13 20:28:35 +01:00
Piotr Maliński f5a6ba114c Update readme. 2014-03-13 20:27:00 +01:00
riklaunim 45b4c401b6 Merge pull request #35 from stianpr/master 
Update CKEditor to v4.3.3
 2014-03-11 18:19:08 +01:00
Stian Prestholdt 79127a1cf9 Update CKEditor to v4.3.3 
CKEditor v4.3 includes Internet Explorer 11 support.
 2014-03-11 15:38:38 +01:00