Permalink
Browse files

Merge pull request #6577 from divio/release/3.6.x

Merged release/3.6.x into develop
  • Loading branch information...
evildmp committed Dec 12, 2018
2 parents 9830032 + 577d8e1 commit 8aa2c6916182f5fcf92e2e27077e0c3df7d0d4dc
Showing 360 changed files with 2,062 additions and 30,277 deletions.
46 AUTHORS
@@ -21,8 +21,9 @@ Current and previous core designers:
* Matthias Nüesch


Contributors (based on gitlog, 497 unique authors):
Contributors (based on gitlog, 537 unique authors):

* Антон Евжаков
* A. Bram Neijt
* aaloy
* Aaron Fay
@@ -34,6 +35,7 @@ Contributors (based on gitlog, 497 unique authors):
* Admin Adminaras
* Adrien Brunet
* Adrián Ribao Martínez
* Aidas Bendoraitis
* Alberto Paro
* Ales Kocjancic
* Ales Zabala Alava (Shagi)
@@ -44,18 +46,22 @@ Contributors (based on gitlog, 497 unique authors):
* Alexander Paramonov
* Alexandre Leray
* Alexey Subbotin
* Aliaksei Urbanski
* alskgj
* Alvin Mites
* Anatoly Ivanov
* Andi Albrecht
* Andras Gyömrey
* Andre Bossard
* Andrea Stagi
* Andreas Elvers
* Andrei Avram
* Andrei Fokau
* Andrew Schoen
* André Cruz
* Angelo Dini
* angular_circle
* Anthony Steinhauser
* Antoine Catton
* Anton Parkhomenko
* AQNOUCH Mohammed
@@ -66,6 +72,7 @@ Contributors (based on gitlog, 497 unique authors):
* Arthur Debert
* Artis Avotins
* Aymeric Augustin
* Bartosz Płóciennik
* Basile LEGAL
* behrooz
* Behrooz Nobakht
@@ -94,9 +101,12 @@ Contributors (based on gitlog, 497 unique authors):
* Carlos de Paula
* casio
* centralniak
* Cezar Pendarovski
* cezar77
* Chanita Siridechkun
* Charlie Denton
* Charpentier Johan
* Chematronix
* Cheng-Chia Tseng
* Chris Adams
* Chris Franklin
@@ -177,11 +187,13 @@ Contributors (based on gitlog, 497 unique authors):
* fcurella
* febsn
* Filip Kazimierczak
* Filipe Waitman
* FinalAngel
* fivethreeo
* fj
* floppya
* Florian Verdet
* Frank
* Frank Bieniek
* FrankBie
* frost-nzcr4
@@ -209,6 +221,7 @@ Contributors (based on gitlog, 497 unique authors):
* hedberg
* henning
* Henning Sprang
* heppstux
* Herbert Poul
* hjkelly
* Horst Gutmann
@@ -224,11 +237,13 @@ Contributors (based on gitlog, 497 unique authors):
* J. Cliff Dyer
* Jacob Rief
* Jakob Hedman
* Jakub Randák
* jalaziz
* Jameel Al-Aziz
* James Richards
* James Rutherford
* Jana Deutschlaender
* Jannik V
* Jannis Leidel
* Janusz Harkot
* Jared Proffitt
@@ -238,6 +253,7 @@ Contributors (based on gitlog, 497 unique authors):
* Jason Robinson
* Jeffrey Goettsch
* Jens Diemer
* JensDiemer
* Jeroen Noten
* Jessica Tallon
* Jimmy Lam
@@ -252,14 +268,17 @@ Contributors (based on gitlog, 497 unique authors):
* Jorge Vargas
* Jos van Velzen
* Joseph Bergantine
* Joseph Lin
* Joseph Melettukunnel
* Josh Kalderimis
* Josh Schneier
* João Luiz Lorencetti
* Julien Poissonnier
* Julz
* Júlio R. Lucchese
* Kalle Bronsen
* kater169
* Katie McLaughlin
* kblomqvist
* Kegan Holtzhausen
* Keryn Knight
@@ -269,12 +288,14 @@ Contributors (based on gitlog, 497 unique authors):
* Kim Thoenen
* kochin
* Kristian Øllegaard
* Krzysztof Socha
* kunitoki
* L-A Iscla
* Lars Smit
* Lars van de Kerkhof
* Leonardo
* Laurens Bosscher
* Leon Smith
* Leonardo
* Lio Mendonca
* Lionardo Mendonça
* littlepea
@@ -295,7 +316,7 @@ Contributors (based on gitlog, 497 unique authors):
* Marc-Olivier Titeux
* Marco Badan
* Marco Bonetti
* marco federighi
* Marco Federighi
* Marco Paolini
* Marco Rimoldi
* marcor
@@ -304,7 +325,7 @@ Contributors (based on gitlog, 497 unique authors):
* Mark Rogers
* Mark Walker
* Markus Holtermann
* Markus Zapke-Gründemann
* Markus Zapke-Gründemann
* Marti Raudsepp
* Martin
* Martin Bambas
@@ -329,12 +350,12 @@ Contributors (based on gitlog, 497 unique authors):
* mbouchar
* mcosta
* meers
* meomap
* Mel Collins
* meomap
* MerLex
* Michal Danilak
* Michael P. Jung
* Michael Thornhill
* Michal Danilak
* Mike Dory
* Mike Johnson
* mikek
@@ -352,6 +373,7 @@ Contributors (based on gitlog, 497 unique authors):
* Nelson Brochado
* neoprolog
* Nick Jones
* Nicolas
* Nicolas PASCAL
* nikolas
* Nina Zakharenko
@@ -373,6 +395,7 @@ Contributors (based on gitlog, 497 unique authors):
* Patrick Arminio
* Patrick Lauber
* Patrick Toal
* patricklauber
* Patryk Zawadzki
* paul
* Paul van der Linden
@@ -408,6 +431,7 @@ Contributors (based on gitlog, 497 unique authors):
* Rajesh P.
* Rebecca Breu
* Remco Wendt
* René Fleschenberg
* requires.io
* Restless Being
* Richard Barran
@@ -440,8 +464,8 @@ Contributors (based on gitlog, 497 unique authors):
* sealibora
* Sean Bleier
* Sebastian Braun
* Seth Buntin
* Sergey Fedoseev
* Seth Buntin
* Seyhun Akyurek
* Shahar Or
* Shatalov Vadim
@@ -464,6 +488,7 @@ Contributors (based on gitlog, 497 unique authors):
* Stefano Brentegani
* Stefano Crosta
* Stefano Morandi
* Stefano Probst
* Steffen Jasper
* Stephan
* Stephan Hepper
@@ -484,6 +509,7 @@ Contributors (based on gitlog, 497 unique authors):
* Thomas Parslow
* Thomas Remmert
* Thomas Woolford
* thomas-d
* Tim Anderegg
* Tim Davies
* Tim Graham
@@ -497,9 +523,9 @@ Contributors (based on gitlog, 497 unique authors):
* Tom S
* Tom V
* Tom Wardill
* thomas-d
* Ulrich Petri
* unknown
* uno
* User
* Vadim Lopatyuk
* Vadim Sikora
@@ -511,6 +537,7 @@ Contributors (based on gitlog, 497 unique authors):
* Vinod Kurup
* Vladimir Bolshakov
* Vladyslav
* vThaian
* vvangelovski
* wangJunjie
* Wayne Moore
@@ -530,7 +557,6 @@ Contributors (based on gitlog, 497 unique authors):
* Yuri van der Meer
* zandeez
* zundoya
* Žan Anderle
* Óscar M. Lage
* Øyvind Saltvik
* Žan Anderle
* Антон Евжаков
@@ -10,6 +10,32 @@
* Introduced Django 2.0 support.
* Introduced Django 2.1 support.


