Commit Graph

53 Commits

Author SHA1 Message Date
Simon Fransson 253a9d7af6 Made get_image_files() exclude hidden files (leading . in filename). 2014-10-17 00:06:33 +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 e52e07c522 [close #46] Validate image upload by extension in dummy image backend. 2014-08-24 19:43:20 +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
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
Piotr Maliński 9830d9764d Pull changes from riklaunim/django-ckeditor. 2014-02-26 01:11:04 +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
Sylvain Josserand e7997189e6 Update views.py
Fix so the per-user browsing actually works.
2014-02-17 16:30:16 +07:00
v.paritskiy 8b56ca5328 verify images on upload 2014-02-14 13:17:58 +02:00
Piotr Maliński 81c6ae80b1 Refactor image backends. 2013-12-07 03:01:13 +01:00
Piotr Maliński e838150386 [#7] Move create_thumbnail function to image backend. 2013-12-07 02:57:47 +01:00
Piotr Maliński 1f083d108e [#7] Extract core image processing to backends. 2013-12-07 02:48:20 +01:00
Piotr Maliński 6755dbc170 Remove unused import. 2013-12-07 02:13:35 +01:00
Piotr Maliński 392772bf8d Inline function. 2013-12-07 02:06:05 +01:00
Piotr Maliński 82597266bd Fix StringIO usage when generating thumbnails. 2013-12-07 00:01:43 +01:00
Piotr Maliński 86682f11e6 Python 3 fix for thumbnail generation. 2013-11-15 23:51:40 +01:00
DemonVex 8f15261314 Add Python 3.3 support 2013-11-15 22:30:53 +08:00
Piotr Maliński 69b54839ca Handle non-local storages in is_image. 2013-11-14 21:33:28 +01:00
Paulo R 16e5f72fe6 Adds slugify to filename on upload 2013-11-14 13:51:04 -02:00
Piotr Maliński b39bb38671 Merge remote-tracking branch 'snbuback/master'
Updates ckeditor widget to 4.2.1.
2013-11-11 17:36:42 +01:00
Piotr Maliński 52c9ff1369 Fix PEP8 violations. 2013-11-11 17:27:43 +01:00
Piotr Maliński f9df393355 Clean imports. 2013-11-11 17:26:18 +01:00
Piotr Maliński 5ad3722392 Use storage get_available_name method. 2013-11-11 17:25:18 +01:00
centralniak d2ea18833a Fix EOF problem using S3BotoStorage -- refs #21 #26 2012-06-11 14:19:50 +02:00
Piotr Maliński fdaecd526e Catch OSErrors when trying to browse non existing user folder. 2012-06-10 23:03:14 +02:00
Piotr Maliński ec41c3e11a Reorder imports. 2012-06-08 17:34:33 +02:00
Piotr Maliński 206ce08ef0 Make thumbnails save as correct image files. 2012-06-08 17:31:51 +02:00
Piotr Maliński 3b32908cc8 Use default_storage in image browser view. 2012-06-08 16:56:30 +02:00
Piotr Maliński 823ccfc9ae Use default file storage to save the image. 2012-06-06 17:38:28 +02:00
Shaun Sephton 9ed717e7de media_prefix removed as redundant now that we are using static 2012-04-22 14:30:53 +02:00
Shaun Sephton 6c7be8c979 merge sustainingtechnologies/master with cleanup(pep8) 2012-04-22 13:18:55 +02:00
Shaun Sephton e79c8f2f26 pep8 2012-04-21 18:53:04 +02:00
Anonymous 8af773b68b merge mwcz 2012-04-21 18:28:07 +02:00
Shaun Sephton ccba00aad9 pep8 2011-08-30 12:31:49 +02:00
Vasili 6570607ebc refactoring views to allow use of file walking with local paths 2011-03-10 22:28:31 -08:00
zip 6f66702236 removes multiple slashes from url path only 2011-02-27 14:33:01 -05:00
shaunsephton 79859d2d88 refactor to get_upload_filename method. limit uploads to uploading user if CKEDITOR_UPLOAD_PATH is set 2010-10-10 16:53:18 +02:00
shaunsephton 36c5b3c6d9 merged upload path by date changes by loop0. thanks loop0. general refactor and cleanup 2010-10-10 12:39:44 +02:00
Bruno Ribeiro da Silva 359b1741a3 Changed upload to separate uploaded files by date.
browse view now walks through all directories inside upload path.
2010-09-22 21:30:06 -03:00
shaunsephton 22fdda849b merge 2010-06-29 13:58:01 +02:00
shaunsephton 09bdcde0c6 more robust pil import 2010-06-22 13:05:13 +02:00
shaunsephton f239b01332 changed setting name 2010-05-28 09:56:42 +02:00
shaunsephton f146dc7579 cleanup 2010-05-28 09:51:01 +02:00
shaunsephton 27bc6de888 use CKEDITOR_UPLOAD_MEDIA_URL 2010-05-28 09:45:26 +02:00
shaunsephton 85e3b9fe91 slight revert to respect nested paths if CKEDITOR_UPLOAD_URL is not provided 2010-05-27 14:30:21 +02:00
shaunsephton 6f1ad08a86 Merge commit 'chr15m/master' 2010-05-27 14:15:11 +02:00
shaunsephton 9bb00ebb1b excempt upload from csrf protection 2010-05-27 14:08:05 +02:00
Chris McCormick 3c1032db4b Added optional setting CKEDITOR_UPLOAD_URL and made get_media_url more robust. 2010-05-20 18:18:40 +08:00