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
riklaunim 0191fd53b8 Merge pull request #105 from rgcarrasqueira/master 
Problems with file that has extension in uppercase
 2014-03-02 23:01:05 +01:00
Piotr Maliński ec45f4751c Merge branch 'master' of https://github.com/shaunsephton/django-ckeditor 2014-03-02 22:58:14 +01:00
Piotr Maliński af71a1d772 Update readme with latest code merges info. 2014-03-02 22:57:46 +01:00
Piotr Maliński 15c92e5857 Update readme with recent code merges. 2014-03-02 22:52:38 +01:00
riklaunim 7c2a16e82b Merge pull request #33 from christianglodt/master 
Add support for external plugin resource declarations.
 2014-03-01 01:46:33 +01:00
helicopetr 2d23c9ef38 Add support for external plugin resource declarations. 
This commit adds keyword arguments to fields.RichTextField that allow the
overriding of extraPlugins on a per-field basis, and that allow the declaration
of external plugin resources (using CKEDITOR.plugins.addExternal()).

This improves the implementation of CKEditor plugins in django apps,
because they can be hosted and deployed separately from the CKEditor sources.

As an example, here's how to define a custom RichTextField by just currying
the existing one's constructor with the new arguments:

    from django.utils.functional import curry

    extra_plugins = ['custom_plugin']
    external_plugin_resources=[('custom_plugin', '/custom_plugin_base/', 'plugin.js')]
    CustomRichTextField = curry(RichTextField, extra_plugins=extra_plugins, external_plugin_resources=external_plugin_resources)

The external_plugin_resources kwarg is a list of tuples that contain the same
information as the parameters to CKEDITOR.plugins.addExternal().
You may want to write "reverse('some_view')" for the second parameter.
If that fails due to circular imports, wrap the reverse call in a
SimpleLazyObject, like this:

    from django.utils.functional import SimpleLazyObject
    external_plugin_resources=[('custom_plugin', SimpleLazyObject(lambda: reverse('custom_plugin_view', kwargs=...) + 'some_relative_path/'), 'plugin.js')]
 2014-02-28 08:44:32 +01:00
Rogério Carrasqueira 29e70a31ad Merge correct setup file 2014-02-27 23:15:59 -03:00
Rogério Carrasqueira 9aaa1b174e Fix an issue about reading files from user directory 2014-02-27 22:59:04 -03:00
Rogério Carrasqueira 43c3f595b2 Merge branch 'master' of git://github.com/shaunsephton/django-ckeditor into shaunsephton-master 
Conflicts:
	CHANGELOG.rst
	ckeditor/image/dummy_backend.py
	ckeditor/image/pillow_backend.py
	ckeditor/static/ckeditor/ckeditor/skins/moono/dialog.css
	ckeditor/templates/browse.html
	ckeditor/utils.py
	ckeditor/views.py
	ckeditor/widgets.py
	ckeditor_demo/settings.py
	ckeditor_demo_requirements.txt
	setup.py
	tox.ini
 2014-02-27 21:48:51 -03:00
Rogério Carrasqueira d87c5fe2d8 Update utils.py 
Bug fix when file extension is uppercase
 2014-02-27 21:17:28 -03:00
riklaunim d9c2ec94ef Merge pull request #82 from ellmetha/master 
Init the editor when the DOM is fully loaded if CKEDITOR is not defined
 2014-02-26 01:24:42 +01:00
Piotr Maliński 9830d9764d Pull changes from riklaunim/django-ckeditor. 2014-02-26 01:11:04 +01:00
Peter Novotnak 8af95a0f2e Merge pull request #99 from shomodj/master 
fixed problems with django 1.6
 2014-02-25 11:13:45 -06:00
riklaunim 7b8f3829e9 Merge pull request #32 from joss82/patch-1 
Fix language stuck to English
 2014-02-24 09:25:33 +01:00
Sylvain Josserand 4498642676 Fix language stuck to English 
On multi-language sites, the language is not properly selected for the interface.
 2014-02-24 16:04:21 +08:00