=== 3.5.3 (2018-11-20) ===

* Fixed ``TreeNode.DoesNotExist`` exception raised when exporting
and loading database contents via ``dumpdata`` and ``loaddata``.
* Fixed a bug where ``request.current_page`` would always be the public page,
regardless of the toolbar status (draft / live). This only affected custom
urls from an apphook.
* Removed extra quotation mark from the sideframe button template
* Fixed a bug where structureboard tried to preload markup when using legacy
renderer
* Fixed a bug where updates on other tab are not correctly propagated if the
operation was to move a plugin in the top level of same placeholder
* Fixed a bug where xframe options were processed by clickjacking middleware
when page was served from cache, rather then get this value from cache
* Fixed a bug where cached page permissions overrides global permissions
* Fixed a bug where plugins that are not rendered in content wouldn't be
editable in structure board
* Fixed a bug with expanding static placeholder by clicking on "Expand All" button
* Fixed a bug where descendant pages with a custom url would lose the overwritten
url on save.
* Fixed a bug where setting the ``on_delete`` option on ``PlaceholderField``
and ``PageField`` fields would be ignored.
* Fixed a bug when deleting a modal from changelist inside a modal


=== 3.5.2 (2018-04-11) ===

* Fixed a bug where shortcuts menu entry would stop working after toolbar reload
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-

