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

408 Commits

Author SHA1 Message Date
Piotr Maliński e658856046 Merge pull request #171 from ironhouzi/patch-1 
Add vital information for S3 section
 2015-03-01 18:26:14 +01:00
Robin Skahjem-Eriksen 0dd13cecf4 Add vital information for S3 section 2015-03-01 17:42:12 +01:00
riklaunim 7c57801abd Merge pull request #168 from karec/master 
fix a bug for unicode string in utils.py for python3.2 support (current ...
 2015-02-07 11:44:34 +01: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
riklaunim 6a2b7f7480 Merge pull request #165 from stelzzz/patch-1 
Links buttons not worked
 2015-01-28 18:15:19 +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
riklaunim 35831794c1 Merge pull request #163 from nreilly/patch-1 
Update README.rst
 2015-01-25 15:45:33 +01:00
nreilly 7927fdb754 Update README.rst 
Syncing with earlier comment about the -updated being merged into the normal module
 2015-01-25 22:22:53 +08:00
riklaunim fc9b65ebed Merge pull request #159 from christianglodt/master 
Restore external-plugin-resources handling.
 2015-01-24 19:38:08 +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
Piotr Maliński 4d8faa3728 [close #156] Update Readme. 2014-12-07 21:31:56 +01:00
riklaunim 71303c8932 Merge pull request #149 from b2550/patch-1 
Update README.rst
 2014-12-07 21:28:42 +01:00
Piotr Maliński f091058e2e Bump version. 2014-12-07 21:28:15 +01:00
Piotr Maliński 3bd57103a2 Fix tests for newer ckeditor version. 2014-12-07 21:18:22 +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 c33c7ccfdb Add doctype to template. 2014-12-07 21:06:00 +01:00
Piotr Maliński 7b67aba231 Check for jQuery presence correctly. 2014-12-07 21:03:50 +01:00
Simon Fransson 7a1f3954f4 Updated to CKEditor 4.4.6 2014-11-26 14:22:37 +01:00
b2550 09c7425af1 Update README.rst 
Sudo removed to be OS neutral. Considered putting superuser reminder but decided it was not necessary.
 2014-11-24 13:19:38 -08:00
b2550 5e58804886 Update README.rst 
Added PIP install command because previously there was no information on how to install it
 2014-11-24 09:23:28 -08:00
riklaunim 1983840b76 Merge pull request #148 from jsatt/exclude-hidden-directories 
Exclude hidden directories from image browser
 2014-11-23 02:56:13 +01:00
Jeremy Satterfield 9b848266fb exclude hidden directories from image browser 2014-11-22 19:47:43 -06:00
riklaunim 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
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 5b3b2e4143 Merge pull request #144 from shaunsephton/documentation 
Documentation improvements
 2014-11-07 11:59:28 -08:00
Peter Novotnak c23e4449cf additional readme conversion, converted setext-style headers to atx-style for better nesting 2014-11-07 10:45:03 -08:00
Peter Novotnak 1f487741c7 converting RST to MD 2014-11-07 10:38:26 -08:00
Peter Novotnak 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
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
Peter Novotnak cb5ec66e0c Merge pull request #143 from lqez/master 
Update README.rst
 2014-11-06 17:30:01 -08:00
Park Hyunwoo 65fab3f426 Update README.rst 
Fix typo in README
 2014-11-07 10:23:55 +09:00
Piotr Maliński a38a661921 [close #133] Extend CKEDITOR_JQUERY_URL description in readme. 2014-11-02 17:55:22 +01: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 09d593cc10 Merge branch 'master' of github.com:natejlong/django-ckeditor 2014-10-27 13:17:59 -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 2c5de60f33 Merge branch 'master' of https://github.com/shaunsephton/django-ckeditor 2014-10-27 12:07:37 -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 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