Commit Graph

  • 94d6b5e2d5 add pydist-overrides file debian Jérôme Schneider 2014-11-14 16:26:58 +0100
  • 6a7aa2a0a7 Reduce debian version Benjamin Dauvergne 2014-09-25 16:00:30 +0200
  • bb068e8afd first commit Benjamin Dauvergne 2014-09-25 15:59:52 +0200
  • c38d62b804 Merge pull request #171 from yakky/feature/fix_setup master Iacopo Spalletti 2014-09-07 05:56:54 +0200
  • b0fcb86062 Fix setup.py to handle migrations_django package Iacopo Spalletti 2014-09-06 18:45:23 +0200
  • dcb1a2e2c8 bump version Patrick Lauber 2014-08-27 11:42:42 +0200
  • 8aea91cadb Merge pull request #167 from jrief/master Iacopo Spalletti 2014-08-27 09:34:26 +0200
  • 5a58b78124 Fixes #166 Jacob Rief 2014-08-27 00:37:31 +0200
  • 9b5c5bccc3 Merge pull request #165 from yakky/master Iacopo Spalletti 2014-08-20 18:44:03 +0200
  • 2bfac7901e Change migration dependency Iacopo Spalletti 2014-08-19 19:06:28 +0200
  • 0f733067de Recreate migrations Iacopo Spalletti 2014-08-16 14:08:12 +0200
  • 5732349dd1 version bump Patrick Lauber 2014-08-14 11:43:44 +0200
  • 1ae036d592 Merge pull request #157 from maestrofjp/doco_updates Patrick Lauber 2014-08-14 11:40:14 +0200
  • 981d5dc52e Merge pull request #161 from yakky/django_17_migrations Patrick Lauber 2014-08-14 11:37:59 +0200
  • ad9eed7d15 Merge pull request #162 from yakky/feature/translated_link Patrick Lauber 2014-08-14 11:37:47 +0200
  • 70834259f1 Merge pull request #153 from marekmalek/master Iacopo Spalletti 2014-08-13 15:47:16 +0200
  • a479f33567 Merge pull request #163 from zerok/tox Iacopo Spalletti 2014-08-13 08:30:04 +0200
  • e549a3c7a8 Integrate test suite with tox Horst Gutmann 2014-08-10 16:58:06 +0200
  • 3a93332053 Translate 'Link' string to handle link plugin in different languages Iacopo Spalletti 2014-08-07 23:04:32 +0200
  • 4849794ac0 Merge pull request #149 from zerok/additional_protocols Iacopo Spalletti 2014-08-04 20:57:09 +0200
  • 1051f72a5c Add TEXT_ADDITIONAL_PROTOCOLS setting Horst Gutmann 2014-07-21 14:52:10 +0200
  • adf4a7c104 Merge pull request #158 from mmarzantowicz/feature/fix-urlib-for-django-1.4 Iacopo Spalletti 2014-07-31 18:59:52 +0200
  • f8700bf147 django.utils.six supports urlib since 1.5 - we need to do imports the old way Mateusz Marzantowicz 2014-07-31 15:07:40 +0200
  • 58908f40d3 Added doco regarding the usages of super.render Peter Farrell 2014-07-30 21:47:59 -0500
  • 96b5094ba3 Update README.rst Peter Farrell 2014-07-30 21:46:18 -0500
  • af28df8581 Updated ckeditor to 4.4.3 for security XSS patch and problems with 9998 family of issues with Chrome / Webkit peterfarrell 2014-07-30 17:04:36 -0500
  • 93e9b22a17 Merge pull request #154 from mmarzantowicz/feature/fix_stringio_error Iacopo Spalletti 2014-07-30 22:40:31 +0200
  • 97ea29deab Merge pull request #155 from maestrofjp/master Iacopo Spalletti 2014-07-30 22:40:05 +0200
  • 8cd18af3f2 DOCO: Added information about usage of HTMLField Peter Farrell 2014-07-30 12:20:59 -0500
  • 16ae4b34ca Fixed: TypeError: initial_value must be str or None, not bytes Mateusz Marzantowicz 2014-07-29 14:47:40 +0200
  • a61a5b48e1 Merge pull request #144 from mmarzantowicz/feature/django-utils-six Iacopo Spalletti 2014-07-29 09:59:45 +0200
  • 0476cfcadf Fixes #150. Fix for migration 0002 to handle non default database connections. Marek Malek 2014-07-25 17:39:12 +0200
  • 0ea56f4eb7 Support Django 1.7 migrations Iacopo Spalletti 2014-08-03 18:12:34 +0200
  • d88a170be4 Merge pull request #145 from yakky/fix_merge Iacopo Spalletti 2014-06-20 09:06:46 +0200
  • 6babddec17 Remove logging Iacopo Spalletti 2014-06-20 09:06:28 +0200
  • 5caf84c10d Fix ckeditor path issues Iacopo Spalletti 2014-06-15 17:34:20 +0200
  • b6fb880aed Import StringIO from django.utils.six.moves Mateusz Marzantowicz 2014-06-19 17:55:55 +0200
  • fd1d8d1f00 Import urljoin from django.utils.six.moves Mateusz Marzantowicz 2014-06-19 17:52:37 +0200
  • b1ea5551bd Merge pull request #140 from ucdavis-agecon/master Iacopo Spalletti 2014-06-17 07:45:13 +0200
  • 0658a059ff Merge pull request #142 from mmarzantowicz/feature/static_move Iacopo Spalletti 2014-06-16 09:30:33 +0200
  • a38754193d fix URLs to reflect new static file location Mateusz Marzantowicz 2014-06-15 16:58:55 +0200
  • 698561316e move static files to djangocms_text_ckeditor subdirectory Mateusz Marzantowicz 2014-06-15 16:40:37 +0200
  • 4fa93f0deb Fixes #139. Properly construct ckeditor_basepath in cms_plugins.py to eliminate the double slashes. Jeffrey Goettsch 2014-06-13 12:32:29 -0700
  • 6990bd4968 locales and wheel support and version bump Patrick Lauber 2014-06-06 10:19:35 +0200
  • b415e447d0 Merge pull request #136 from yakky/feature/cleanup Iacopo Spalletti 2014-06-06 08:04:35 +0200
  • 20f97b5bcd Merge pull request #135 from yakky/feature/sanitizer_2 Iacopo Spalletti 2014-06-06 08:03:26 +0200
  • f61af7305d Minor code cleanups. Restoring Py3 Iacopo Spalletti 2014-06-06 08:02:54 +0200
  • 70597cc8b4 Fix sanitizer Iacopo Spalletti 2014-06-05 22:34:23 +0200
  • e8dc34bf3c Merge pull request #134 from mpaolini/option_disable_html_sanitizer_take_4 Iacopo Spalletti 2014-06-05 20:09:24 +0200
  • a2e8fbd2c6 Optionally disable HTML sanitizing. Marco Paolini 2014-05-19 08:43:35 +0200
  • 05408380e6 Merge pull request #130 from johnraz/Issue129-body-should-not-be-a-proxy Iacopo Spalletti 2014-06-04 17:17:04 +0200
  • 1ceafc941b version bump to 2.1.5 Kim Thoenen 2014-06-04 17:15:07 +0200
  • 02bc269dfd Merge pull request #121 from yakky/feature/configuration Kim Thoenen 2014-06-04 17:13:02 +0200
  • 65d43a3249 Better handling of CMS/HTMLField toolbar selection Iacopo Spalletti 2014-06-04 16:31:04 +0200
  • be659a9df5 Use force_text for django 1.5+ on yakky's recommendation Jonathan Liuti 2014-05-25 16:12:04 +0200
  • 65c9934936 Fix #129, force_unicode on body to make sure it's not a proxy object anymore Jonathan Liuti 2014-05-25 15:39:43 +0200
  • 3e41c226a3 Add documentation Iacopo Spalletti 2014-05-17 16:17:12 +0200
  • 3a9a98e66a Allow custom configuration for CMS plugin widget Iacopo Spalletti 2014-04-28 19:23:03 +0200
  • e648d80924 Fix switch between CMS and HTMLField toolbar Iacopo Spalletti 2014-04-27 09:23:30 +0200
  • c35290ca45 Allow ckeditor customization in HTMLField Iacopo Spalletti 2014-04-20 10:23:56 +0200
  • f20f1aa810 Merge pull request #127 from jgoettsch/master Iacopo Spalletti 2014-05-18 11:48:18 +0200
  • c37187ac11 Merge pull request #119 from itcrab/bugfix/many-editors-in-inline-admin Iacopo Spalletti 2014-05-18 11:33:28 +0200
  • ad91c0fe24 Introduce CKEDITOR_BASEPATH to the text_plugin_change_form.html template. Fixes #124. Jeffrey Goettsch 2014-05-15 12:49:34 -0700
  • eeaee308b5 Set window.CKEDITOR_BASEPATH in text_plugin_change_form.html to fix #124. Jeffrey Goettsch 2014-05-14 16:48:25 -0700
  • 5ccf6ca00b Small fixes. Arcady Usov 2014-05-05 21:09:20 +0600
  • 6b15ad3385 Removed many places where we set class for CKEditor and make only one place for this. Arcady Usov 2014-05-05 21:07:56 +0600
  • a54a5882e3 Remove loop from ".add-row" buttons. Arcady Usov 2014-05-05 19:22:44 +0600
  • 6ec6e1acf0 Fix check equals. Arcady Usov 2014-04-28 18:57:14 +0600
  • f81e415dd0 Code styling. Arcady Usov 2014-04-28 18:55:06 +0600
  • 6182ea4d6a Merge pull request #122 from mmarzantowicz/install-requires Iacopo Spalletti 2014-04-27 19:46:47 +0200
  • c8ecf8f6b6 Fix not started CKEditor when I used plugins extending "TextPlugin". Arcady Usov 2014-04-15 23:52:13 +0600
  • f3b5188a1a Fix "add-row" link in admin inline for initial CKEditor when it's placed in new row admin inline. Arcady Usov 2014-04-13 23:53:47 +0600
  • d3d0d102ca Remove hard container relation with initialization CKEditor (initial CKEditor in all DOM-elements with class "CMS_CKEditor"). Arcady Usov 2014-04-13 23:51:09 +0600
  • 6f4f59655a Move initial CKEditor code to function and run it when '#container' ready. Arcady Usov 2014-04-13 23:39:51 +0600
  • 47dc1824da fix for admin inline when on page many ckeditors. Arcady Usov 2014-04-12 22:46:20 +0600
  • 2d7a3d6edd Update INSTALL_REQUIRES in setup.py Mateusz Marzantowicz 2014-04-10 11:07:58 +0200
  • 28e5e10c16 adding HorizontalRule FinalAngel 2014-04-07 17:41:52 +0200
  • 98e31fa09e fixes #107 Angelo Dini 2014-03-17 08:17:10 +0100
  • 2049a7d754 Merge pull request #111 from asmaps/patch-1 Patrick Lauber 2014-03-06 15:28:46 +0100
  • 263d1600ee Extend README Arne Schauf 2014-03-06 15:27:00 +0100
  • 8f410cb221 version bump Patrick Lauber 2014-03-06 14:59:27 +0100
  • 5c4e0fc24f Merge pull request #110 from asmaps/patch-1 Patrick Lauber 2014-03-06 14:58:04 +0100
  • ea9622ce44 Fix a typo Arne Schauf 2014-03-06 14:57:16 +0100
  • d437a370b9 locales updated Patrick Lauber 2014-03-05 09:46:22 +0100
  • df350c37b0 update cms paths FinalAngel 2014-03-05 08:49:02 +0100
  • 2efd1b0439 Merge pull request #108 from jrief/fix-missing-unlocalize Iacopo Spalletti 2014-02-22 08:21:10 +0100
  • ff1afa5242 Removed debug info Jacob Rief 2014-02-21 23:41:57 +0100
  • b6c80eda9b Add missing unlocalize filters Jacob Rief 2014-02-21 23:33:01 +0100
  • 9b57a11b1c Merge pull request #105 from divio/fix/broken-migrations Kim Thoenen 2014-02-11 16:18:12 +0100
  • fc8eedc8e9 version bump Kim Thoenen 2014-02-11 15:33:34 +0100
  • 092918f13d Fixed issue with migrations Kim Thoenen 2014-02-11 15:33:24 +0100
  • d6eb801df3 version bump Patrick Lauber 2014-02-07 17:51:47 +0100
  • 8061276558 Merge branch 'master' of github.com:divio/djangocms-text-ckeditor Patrick Lauber 2014-02-07 17:48:13 +0100
  • bd12205ea9 Merge pull request #103 from divio/fix/removing-plugins Patrick Lauber 2014-02-05 15:51:40 +0100
  • fc43753d26 Removed warnings, added check for TEXT_SAVE_IMAGE_FUNCTION Kim Thoenen 2014-02-05 15:48:17 +0100
  • 9301e196e3 Added try/excepts for deprecated imports Kim Thoenen 2014-02-05 15:36:32 +0100
  • 174d822e06 Revert "fixed circular import" Kim Thoenen 2014-02-05 14:30:12 +0100
  • fd57e018f5 fixed circular import Kim Thoenen 2014-02-05 14:24:00 +0100
  • 3a18396a77 updated import to match newest cms Kim Thoenen 2014-02-05 14:18:55 +0100
  • a55948f65e version bump Patrick Lauber 2014-02-03 13:01:30 +0100