8000 Merge branch 'develop' into patch-1 · django-cms/django-cms@c535ec7 · GitHub
[go: up one dir, main page]
Skip to content

Commit c535ec7

Browse files
vthaianvthaian
authored
Merge branch 'develop' into patch-1
2 parents cb17a54 + f3fcf1c commit c535ec7

File tree

541 files changed

+5261
-33262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

541 files changed

+5261
-33262
lines changed

‎.github/CONTRIBUTING.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For *feature requests*, please use our `developers' email list
2525
Contribution documentation
2626
**************************
2727

28-
We maintain comprehensive `contribution documentation <http://docs.django-cms.org/en/stable/contributing/>`_ - please
28+
We maintain comprehensive `contribution documentation <http://docs.django-cms.org/en/latest/contributing/>`_ - please
2929
familiarise yourself with it.
3030

3131

@@ -51,7 +51,7 @@ Code of conduct
5151
***************
5252

5353
django CMS is governed by a `Code of Conduct
54-
<http://docs.django-cms.org/en/stable/contributing/code_of_conduct.html>`_. All participants in our community and its
54+
<http://docs.django-cms.org/en/latest/contributing/code_of_conduct.html>`_. All participants in our community and its
5555
various forums are expected to abide by it.
5656

5757

@@ -75,4 +75,4 @@ You can also follow:
7575
* the `Travis Continuous Integration build reports <https://travis-ci.org/divio/django-cms>`_
7676
* the `@djangocms`_ Twitter account for general announcements
7777

78-
.. _@djangocms : https://twitter.com/djangocms
78+
.. _@djangocms : https://twitter.com/djangocms

‎.travis.yml

Lines changed: 63 additions & 234 deletions
Large diffs are not rendered by default.

‎AUTHORS

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ Current and previous core designers:
2121
* Matthias Nüesch
2222

2323

24-
Contributors (based on gitlog, 497 unique authors):
24+
Contributors (based on gitlog, 537 unique authors):
2525

