summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Fix deprecation warning introduced in Django 1.7Michael P. Jung2015-04-021-1/+6
|/ / / /
* | | | Merge pull request #172 from ironhouzi/patch-2Piotr Maliński2015-03-011-4/+2
|\ \ \ \
| * | | | Fix formatting for information about S3Robin Skahjem-Eriksen2015-03-011-4/+2
|/ / / /
* | | | Merge pull request #171 from ironhouzi/patch-1Piotr Maliński2015-03-011-0/+5
|\ \ \ \
| * | | | Add vital information for S3 sectionRobin Skahjem-Eriksen2015-03-011-0/+5
|/ / / /
* | | | Merge pull request #168 from karec/masterriklaunim2015-02-071-2/+2
|\ \ \ \
| * | | | fix a bug for unicode string in utils.py for python3.2 support (current debia...karec2015-02-061-2/+2
|/ / / /
* | | | Merge pull request #165 from stelzzz/patch-1riklaunim2015-01-281-1/+1
|\ \ \ \
| * | | | Links buttons not workedPavel Zaytsev2015-01-271-1/+1
|/ / / /
* | | | Merge pull request #163 from nreilly/patch-1riklaunim2015-01-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update README.rstnreilly2015-01-251-1/+1
|/ / /
* | | Merge pull request #159 from christianglodt/masterriklaunim2015-01-243-2/+8
|\ \ \ | |_|/ |/| |
| * | Restore external-plugin-resources handling.helicopetr2014-12-123-2/+8
|/ /
* | [close #156] Update Readme.Piotr Maliński2014-12-071-1/+1
* | Merge pull request #149 from b2550/patch-1riklaunim2014-12-071-0/+2
|\ \
| * | Update README.rstb25502014-11-241-1/+1
| * | Update README.rstb25502014-11-241-0/+2
| |/
* | Bump version.Piotr Maliński2014-12-072-1/+11
* | Fix tests for newer ckeditor version.Piotr Maliński2014-12-071-3/+3
* | Merge pull request #151 from dessibelle/masterriklaunim2014-12-07157-712/+841
|\ \
| * | Updated to CKEditor 4.4.6Simon Fransson2014-11-26157-712/+841
| |/
* | Add doctype to template.Piotr Maliński2014-12-071-1/+3
* | Check for jQuery presence correctly.Piotr Maliński2014-12-071-3/+10
|/
* Merge pull request #148 from jsatt/exclude-hidden-directoriesriklaunim2014-11-231-0/+2
|\
| * exclude hidden directories from image browserJeremy Satterfield2014-11-231-0/+2
|/
* Merge pull request #147 from kevgathuku/patch-1riklaunim2014-11-201-0/+1
|\
| * Provide Link and Unlink buttons in default configKevin Ndung'u2014-11-201-0/+1
|/
* Merge pull request #144 from shaunsephton/documentationPeter Novotnak2014-11-073-0/+165
|\
| * additional readme conversion, converted setext-style headers to atx-style for...Peter Novotnak2014-11-072-24/+22
| * converting RST to MDPeter Novotnak2014-11-072-15/+15
| * added docs dir with README.rst split out into two .md files (installation, us...Peter Novotnak2014-11-073-0/+167
|/
* Merge pull request #140 from natejlong/masterPeter Novotnak2014-11-071-4/+11
|\
| * replace .live with .delegate, more correctNathan Long2014-10-271-1/+1
| * Merge branch 'master' of github.com:natejlong/django-ckeditorNathan Long2014-10-270-0/+0
| |\
| | * Merge branch 'master' of https://github.com/shaunsephton/django-ckeditorNathan Long2014-10-274-41/+64
| | |\
| * | \ Merge branch 'master' of https://github.com/shaunsephton/django-ckeditorNathan Long2014-10-274-41/+64
| |\ \ \ | | |/ / | |/| / | | |/
| * | include .delegate() case for jQuery < 1.7 usersNathan Long2014-10-271-4/+11
* | | Merge pull request #143 from lqez/masterPeter Novotnak2014-11-071-2/+2
|\ \ \
| * | | Update README.rstPark Hyunwoo2014-11-071-2/+2
|/ / /
* | | [close #133] Extend CKEDITOR_JQUERY_URL description in readme.Piotr Maliński2014-11-021-1/+1
* | | [close #141] Fix checking if thumbnail exists in management command.Piotr Maliński2014-11-021-1/+11
* | | Merge branch 'master' of https://github.com/shaunsephton/django-ckeditorPiotr Maliński2014-11-024-16/+29
|\ \ \ | | |/ | |/|
| * | Merge pull request #138 from dessibelle/masterriklaunim2014-10-221-2/+11
| |\ \
| | * | Added lazy JSON encoder in order to support i18n in CKEditor settingsSimon Fransson2014-10-221-2/+11
| * | | Merge pull request #136 from dessibelle/masterriklaunim2014-10-202-2/+3
| |\ \ \ | | |/ /
| | * | Added never_cache() decorator to browse view, as the it often did not display...Simon Fransson2014-10-161-1/+2
| | * | Made get_image_files() exclude hidden files (leading . in filename).Simon Fransson2014-10-161-1/+1
| * | | Merge pull request #137 from natejlong/masterriklaunim2014-10-181-12/+15
| |\ \ \ | | |/ / | |/| / | | |/
| | * Set $ to django.jQuery if $ not defined, organize ckeditor-init.js, replace ....Nathan Long2014-10-171-12/+15
* | | [close #139] Fix UnicodeErrors in management command.Piotr Maliński2014-11-021-2/+2
|/ /