Merge branch 'hotfix/2.1.2'

Author: Jonas Obrist

AUTHORS

@@ -1,153 +1,160 @@
-In no particular order:
+Current or previous core committers:
 
+* Chris Glass
+* Eric Robitaille
+* Jonas Obrist
 * Patrick Lauber
 * Peter Ciciman
-* Jonas Obrist
 * Stefan Foulis
-* Chris Glass
-* Eric Robitaille 
-* Simon Meers
-* brightwhitefox
+* Øyvind Saltvik
+
+Contributors (in alphabetical order):
+
+* A. Bram Neijt
+* aaloy
+* Aaron Renner
+* aball
+* Adi Sieker
+* Alberto Paro
+* Alessandro Ronchi
+* Angelo Dini
+* angular_circle
+* Antoni Aloy López
+* Arne Gellhaus
+* Artem Skoretskiy
+* Arthur Debert
+* Batiste Bieler
+* behrooz
 * Behrooz Nobakht
-* Martin Bommeli
-* Jason Zylks
-* philomat
-* Jannis Leidel
-* Ekrem Seren
+* Benjamin Wohlwend
+* Bernd Zeimetz
+* beshrkayali
+* Bob Karreman
+* brightwhitefox
+* Chanita Siridechkun
+* Charpentier Johan
+* Cheng-Chia Tseng
 * Chris Adams
-* martinkosir
-* Manolis Stamatogiannakis
-* Ulrich Petri
-* Luke Plant
-* Evandro Miquelito
-* Marco Rimoldi
-* aaloy
-* GaretJax
+* Chris Hughes
+* Christof Hagedorn
+* daniele
+* DaNmarner
+* Darryl Woods
 * David Jean Louis
-* Pedro Gracia
-* limpbrains :P
-* yohanboniface
+* David Thompson
+* Diógenes Augusto Fernandes Hermínio
 * dstufft
-* Samuel Lüscher
-* Philipp Bosch
-* timesong
-* kunitoki
+* DZ
+* eged
+* Egor V. Nazarkin
+* Ekrem Seren
+* Evandro Miquelito
+* f4nt
+* fcurella
+* Filip Kazimierczak
+* GaretJax
+* George Marshall
+* Gerard Świderski
+* homebrew79
+* hysia
+* Ian Lewis
+* indexofire
+* Ionel Maries Cristian
+* Ivan Vershigora
+* izi
+* Jameel Al-Aziz
+* James Richards
+* Jannis Leidel
+* Janusz Harkot
+* Jason Davies
+* Jason Jenkins
+* Jason Zylks
+* Javi Nievas
 * Johannes Bornhold
-* Alberto Paro
-* Yann Malet
-* wildermesser
-* Thomas Parslow
-* Maik Lustenberger
-* Arne Gellhaus
-* pigletto
+* John-Scott Atlakson
+* Jonathan Stoppani
+* jordanjambazov
+* kar1m
 * kochin
-* MW
+* Krzysztof Bandurski
+* kunitoki
+* Lars Smit
 * Lars van de Kerkhof
-* Jonathan Stoppani
-* Chanita Siridechkun
-* Benjamin Wohlwend
-* Aaron Renner
-* spookylukey
-* hysia
-* aball
-* Yann Malet
+* limpbrains :P
+* Lucas Vogelsang
+* Lucio Asnaghi
+* Luke Plant
+* m000
+* Maik Lustenberger
+* Manolis Stamatogiannakis
+* Manuel Schmidt
+* Marco Rimoldi
+* Mark Rogers
+* Martin Bommeli
+* Martin Kosír
+* martinkosir
+* mathijs
+* Maxim Bodyansky
+* Maxime Haineault
+* mbouchar
+* mcosta
+* meers
+* MerLex
 * Mokys
-* George Marshall
-* Diógenes Augusto Fernandes Hermínio
-* zundoya
-* yedpodtrzitko
-* shed
-* izi
-* behrooz
-* angular_circle
-* Robert Pogorzelski
-* Pigletto
+* mrlundis
+* MW
+* neoprolog
+* Orne Brocaar
+* padelt
+* Patrick Toal
+* Paul van der Linden
+* pbgc
+* Pedro Gracia
+* Pete Loggie
+* Peter-Paul van Gemerden
 * Petteri
-* Mark Rogers
-* Jason Jenkins
-* Антон Евжаков
-* Øyvind Saltvik
-* wid
-* wangJunjie
+* Philipp Bosch
+* philomat
 * phuihock
