Merge remote-tracking branch 'upstream/release/3.2.x' into HEAD

.travis.yml

@@ -88,6 +88,7 @@ matrix:
     - python: 2.7
       env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
     - python: 2.7
+
       env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
 
     - python: 3.4

AUTHORS

@@ -20,7 +20,7 @@ Current and previous core designers:
 * Christian Bertschy
 
 
-Contributors (based on gitlog) (515):
+Contributors (based on gitlog):
 
 * A. Bram Neijt
 * aaloy
@@ -31,7 +31,6 @@ Contributors (based on gitlog) (515):
 * Adi Sieker
 * Admin Adminaras
 * Adrien Brunet
-* Adrián Ribao
 * Adrián Ribao Martínez
 * Alberto Paro
 * Ales Kocjancic
@@ -42,21 +41,18 @@ Contributors (based on gitlog) (515):
 * Alex Marandon
 * Alexandre Leray
 * Alexey Subbotin
-* Aleš Kocjančič
 * Alvin Mites
 * Anatoly Ivanov
 * Andi Albrecht
 * Andre Bossard
 * Andrea Stagi
 * Andrei Avram
 * Andrei Fokau
-* Andrew Cassidy
 * Andrew Schoen
 * Angelo Dini
 * angular_circle
 * Antoine Catton
 * Anton Parkhomenko
-* Antoni Aloy López
 * AQNOUCH Mohammed
 * Arcady Usov
 * Arne Gellhaus
@@ -65,15 +61,12 @@ Contributors (based on gitlog) (515):
 * Arthur Debert
 * Artis Avotins
 * Aymeric Augustin
-* Bashar Al-Abdulhadi
 * Basile LEGAL
-* Batiste Bieler
 * behrooz
 * Behrooz Nobakht
 * Belegnar
 * Ben Northway
 * Ben Stähli
-* Beni Wohlwend
 * Benjamin
 * Benjamin Liles
 * Benjamin Wohlwend
@@ -95,7 +88,6 @@ Contributors (based on gitlog) (515):
 * Carlo Ascani
 * Carlos de Paula
 * casio
-* Catalin Dragomirescu
 * centralniak
 * Chanita Siridechkun
 * Charlie Denton
@@ -108,7 +100,6 @@ Contributors (based on gitlog) (515):
 * Chris Jones
 * Chris Wesseling
 * Chris Wilson
-* Christian Bertschy
 * Christian Strappazzon
 * Christof Hagedorn
 * Christopher Grebs
@@ -117,7 +108,6 @@ Contributors (based on gitlog) (515):
 * Claudio Bartolini
 * Colin Wirz
 * Conrado Buhrer
-* Conrado Bührer
 * Corey Farwell
 * Craig de Stigter
 * Craig Ricciuto
@@ -137,6 +127,7 @@ Contributors (based on gitlog) (515):
 * Darren Pearce
 * Darryl Woods
 * Dave Bell
+* Dave Hall
 * David Grant
 * David Jean Louis
 * David Lam
@@ -151,6 +142,7 @@ Contributors (based on gitlog) (515):
 * dlamotte
 * Dmitry Akinin
 * Dmitry Gorelik
+* Dmytro Gorelik
 * Donatas
 * Donatas Kučinskas
 * Douwe van der Meij
@@ -169,10 +161,8 @@ Contributors (based on gitlog) (515):
 * ericr
 * Erik Allik
 * Erlend Dalen
-* Eugen MechanisM
 * Eugene MechanisM
 * Evandro Miquelito
-* Evgeny Demchenko
 * evildmp
 * F. Gabriel Gosselin
 * f4nt
@@ -195,10 +185,8 @@ Contributors (based on gitlog) (515):
 * Geoffrey Fairchild
 * Geoffrey Hing
 * George Marshall
-* Gerard Świdersk
 * Gerard Świderski
 * Germano Gabbianelli
-* Germano Gabbianellii
 * Gilles Lenfant
 * Gleb Chipiga
 * Gregory Klupar
@@ -207,18 +195,15 @@ Contributors (based on gitlog) (515):
 * Hans Andersen
 * hedberg
 * henning
-* Henning Spran
 * Henning Sprang
 * Herbert Poul
 * hjkelly
-* homebrew79
 * Horst Gutmann
 * hysia
 * Iacopo Spalletti
 * Ian Lewis
 * ikudryavtsev
 * indexofire