26+
* Антон Евжаков
2627
* A. Bram Neijt
2728
* aaloy
2829
* Aaron Fay
@@ -34,6 +35,7 @@ Contributors (based on gitlog, 497 unique authors):
3435
* Admin Adminaras
3536
* Adrien Brunet
3637
* Adrián Ribao Martínez
38+
* Aidas Bendoraitis
3739
* Alberto Paro
3840
* Ales Kocjancic
3941
* Ales Zabala Alava (Shagi)
@@ -44,18 +46,22 @@ Contributors (based on gitlog, 497 unique authors):
4446
* Alexander Paramonov
4547
* Alexandre Leray
4648
* Alexey Subbotin
49+
* Aliaksei Urbanski
4750
* alskgj
4851
* Alvin Mites
4952
* Anatoly Ivanov
5053
* Andi Albrecht
5154
* Andras Gyömrey
5255
* Andre Bossard
5356
* Andrea Stagi
57+
* Andreas Elvers
5458
* Andrei Avram
5559
* Andrei Fokau
5660
* Andrew Schoen
61+
* André Cruz
5762
* Angelo Dini
5863
* angular_circle
64+
* Anthony Steinhauser
5965
* Antoine Catton
6066
* Anton Parkhomenko
6167
* AQNOUCH Mohammed
@@ -66,6 +72,7 @@ Contributors (based on gitlog, 497 unique authors):
6672
* Arthur Debert
6773
* Artis Avotins
6874
* Aymeric Augustin
75+
* Bartosz Płóciennik
6976
* Basile LEGAL
7077
* behrooz
7178
* Behrooz Nobakht
@@ -94,9 +101,12 @@ Contributors (based on gitlog, 497 unique authors):
94101
* Carlos de Paula
95102
* casio
96103
* centralniak
104+
* Cezar Pendarovski
105+
* cezar77
97106
* Chanita Siridechkun
98107
* Charlie Denton
99108
* Charpentier Johan
109+
* Chematronix
100110
* Cheng-Chia Tseng
101111
* Chris Adams
102112
* Chris Franklin
@@ -177,11 +187,13 @@ Contributors (based on gitlog, 497 unique authors):
177187
* fcurella
178188
* febsn
179189
* Filip Kazimierczak
190+
* Filipe Waitman
180191
* FinalAngel
181192
* fivethreeo
182193
* fj
183194
* floppya
184195
* Florian Verdet
196+
* Frank
185197
* Frank Bieniek
186198
* FrankBie
187199
* frost-nzcr4
@@ -209,6 +221,7 @@ Contributors (based on gitlog, 497 unique authors):
209221
* hedberg
210222
* henning
211223
* Henning Sprang
224+
* heppstux
212225
* Herbert Poul
213226
* hjkelly
214227
* Horst Gutmann
@@ -224,11 +237,13 @@ Contributors (based on gitlog, 497 unique authors):
224237
* J. Cliff Dyer
225238
* Jacob Rief
226239
* Jakob Hedman
240+
* Jakub Randák
227241
* jalaziz
228242
* Jameel Al-Aziz
229243
* James Richards
230244
* James Rutherford
231245
* Jana Deutschlaender
246+
* Jannik V
232247
* Jannis Leidel
233248
* Janusz Harkot
234249
* Jared Proffitt
@@ -238,6 +253,8 @@ Contributors (based on gitlog, 497 unique authors):
238253
* Jason Robinson
239254
* Jeffrey Goettsch
240255
* Jens Diemer
256+
* JensDiemer
257+
* Jeroen
241258
* Jeroen Noten
242259
* Jessica Tallon
243260
* Jimmy Lam
@@ -252,14 +269,17 @@ Contributors (based on gitlog, 497 unique authors):
252269
* Jorge Vargas
253270
* Jos van Velzen
254271
* Joseph Bergantine
272+
* Joseph Lin
255273
* Joseph Melettukunnel
256274
* Josh Kalderimis
257275
* Josh Schneier
258276
* João Luiz Lorencetti
259277
* Julien Poissonnier
278+
* Julz
260279
* Júlio R. Lucchese
261280
* Kalle Bronsen
262281
* kater169
282+
* Katie McLaughlin
263283
* kblomqvist
264284
* Kegan Holtzhausen
265285
* Keryn Knight
@@ -269,12 +289,14 @@ Contributors (based on gitlog, 497 unique authors):
269289
* Kim Thoenen
270290
* kochin
271291
* Kristian Øllegaard
292+
* Krzysztof Socha
272293
* kunitoki
273294
* L-A Iscla
274295
* Lars Smit
275296
* Lars van de Kerkhof
276-
* Leonardo
297+
* Laurens Bosscher
277298
* Leon Smith
299+
* Leonardo
278300
* Lio Mendonca
279301
* Lionardo Mendonça
280302
* littlepea
@@ -295,7 +317,7 @@ Contributors (based on gitlog, 497 unique authors):
295317
* Marc-Olivier Titeux
296318
* Marco Badan
297319
* Marco Bonetti
298-
* marco federighi
320+
* Marco Federighi
299321
* Marco Paolini
300322
* Marco Rimoldi
301323
* marcor
@@ -304,7 +326,7 @@ Contributors (based on gitlog, 497 unique authors):
304326
* Mark Rogers
305327
* Mark Walker
306328
* Markus Holtermann
307-
* Markus Zapke-Gründemann
329+
* Markus Zapke-Gründemann
308330
* Marti Raudsepp
309331
* Martin
310332
* Martin Bambas
@@ -316,6 +338,7 @@ Contributors (based on gitlog, 497 unique authors):
316338
* martinkosir
317339
* Matas Dailyda
318340
* Mateusz Dereniowski
341+
* Mateusz Kamycki
319342
* Mateusz Marzantowicz
320343
* mathijs
321344
* Matt Chisholm
@@ -328,12 +351,12 @@ Contributors (based on gitlog, 497 unique authors):
328351
* mbouchar
329352
* mcosta
330353
* meers
331-
* meomap
332354
* Mel Collins
355+
* meomap
333356
* MerLex
334-
* Michal Danilak
335357
* Michael P. Jung
336358
* Michael Thornhill
359+
* Michal Danilak
337360
* Mike Dory
338361
* Mike Johnson
339362
* mikek
@@ -351,6 +374,7 @@ Contributors (based on gitlog, 497 unique authors):
351374
* Nelson Brochado
352375
* neoprolog
353376
* Nick Jones
377+
* Nicolas
354378
* Nicolas PASCAL
355379
* nikolas
356380
* Nina Zakharenko
@@ -372,6 +396,7 @@ Contributors (based on gitlog, 497 unique authors):
372396
* Patrick Arminio
373397
* Patrick Lauber
374398
* Patrick Toal
399+
* patricklauber
375400
* Patryk Zawadzki
376401
* paul
377402
* Paul van der Linden
@@ -407,6 +432,7 @@ Contributors (based on gitlog, 497 unique authors):
407432
* Rajesh P.
408433
* Rebecca Breu
409434
* Remco Wendt
435+
* René Fleschenberg
410436
* requires.io
411437
* Restless Being
412438
* Richard Barran
@@ -439,8 +465,8 @@ Contributors (based on gitlog, 497 unique authors):
439465
* sealibora
440466
* Sean Bleier
441467
* Sebastian Braun
442-
* Seth Buntin
443468
* Sergey Fedoseev
469+
* Seth Buntin
444470
* Seyhun Akyurek
445471
* Shahar Or
446472
* Shatalov Vadim
@@ -463,6 +489,7 @@ Contributors (based on gitlog, 497 unique authors):
463489
* Stefano Brentegani
464490
* Stefano Crosta
465491
* Stefano Morandi
492+
* Stefano Probst
466493
* Steffen Jasper
467494
* Stephan
468495
* Stephan Hepper
@@ -483,6 +510,7 @@ Contributors (based on gitlog, 497 unique authors):
483510
* Thomas Parslow
484511
* Thomas Remmert
485512
* Thomas Woolford
513+
* thomas-d
486514
* Tim Anderegg
487515
* Tim Davies
488516
* Tim Graham
@@ -496,9 +524,9 @@ Contributors (based on gitlog, 497 unique authors):
496524
* Tom S
497525
* Tom V
498526
* Tom Wardill
499-
* thomas-d
500527
* Ulrich Petri
501528
* unknown
529+
* uno
502530
* User
503531
* Vadim Lopatyuk
504532
* Vadim Sikora
@@ -529,7 +557,6 @@ Contributors (based on gitlog, 497 unique authors):
529557
* Yuri van der Meer
530558
* zandeez
531559
* zundoya
560+
* Žan Anderle
532561
* Óscar M. Lage
533562
* Øyvind Saltvik
534-
* Žan Anderle
535-
* Антон Евжаков

