Merge branch 'develop' of git://github.com/divio/django-cms into develop

kezabelle · Aug 24, 2011 · ff78478 · ff78478
2 parents 17df6c9 + 5e9e4bb
commit ff78478
Show file tree

Hide file tree

Showing 172 changed files with 21,493 additions and 15,937 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -52,10 +52,14 @@
 - Fixed PlaceholderField not respecting limits in CMS_PLACEHOLDER_CONF (thanks to Ben Hockey for reporting this)
 - Fixed the double-monkeypatch check for url reversing (thanks to Benjamin Wohlwend for the patch)
 
+==== 2.1.4 (2011-08-24) ====
+
+- Fixed a XSS issue in Text Plugins
+
 ==== 2.2.0 (In Development) ====
 
 - Replaced the old plugin media framework with django-sekizai. (This changed some plugin templates which might cause problems with your CSS styling).
 - Made django-mptt a proper dependency
 - Removed support for django-dbgettext
 - Google Maps Plugin now defaults to use HTTPS.
-- Google Maps Plugin now uses the version 3 of their API, no longer requiring an API Key.
+- Google Maps Plugin now uses the version 3 of their API, no longer requiring an API Key.
diff --git a/cms/__init__.py b/cms/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '2.2b1.post1'
+__version__ = '2.2rc1.post2'
 
 # patch settings 
 try:

diff --git a/cms/locale/ar/LC_MESSAGES/django.mo b/cms/locale/ar/LC_MESSAGES/django.mo