__version__ = '3.5.2'
__version__ = '3.6.0rc1'

default_app_config = 'cms.apps.CMSConfig'
Binary file not shown.
Binary file not shown.

This file was deleted.

Oops, something went wrong.
Binary file not shown.
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-11 16:30+0000\n"
"PO-Revision-Date: 2018-01-11 16:38+0000\n"
"Last-Translator: Paulo Alvarado <paulo.alvarado@divio.ch>\n"
"POT-Creation-Date: 2018-11-09 13:20+0100\n"
"PO-Revision-Date: 2018-11-09 12:08+0000\n"
"Last-Translator: Bartosz Płóciennik <thaian@outlook.com>\n"
"Language-Team: Arabic (http://www.transifex.com/divio/django-cms/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -113,12 +113,19 @@ msgstr "يرجى اختيار اسم لفرع الرابط باللغة %(langua
msgid "A page with this reverse URL id exists already."
msgstr "توجد صفحة سابقة بنفس عنوان المعرّف العكسي لـ هذا URL"

#| msgid "Application configurations"
msgid "Invalid application config value"
msgstr ""

msgid "An application instance using this configuration already exists."
msgstr "كيان تطبيق بهذا الإعداد موجود سلفا."

msgid "An application instance with this name already exists."
msgstr "كيان تطبيق بهذا الإسم موجود سلفا."

msgid "You can't move the home page inside another page"
msgstr ""

msgid "Yes"
msgstr "نعم"

@@ -556,9 +563,6 @@ msgstr ""
msgid "Page %(conflict_page)s has the same url '%(url)s' as current page."
msgstr ""

msgid "Add Another"
msgstr "إضافة آخر"

msgid ""
"Optional. If supplied, will be automatically added within a new text plugin."
msgstr "اختياري. وفي حال زُوّد سيضاف تلقائياً داخل ملحق نصي جديد."
@@ -1440,6 +1444,9 @@ msgstr ""
msgid "Welcome to django CMS"
msgstr "أهلاً بك في نظام إدارة محتوى جانقو"

msgid "Add Another"
msgstr "إضافة آخر"

msgid "Back"
msgstr "رجوع"

@@ -1540,6 +1547,10 @@ msgstr "مقالات"
msgid "Sample App"
msgstr "عينة تطبيق"

#| msgid "Sample App with excluded permissions"
msgid "Sample App with config"
msgstr ""

msgid "Sample App with excluded permissions"
msgstr "عينة تطبيق بصلاحيات محجوبة"

Binary file not shown.
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-11 16:31+0000\n"
"POT-Creation-Date: 2018-11-09 13:21+0100\n"
"PO-Revision-Date: 2018-01-11 16:38+0000\n"
"Last-Translator: Paulo Alvarado <paulo.alvarado@divio.ch>\n"
"Language-Team: Arabic (http://www.transifex.com/divio/django-cms/language/ar/)\n"
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 8aa2c69

Please sign in to comment.