‎CHANGELOG.txt

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,42 @@
1-
=== 3.5.2 (unreleased) ===
1+
=== 3.6.0 (2019-01-29) ===
2+
3+
* Removed the ``cms moderator`` command.
4+
* Dropped Django < 1.11 support.
5+
* Removed the translatable content get / set methods from ``CMSPlugin`` model.
6+
* Removed signal handlers for ``Page``, ``Title``, ``Placeholder`` and ``CMSPlugin`` models.
7+
* Moved ``Title.meta_description`` length restriction from model to form
8+
and increased its max length to 320 characters.
9+
* Added ``page_title`` parameter for ``cms.api.create_page()`` and ``cms.api.create_title()``.
10+
* Introduced Django 2.0 support.
11+
* Introduced Django 2.1 support.
12+
13+
14+
=== 3.5.3 (2018-11-20) ===
15+
16+
* Fixed ``TreeNode.DoesNotExist`` exception raised when exporting
17+
and loading database contents via ``dumpdata`` and ``loaddata``.
18+
* Fixed a bug where ``request.current_page`` would always be the public page,
19+
regardless of the toolbar status (draft / live). This only affected custom
20+
urls from an apphook.
21+
* Removed extra quotation mark from the sideframe button template
22+
* Fixed a bug where structureboard tried to preload markup when using legacy
23+
renderer
24+
* Fixed a bug where updates on other tab are not correctly propagated if the
25+
operation was to move a plugin in the top level of same placeholder
26+
* Fixed a bug where xframe options were processed by clickjacking middleware
27+
when page was served from cache, rather then get this value from cache
28+
* Fixed a bug where cached page permissions overrides global permissions
29+
* Fixed a bug where plugins that are not rendered in content wouldn't be
30+
editable in structure board
31+
* Fixed a bug with expanding static placeholder by clicking on "Expand All" button
32+
* Fixed a bug where descendant pages with a custom url would lose the overwritten
33+
url on save.
34+
* Fixed a bug where setting the ``on_delete`` option on ``PlaceholderField``
35+
and ``PageField`` fields would be ignored.
36+
* Fixed a bug when deleting a modal from changelist inside a modal
37+
38+
39+
=== 3.5.2 (2018-04-11) ===
240

