Commit Graph

200 Commits

Author SHA1 Message Date
Frédéric Péters 420604055f misc: use force_str instead of force_text (#90228) 2024-04-30 20:25:25 +02:00
Frédéric Péters 238219c184 replace usage of deprecated pillow antialias symbol (#79306) 2023-07-03 11:56:25 +02:00
Frédéric Péters 649d63f1fc update to {% load static %}, not staticfiles (#74517) 2023-02-14 15:45:17 +01:00
Frédéric Péters 1de1a6a67b trivial: replace deprecated usage of render_to_response (#64291) 2022-04-17 11:09:46 +02:00
Frédéric Péters c7c3336b16 misc: create thumbnail as jpeg in case of unknown file format (#54667) 2021-06-20 14:59:02 +02:00
Frédéric Péters 850ddaefe5 trivial: import reverse from django.urls 2020-04-01 15:32:07 +02:00
Frédéric Péters 57dac67816 misc: adapt image browser view for django 1.11 (#27733) 2018-11-05 11:37:44 +01:00
Stanislav Karpov 96b89effe3 Update views.py 2015-07-28 19:07:41 +03:00
Piotr Maliński 7283aeb12d Update ckeditor to 4.5.1. 2015-07-07 20:45:06 +02:00
Piotr Maliński cc46c6b1d3 Use correct default value for argument. 2015-07-07 20:37:35 +02:00
Piotr Maliński 372f2aeba2 Refactor imports. 2015-07-07 20:35:43 +02:00
Piotr Maliński 9d1630697e Merge pull request #153 from Openscop/master
Allow non-image files to be uploaded
2015-07-07 08:02:01 +02:00
Piotr Maliński 84798109a7 Revert "STATIC_URL changed "
This reverts commit 23b8a2ec14.
2015-06-07 19:25:06 +02:00
jdcaballerov 23b8a2ec14 STATIC_URL changed
STATIC_URL changed for static function
2015-05-11 17:50:38 -05:00
Venelin Stoykov 6e8a0cc4d1 Fixes #145 - Syntax Error on Python 3.2
This correctly reimplement pull #168
2015-04-22 22:56:40 +03:00
Piotr Maliński e8b9df963f Merge pull request #164 from ikresoft/master
Custom filebrowser url
2015-04-22 00:25:23 +02:00
Michael P. Jung dab485f40f Fix deprecation warning introduced in Django 1.7
Django 1.7 renamed django.forms.util to django.forms.utils. In order to silence the Deprecation warning a try-except block is needed.
2015-04-02 14:33:40 +02:00
karec 089d42d62d fix a bug for unicode string in utils.py for python3.2 support (current debian stable version) + add missing spaces arround operator for PEP8 2015-02-06 23:55:52 +01:00
Pavel Zaytsev 63b5a653d4 Links buttons not worked
Fix for show Links buttons in Full template config,
2015-01-27 15:23:01 +05:00
Enver Bisevac ec90263c82 remove print 2015-01-25 19:47:40 +01:00
Enver Bisevac b8ebd249c6 support for custom browser 2015-01-25 13:59:06 +01:00
Simon Panay 7298ac8584 Merge remote-tracking branch 'upstream/master' 2014-12-17 15:38:52 +01:00
helicopetr 978788fd17 Restore external-plugin-resources handling.
This change re-adds functionality for adding external plugin resources.
The resources, defined in the field, are passed to the widget, which
renders them into the data-external-plugin-resources attribute.

In ckeditor-init.js, this data attribute is read and the resources
are added to the CKEditor, using CKEditor.plugins.addExternal().
2014-12-12 11:18:27 +01:00
riklaunim 1114544162 Merge pull request #151 from dessibelle/master
Updated to CKEditor 4.4.6
2014-12-07 21:06:50 +01:00
Piotr Maliński 7b67aba231 Check for jQuery presence correctly. 2014-12-07 21:03:50 +01:00
Simon Panay 39079f8c76 add ability to upload non-image files 2014-11-26 16:30:47 +01:00
Simon Fransson 7a1f3954f4 Updated to CKEditor 4.4.6 2014-11-26 14:22:37 +01:00
Jeremy Satterfield 9b848266fb exclude hidden directories from image browser 2014-11-22 19:47:43 -06:00
Kevin Ndung'u 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
Peter Novotnak 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
Piotr Maliński ca89d42126 [close #141] Fix checking if thumbnail exists in management command. 2014-11-02 17:33:07 +01:00
Piotr Maliński 8fe3c51662 Merge branch 'master' of https://github.com/shaunsephton/django-ckeditor 2014-11-02 17:18:28 +01:00
Piotr Maliński fad19780b0 [close #139] Fix UnicodeErrors in management command. 2014-11-02 17:17:55 +01:00
Nathan Long 01de6bea8a replace .live with .delegate, more correct 2014-10-27 13:21:07 -04:00
Nathan Long 4d03c18df5 Merge branch 'master' of https://github.com/shaunsephton/django-ckeditor 2014-10-27 13:17:36 -04:00
Nathan Long 18dd1f5331 include .delegate() case for jQuery < 1.7 users 2014-10-27 12:00:50 -04:00
riklaunim 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
Simon Fransson 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
riklaunim 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
riklaunim 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
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 a1903dbbac [close #135] Allow only POST requests to upload view. 2014-10-16 00:40:21 +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
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