-* Ionel Cristian Maries
 * Ionel Maries Cristian
 * Ivan Vershigora
 * Iván Raskovsky
@@ -238,8 +223,6 @@ Contributors (based on gitlog) (515):
 * Jason Davies
 * Jason Jenkins
 * Jason Robinson
-* Jason Zylks
-* Javi Nievas
 * Jeffrey Goettsch
 * JensDiemer
 * Jeroen Noten
@@ -254,7 +237,6 @@ Contributors (based on gitlog) (515):
 * Jonathan Stoppani
 * jordanjambazov
 * Jorge Vargas
-* Jorge Vargas (elpargo)
 * Jos van Velzen
 * Joseph Bergantine
 * Joseph Melettukunnel
@@ -263,23 +245,18 @@ Contributors (based on gitlog) (515):
 * João Luiz Lorencetti
 * Julien Poissonnier
 * Kalle Bronsen
-* kar1m
 * kater169
-* kblomqvis
 * kblomqvist
 * Kegan Holtzhausen
 * Keryn Knight
 * Kevin Richardson
-* Kim Blomqvist
 * Kim Thoenen
 * kochin
 * Kristian Øllegaard
-* Krzysztof Bandurski
 * kunitoki
 * L-A Iscla
 * Lars Smit
 * Lars van de Kerkhof
-* limpbrains :P
 * Lio Mendonca
 * Lionardo Mendonça
 * littlepea
@@ -302,12 +279,13 @@ Contributors (based on gitlog) (515):
 * Marco Paolini
 * Marco Rimoldi
 * marcor
+* Marijn Goedegebure
 * Mark Rogers
 * Markus Holtermann
+* Markus Zapke-Gründemann
 * Markus Zapke-Gründemann
 * Marti Raudsepp
 * Martin
-* Martin Bommeli
 * Martin Brochhaus
 * Martin Koistinen
 * Martin Kosír
@@ -347,7 +325,6 @@ Contributors (based on gitlog) (515):
 * Nelson Brochado
 * neoprolog
 * Nick Jones
-* Nickolay V. Shmyrev
 * nikolas
 * nsh
 * o-zander
@@ -359,7 +336,6 @@ Contributors (based on gitlog) (515):
 * Oyvind Saltvik
 * padelt
 * Pankrat
-* Paolo
 * Paolo Leggio
 * Pascal Mouret
 * pascal.beyeler
@@ -377,7 +353,6 @@ Contributors (based on gitlog) (515):
 * pcicman
 * Pedro Gracia
 * Pete Loggie
-* Peter Ciciman
 * Peter Farrell
 * Peter J. Farrell
 * Peter Landry
@@ -392,8 +367,6 @@ Contributors (based on gitlog) (515):
 * Pigletto
 * Piotr Kilczuk
 * piquadrat
-* poweredbypenguins
-* Pratik Vyas
 * pumalo
 * Rafal Radulski
 * raidsan
@@ -414,7 +387,6 @@ Contributors (based on gitlog) (515):
 * Robert Pogorzelski
 * Roberto
 * Roberto Bampi
-* Roberto Lopez
 * Robin Lewis
 * robint
 * Rodolfo Carvalho
@@ -429,7 +401,6 @@ Contributors (based on gitlog) (515):
 * Samuel Lüscher
 * sbussetti
 * Schoen
-* Scott Barnham
 * scottbarnham
 * sealibora
 * Sean Bleier
@@ -451,29 +422,29 @@ Contributors (based on gitlog) (515):
 * ssteinerX
 * Stavros Korokithakis
 * Stefan Foulis
-* Stefan T. Oertel
 * Stefan Wehrmeyer
 * stefanfoulis
 * Stefano Brentegani
 * Stefano Crosta
 * Stefano Morandi
+* Steffen Jasper
 * Stephan
 * Stephan Hepper
 * Stephan Herzog
 * Stephan Jaekel
 * Stephen Muss
+* Stephen Paulger
 * Stephen Watkin
-* Steve R. Jones
 * Steve Steiner
 * Steven Laroche
 * Sylvain Fankhauser
+* Tadas Dailyda
 * Tanel Külaots
 * tdelam
 * tehfink
 * Thomas Parslow
 * Thomas Remmert
 * Thomas Woolford