Piotr Maliński 06ab64ef78 Bump to 2.6.7. 2014-02-24 00:23:03 +01:00
Piotr Maliński e688d6001b Bump tox requirements. 2014-02-24 00:19:36 +01:00
Piotr Maliński f598e41f78 [close #30] Don't slugify filename to empty string. 2014-02-24 00:15:00 +01:00
Piotr Maliński 3b828d78dc [close #22] Don't use IMG tag for non image files in file browser. 2014-02-24 00:07:06 +01:00
Piotr Maliński 0b9d36c9bd Remove tabs. 2014-02-23 23:59:06 +01:00
Piotr Maliński d4c1a52588 [close #31] Remove non existing mini.png reference from CSS files. 2014-02-23 23:51:52 +01:00
riklaunim edd974688f Merge pull request #28 from joss82/patch-1 
Fix per-user browsing.
 2014-02-17 15:15:33 +01:00
riklaunim 8debae6304 Merge pull request #29 from seedofjoy/patch-1 
Fix UnicodeEncodeError
 2014-02-17 15:07:19 +01:00
Igor Mozharovsky 87d01ea011 Fix UnicodeEncodeError 
Fix bug when upload folder contains filename with unicode characters
 2014-02-17 15:29:14 +02:00
Sylvain Josserand e7997189e6 Update views.py 
Fix so the per-user browsing actually works.
 2014-02-17 16:30:16 +07:00
riklaunim c388ef7490 Merge pull request #25 from crunching/master 
added simple image verification that prevents users to upload non image files and small css fix for django error template better view
 2014-02-15 15:17:47 +01:00
v.paritskiy 8b56ca5328 verify images on upload 2014-02-14 13:17:58 +02:00
v.paritskiy ba1974e5b2 make iframe with django response bigger 2014-02-14 13:17:38 +02:00
Boris Shomodjvarac 7eef2b62ff updated version and fixed django version 2014-02-10 12:05:41 +01:00
Boris Shomodjvarac b8ed6c43d9 fixed problems with django 1.6 2014-02-10 11:25:25 +01:00
Rogério Carrasqueira 8cd35fee9e Merge pull request #1 from riklaunim/master 
Get improvements from the lastest version
 2013-12-21 16:54:24 -08:00
riklaunim a3669f7311 Merge pull request #21 from janos/master 
Python 3.2 compatibility
 2013-12-20 17:26:19 -08:00
Janos Guljas 56d35ae274 Python 3.2 compatibility 2013-12-21 02:16:25 +01:00
riklaunim a07ed8a131 Merge pull request #20 from jnns/master 
Remove duplicate installation instruction.
 2013-12-19 09:38:49 -08:00
Jannis a5615cf4ff Remove duplicate installation instruction. 2013-12-19 12:04:02 +01:00
riklaunim 420fe18116 Merge pull request #18 from makinacorpus/master 
Fix loader image path
 2013-12-17 01:42:39 -08:00
Alex Marandon 332a5c4e27 Fix loader image path 2013-12-17 10:10:45 +01:00
Piotr Maliński 2864723f8e Bump to 4.2.6. 2013-12-12 22:43:35 +01:00
riklaunim 998addb42e Merge pull request #16 from ngenator/master 
Add all packages to setup.py (excluding demo)
 2013-12-12 13:39:42 -08:00
Daniel Ng 98fd3ac54d Add all packages to setup.py (excluding demo) 
Fix #15
 2013-12-12 16:12:53 -05:00
Piotr Maliński 3faa9aaec8 Bump version to 4.2.5. 2013-12-12 20:41:45 +01:00
Piotr Maliński 5d6fa7185d [close #14] Fix static file installation. 2013-12-12 20:39:54 +01:00
riklaunim 0c9b2db217 Merge pull request #13 from horejsek/master 
Allow to define filebrowserUploadUrl and filebrowserBrowseUrl by CKEDITOR_CONFIGS
 2013-12-08 07:26:53 -08:00
Piotr Maliński 07c26374d9 Bump version to 4.2.4. 2013-12-07 20:01:00 +01:00
Piotr Maliński 76f5b1e65f Update docs. 2013-12-07 20:00:44 +01:00
Piotr Maliński 6e818aa4f9 Remove old tests. 2013-12-07 19:56:00 +01:00
Michal Horejsek cf09315cf6 Allow to define filebrowserUploadUrl and filebrowserBrowseUrl by CKEDITOR_CONFIGS 2013-12-07 16:45:09 +01:00
Michal Horejsek e268db46a0 Django 1.6 does not have urls.defaults 2013-12-07 16:43:20 +01:00
Piotr Maliński 4f0c40b82d Add Pillow to tox test deps. 2013-12-07 03:21:13 +01:00
Piotr Maliński de73950f1a Update CHANGELOG. 2013-12-07 03:15:25 +01:00