summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #171 from yakky/feature/fix_setupHEADmasterIacopo Spalletti2014-09-071-1/+1
|\
| * Fix setup.py to handle migrations_django packageIacopo Spalletti2014-09-071-1/+1
|/
* bump versionPatrick Lauber2014-08-271-1/+1
* Merge pull request #167 from jrief/masterIacopo Spalletti2014-08-271-1/+1
|\
| * Fixes #166Jacob Rief2014-08-261-1/+1
|/
* Merge pull request #165 from yakky/masterIacopo Spalletti2014-08-201-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-14261-1499/+2055
|\
| * Added doco regarding the usages of super.renderPeter Farrell2014-07-311-1/+1
| * Update README.rstPeter Farrell2014-07-311-1/+25
| * 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-143-0/+29
|\ \
| * | Support Django 1.7 migrationsIacopo Spalletti2014-07-253-0/+29
* | | 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
| | |/ / | |/| |
* | | | Merge pull request #163 from zerok/toxIacopo Spalletti2014-08-134-37/+57
|\ \ \ \ | |_|/ / |/| | |
| * | | Integrate test suite with toxHorst Gutmann2014-08-104-37/+57
|/ / /
* | | Merge pull request #149 from zerok/additional_protocolsIacopo Spalletti2014-08-044-8/+37
|\ \ \
| * | | Add TEXT_ADDITIONAL_PROTOCOLS settingHorst Gutmann2014-08-034-8/+37
|/ / /
* | | Merge pull request #158 from mmarzantowicz/feature/fix-urlib-for-django-1.4Iacopo Spalletti2014-07-311-1/+5
|\ \ \
| * | | django.utils.six supports urlib since 1.5 - we need to do imports the old wayMateusz Marzantowicz2014-07-311-1/+5
|/ / /
* | | Merge pull request #154 from mmarzantowicz/feature/fix_stringio_errorIacopo Spalletti2014-07-301-3/+3
|\ \ \
| * | | Fixed: TypeError: initial_value must be str or None, not bytesMateusz Marzantowicz2014-07-291-3/+3
* | | | Merge pull request #155 from maestrofjp/masterIacopo Spalletti2014-07-301-0/+8
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | DOCO: Added information about usage of HTMLFieldPeter Farrell2014-07-301-0/+8
|/ /
* | 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
* | Merge pull request #145 from yakky/fix_mergeIacopo Spalletti2014-06-203-4/+4
|\ \ | |/ |/|
| * 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
* | Merge pull request #142 from mmarzantowicz/feature/static_moveIacopo Spalletti2014-06-16351-7/+7
|\ \ | |/ |/|
| * 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-0630-31/+33
* Merge pull request #136 from yakky/feature/cleanupIacopo Spalletti2014-06-069-29/+35
|\
| * Minor code cleanups. Restoring Py3Iacopo Spalletti2014-06-069-29/+35
* | Merge pull request #135 from yakky/feature/sanitizer_2Iacopo Spalletti2014-06-061-1/+1
|\ \ | |/
| * Fix sanitizerIacopo Spalletti2014-06-061-1/+1
|/
* Merge pull request #134 from mpaolini/option_disable_html_sanitizer_take_4Iacopo Spalletti2014-06-053-13/+23
|\
| * Optionally disable HTML sanitizing.Marco Paolini2014-06-053-13/+23
|/
* 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