-* Tibor Balogh
 * Tim Anderegg
 * Tim Davies
 * Tim Graham
@@ -492,14 +463,12 @@ Contributors (based on gitlog) (515):
 * User
 * Vadim Lopatyuk
 * Vadim Sikora
-* Vasil Vangelovski
 * Venelin Stoykov
 * Viktor Nagy
 * Viliam Segeda
 * Vinit (Vermicelli on IRC)
 * vinit kumar
 * Vinod Kurup
-* Vitor Figueiro
 * Vladimir Bolshakov
 * Vladyslav
 * vvangelovski

CHANGELOG.txt

@@ -3,24 +3,25 @@
 * Removed support for Django 1.6, 1.7 and python 2.6
 * Set the default value of CMSPlugin.position to 0 instead of null
 
-=== 3.2.1 (Unreleased) ===
-
-- Add support for Django 1.9 (with some deprecation warnings)
-- Add support for django-reversion 1.10+
-- Fixed an issue with refreshing the UI when switching CMS language
-- Fixed an issue with sideframe urls not being remembered after reload
-- Added placeholder name to the edit tooltip
-- Fix breadcrumb in page revision list
-- Fix clash with Foundation that caused "Add plugin" button to be unusable
-- Fixed a tree corruption when pasting a nested plugin under another plugin.
-- Fix message with CMS version not showing up on hover in debug mode
-- Fix messages not being positioned correctly in debug mode
-- Fixed an issue where plugin parent restrictions where not respected when pasting a plugin.
-- Fixed an issue where "Copy all" menu item could've been clicked on empty placeholder
-- Added attr['is_page']=True to CMS Page navigation nodes
-- Fixed a bug where page tree styles didn't load from STATIC_URL that pointed
-  to a different host
-- Honored CMS_RAW_ID_USERS in GlobalPagePermissionAdmin
+=== 3.2.1 (2016-01-29) ===
+
+- Add support for Django 1.9 (with some deprecation warnings).
+- Add support for django-reversion 1.10+ (required by Django 1.9+).
+- Add placeholder name to the edit tooltip.
+- Add attr['is_page']=True to CMS Page navigation nodes.
+- Add Django and Python versions to debug bar info tooltip
+- Fix an issue with refreshing the UI when switching CMS language.
+- Fix an issue with sideframe urls not being remembered after reload.
+- Fix breadcrumb in page revision list.
+- Fix clash with Foundation that caused "Add plugin" button to be unusable.
+- Fix a tree corruption when pasting a nested plugin under another plugin.
+- Fix message with CMS version not showing up on hover in debug mode.
+- Fix messages not being positioned correctly in debug mode.
+- Fix an issue where plugin parent restrictions where not respected when pasting a plugin.
+- Fix an issue where "Copy all" menu item could've been clicked on empty placeholder.
+- Fix a bug where page tree styles didn't load from STATIC_URL that pointed to a different host.
+- Fix an issue where the side-frame wouldn't refresh under some circumstances.
+- Honor CMS_RAW_ID_USERS in GlobalPagePermissionAdmin.
 
 
 === 3.2.0 (2015-11-24) ===
@@ -78,6 +79,21 @@
 - Fixed an issue where ``allow_children`` and ``disable_child_plugins`` didn't work on dragitems
 
 
+=== 3.1.5 (2016-01-29) ===
+
+- Fixed a tree corruption when pasting a nested plugin under another plugin.
+- Improve CMSPluginBase.render documentation
+- Fix CMSEditableObject context generation which generates to errors with django-classy-tags 0.7.1
+- Fix error in toolbar when LocaleMiddleware is not used
+- Move templates validation in app.ready
+- Fix ExtensionToolbar when language is removed but titles still exists
+- Fix pages menu missing on fresh install 3.1
+- Fix incorrect language on placeholder text for redirect field
+- Fix PageSelectWidget JS syntax
+- Fix redirect when disabling toolbar
+- Fix CMS_TOOLBAR_HIDE causes 'WSGIRequest' object has no attribute 'toolbar'
+
+
 === 3.1.4 (2015-11-24) ===
 
 - Fixed a problem in ``0010_migrate_use_structure.py`` that broke some migration paths to Django 1.8
@@ -626,6 +642,3 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - docs updated
 - permissions now working in multisite environment
 - home is now graphically designated in tree-view
-
-==== 2.0.0 (2009-11-12) ====
-