341
* Fixed a bug where shortcuts menu entry would stop working after toolbar reload
442
* Fixed a race condition in frontend code that could lead to sideframe being

‎README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
django CMS
33
##########
44
.. image:: https://travis-ci.org/divio/django-cms.svg?branch=develop
5-
:target: http://travis-ci.org/divio/django-cms
5+
:target: https://travis-ci.org/divio/django-cms
66
.. image:: https://img.shields.io/pypi/v/django-cms.svg
77
:target: https://pypi.python.org/pypi/django-cms/
88
.. image:: https://img.shields.io/badge/wheel-yes-green.svg
@@ -48,17 +48,17 @@ Features
4848

4949
Developing applications that integrate with and take advantage of django CMS features is easy and well-documented.
5050

51-
More information on `our website <http://www.django-cms.org>`_.
51+
More information on `our website <https://www.django-cms.org>`_.
5252

5353
************
5454
Requirements
5555
************
5656

5757
See the `Python/Django requirements for the current release version
58-
<http://docs.django-cms.org/en/stable/#software-version-requirements-and-release-notes>`_ in our documentation.
58+
<http://docs.django-cms.org/en/latest/#software-version-requirements-and-release-notes>`_ in our documentation.
5959

6060
See the `installation how-to guide for an overview of some other requirements and dependencies of the current release
61-
<http://docs.django-cms.org/en/stable/how-to/install.html>`_
61+
<http://docs.django-cms.org/en/latest/how_to/install.html>`_
6262

6363
*************
6464
Documentation
@@ -71,7 +71,7 @@ We maintain documentation for several versions of the project. Key versions are:
7171
* `develop <http://docs.django-cms.org/en/develop/>`_, representing the latest build of the **develop branch**
7272

7373
For more information about our branch policy, see `Branches
74-
<http://docs.django-cms.org/en/stable/contributing/development-policies.html>`_.
74+
<http://docs.django-cms.org/en/latest/contributing/development-policies.html>`_.
7575

7676
Our documentation is hosted courtesy of `Read the Docs <https://readthedocs.org>`_.
7777

@@ -122,7 +122,7 @@ Credits
122122
* Includes icons from `FamFamFam <http://www.famfamfam.com>`_.
123123
* Python tree engine powered by
124124
`django-treebeard <https://tabo.pe/projects/django-treebeard/>`_.
125-
* JavaScript tree in admin uses `jsTree <http://www.jstree.com>`_.
125+
* JavaScript tree in admin uses `jsTree <https://www.jstree.com>`_.
126126
* Many thanks to the
127127
`over 515 contributors <https://github.com/divio/django-cms/blob/develop/AUTHORS>`_
128128
to the django CMS!

‎cms/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
22

3-
__version__ = '3.5.2rc1'
3+
__version__ = '3.6.0'
44

55
default_app_config = 'cms.apps.CMSConfig'

0 commit comments

Comments
 (0)
0