-* pbgc
-* padelt
-* neoprolog
-* mcosta
-* mathijs
-* m000
-* indexofire
-* fcurella
-* f4nt
-* beshrkayali
-* Yosuke Ikeda
-* Steve Steiner
-* Shinya Okano
+* Pigletto
+* pigletto
+* Piotr Kilczuk
+* poweredbypenguins
+* Remco Wendt
+* Restless Being
+* Robert Pogorzelski
+* Rodolfo Carvalho
+* rtpm
+* Samuel Lüscher
+* sealibora
+* Sean Bleier
 * Seyhun Akyurek
-* Peter-Paul van Gemerden
-* Martin Kosír
-* Lucio Asnaghi
-* James Richards
-* Ian Lewis
-* DaNmarner
-* DZ
-* Cheng-Chia Tseng
-* Charpentier Johan
-* Adi Sieker
-* A. Bram Neijt
-* tiret
-* ssteinerX
+* Shatalov Vadim
+* shed
+* Shinya Okano
+* Simon Hedberg
+* Simon Meers
 * sleytr
-* sealibora
-* rtpm
-* mrlundis
-* meers
-* mbouchar
-* jordanjambazov
-* eged
-* daniele
-* Yuri van der Meer
-* Wayne Moore
-* Tanel Külaots
+* spookylukey
+* ssteinerX
 * Stavros Korokithakis
-* Shatalov Vadim
-* Sean Bleier
-* Rodolfo Carvalho
-* Restless Being
-* Remco Wendt
-* Patrick Toal
-* Orne Brocaar
-* MerLex
-* Maxime Haineault
-* Maxim Bodyansky
-* Lucas Vogelsang
-* Lars Smit
-* John-Scott Atlakson
-* Jason Davies
-* Janusz Harkot
-* Ivan Vershigora
-* Gerard Świderski
-* Filip Kazimierczak
-* Egor V. Nazarkin
-* David Thompson
-* Darryl Woods
-* Chris Hughes
-* Bernd Zeimetz
-* Arthur Debert
-* Artem Skoretskiy
-* Alessandro Ronchi
-* Batiste Bieler
-* Antoni Aloy López
-* poweredbypenguins
-* homebrew79
-* Christof Hagedorn
-* Bob Karreman
-* Tino de Bruijn
-* Piotr Kilczuk
-* Pete Loggie
 * Steve R. Jones
-* Paul van der Linden
-* Ionel Maries Cristian
-* Simon Hedberg
-* Jameel Al-Aziz
-* Javi Nievas
+* Steve Steiner
+* Tanel Külaots
+* Thomas Parslow
+* timesong
+* Tino de Bruijn
+* tiret
+* Ulrich Petri
+* wangJunjie
+* Wayne Moore
+* wid
+* wildermesser
+* Yann Malet
+* Yann Malet
+* yedpodtrzitko
+* yohanboniface
+* Yosuke Ikeda
+* Yuri van der Meer
+* zundoya
+* Антон Евжаков

CHANGELOG.txt

@@ -12,7 +12,7 @@
 - testsuite working again
 - changelog file added
 
-==== 2.1.0 (2010-XX-XX) ====
+==== 2.1.0 (2011-01-26) ====
 
 - language namespaces for apphooks (reverse("de:myview"), reverse("en:myview"))
 - video plugin switch to http://github.com/FlashJunior/OSFlashVideoPlayer
@@ -35,3 +35,12 @@
 - templatetags refactored: see cms/docs/templatetags.txt for new signatures.
 - placeholder has new option: or and a endpalceholder templatetag
 
+==== 2.1.1 (2011-02-09) ====
+
+- Fixed CMS AJAX requests not being CSRF protected, thus not working in Django 1.2.5
+- Fixed toolbar CSS issues in Chrome/Firefox
+
+==== 2.1.2 (2011-02-16) ====
+
+- Fixed issues with the CSRF fix from 2.1.1.
+- Updated translation files from transifex.

cms/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-VERSION = (2, 1, 1, 'final')
+VERSION = (2, 1, 2, 'final')
 if VERSION[-1] != "final": # pragma: no cover
     __version__ = '.'.join(map(str, VERSION))
 else: # pragma: no cover

cms/admin/placeholderadmin.py

@@ -30,6 +30,7 @@ class Media:
         }
         js = [os.path.join(settings.CMS_MEDIA_URL, path) for path in (
             'js/lib/jquery.js',
+            'js/csrf.js',
             'js/lib/jquery.query.js',
             'js/lib/ui.core.js',
             'js/lib/ui.dialog.js',