summaryrefslogtreecommitdiffstats
path: root/djangocms_text_ckeditor
Commit message (Expand)AuthorAgeFilesLines
* bump versionPatrick Lauber2014-08-271-1/+1
* Fixes #166Jacob Rief2014-08-261-1/+1
* Change migration dependencyIacopo Spalletti2014-08-191-1/+1
* Recreate migrationsIacopo Spalletti2014-08-161-2/+2
* version bumpPatrick Lauber2014-08-141-1/+1
* Merge pull request #157 from maestrofjp/doco_updatesPatrick Lauber2014-08-14260-1498/+2030
|\
| * Updated ckeditor to 4.4.3 for security XSS patch and problems with 9998 famil...peterfarrell2014-07-30260-1498/+2030
* | Merge pull request #161 from yakky/django_17_migrationsPatrick Lauber2014-08-142-0/+25
|\ \
| * | Support Django 1.7 migrationsIacopo Spalletti2014-07-252-0/+25
* | | Merge pull request #162 from yakky/feature/translated_linkPatrick Lauber2014-08-142-4/+6
|\ \ \
| * | | Translate 'Link' string to handle link plugin in different languagesIacopo Spalletti2014-08-072-4/+6
* | | | Merge pull request #153 from marekmalek/masterIacopo Spalletti2014-08-131-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes #150. Fix for migration 0002 to handle non default database connections.Marek Malek2014-07-251-3/+3
| |/ /
* | | Add TEXT_ADDITIONAL_PROTOCOLS settingHorst Gutmann2014-08-034-8/+37
* | | django.utils.six supports urlib since 1.5 - we need to do imports the old wayMateusz Marzantowicz2014-07-311-1/+5
* | | Fixed: TypeError: initial_value must be str or None, not bytesMateusz Marzantowicz2014-07-291-3/+3
| |/ |/|
* | Merge pull request #144 from mmarzantowicz/feature/django-utils-sixIacopo Spalletti2014-07-292-8/+3
|\ \ | |/ |/|
| * Import StringIO from django.utils.six.movesMateusz Marzantowicz2014-06-191-4/+2
| * Import urljoin from django.utils.six.movesMateusz Marzantowicz2014-06-191-4/+1
* | Remove loggingIacopo Spalletti2014-06-201-1/+0
* | Fix ckeditor path issuesIacopo Spalletti2014-06-193-4/+5
|/
* Merge pull request #140 from ucdavis-agecon/masterIacopo Spalletti2014-06-171-1/+5
|\
| * Fixes #139. Properly construct ckeditor_basepath in cms_plugins.py to elimina...Jeffrey Goettsch2014-06-131-1/+5
* | fix URLs to reflect new static file locationMateusz Marzantowicz2014-06-152-7/+7
* | move static files to djangocms_text_ckeditor subdirectoryMateusz Marzantowicz2014-06-15350-0/+0
|/
* locales and wheel support and version bumpPatrick Lauber2014-06-0629-31/+31
* Minor code cleanups. Restoring Py3Iacopo Spalletti2014-06-069-29/+35
* Fix sanitizerIacopo Spalletti2014-06-061-1/+1
* Optionally disable HTML sanitizing.Marco Paolini2014-06-052-13/+21
* Merge pull request #130 from johnraz/Issue129-body-should-not-be-a-proxyIacopo Spalletti2014-06-041-4/+17
|\
| * Use force_text for django 1.5+ on yakky's recommendationJonathan Liuti2014-05-251-1/+6
| * Fix #129, force_unicode on body to make sure it's not a proxy object anymoreJonathan Liuti2014-05-251-4/+12
* | version bump to 2.1.5Kim Thoenen2014-06-041-1/+1
* | Better handling of CMS/HTMLField toolbar selectionIacopo Spalletti2014-06-041-5/+11
* | Allow custom configuration for CMS plugin widgetIacopo Spalletti2014-05-182-2/+9
* | Fix switch between CMS and HTMLField toolbarIacopo Spalletti2014-05-181-1/+7
* | Allow ckeditor customization in HTMLFieldIacopo Spalletti2014-05-183-7/+26
|/
* Merge pull request #127 from jgoettsch/masterIacopo Spalletti2014-05-182-0/+7
|\
| * Introduce CKEDITOR_BASEPATH to the text_plugin_change_form.html template. Fix...Jeffrey Goettsch2014-05-152-1/+7
| * Set window.CKEDITOR_BASEPATH in text_plugin_change_form.html to fix #124.Jeffrey Goettsch2014-05-141-0/+1
* | Small fixes.Arcady Usov2014-05-051-2/+2
* | Removed many places where we set class for CKEditor and make only one place f...Arcady Usov2014-05-054-5/+16
* | Remove loop from ".add-row" buttons.Arcady Usov2014-05-051-9/+8
* | Fix check equals.Arcady Usov2014-04-281-1/+1
* | Code styling.Arcady Usov2014-04-281-2/+1
* | Fix not started CKEditor when I used plugins extending "TextPlugin".Arcady Usov2014-04-151-1/+1
* | Fix "add-row" link in admin inline for initial CKEditor when it's placed in n...Arcady Usov2014-04-131-0/+12
* | Remove hard container relation with initialization CKEditor (initial CKEditor...Arcady Usov2014-04-132-40/+35
* | Move initial CKEditor code to function and run it when '#container' ready.Arcady Usov2014-04-131-12/+16
* | fix for admin inline when on page many ckeditors.Arcady Usov2014-04-121-12/+15
|/