Skip to content

Commit 487b386

Browse files
yakkyyakky
committed
Forward port 3.2.x
1 parent 551790e commit 487b386

File tree

393 files changed

+4675
-1465
lines changed

Some content is hidden

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

393 files changed

+4675
-1465
lines changed

‎.travis.yml

+24-16
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@ env:
1717
global:
1818
- secure: NWiSBCHFB6LbTMget2qLIdqZlx0zeu3j+Y7Lsqb8kuYXyT2IUBGFVedcGWuGv/9Mzypb80EQWtVTokA3/3QIbesqr29uG95pMPHiYWLdnTO6UHcLMcNXiSzhBGdRDZ40iHSVv2dDHs4GNwGOH5+UCA0z3j7SWmChuFbNXh+Vsqw=
1919
matrix:
20-
- DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
20+
- DJANGO=1.9 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0 MIGRATE_OPTION='--migrate'
21+
- DJANGO=1.9 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
22+
- DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=0 MIGRATE_OPTION='--migrate'
23+
- DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
24+
- DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=0 AUTH_USER_MODEL='customuserapp.User'
2125
- DJANGO=1.8 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0 MIGRATE_OPTION='--migrate'
2226
- DJANGO=1.8 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
2327
- DJANGO=1.8 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=0 MIGRATE_OPTION='--migrate'
24-
- DJANGO=1.8 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
28+
- DJANGO=1.8 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=0 AUTH_USER_MODEL='emailuserapp.EmailUser'
2529
- DJANGO=1.8 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
2630

2731
before_script:
@@ -60,36 +64,40 @@ notifications:
6064
matrix:
6165
exclude:
6266

67+
- python: 3.3
68+
env: DJANGO=1.9 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0 MIGRATE_OPTION='--migrate'
69+
- python: 3.3
70+
env: DJANGO=1.9 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
71+
- python: 3.3
72+
env: DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=0 MIGRATE_OPTION='--migrate'
73+
- python: 3.3
74+
env: DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
75+
- python: 3.3
76+
env: DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=0 AUTH_USER_MODEL='customuserapp.User'
77+
6378
- python: 3.3
6479
env: DJANGO=1.8 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0 MIGRATE_OPTION='--migrate'
6580
- python: 3.3
6681
env: DJANGO=1.8 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
6782
- python: 3.3
6883
env: DJANGO=1.8 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=0 MIGRATE_OPTION='--migrate'
6984
- python: 3.3
70-
env: DJANGO=1.8 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
71-
72-
- python: 2.7
73-
env: DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
74-
- python: 3.3
75-
env: DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
76-
- python: 3.5
77-
env: DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
85+
env: DJANGO=1.8 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
7886

7987
allow_failures:
8088
- python: 2.7
8189
env: DJANGO=1.8 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
82-
83-
- python: 3.3
84-
env: DJANGO=1.8 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
90+
- python: 2.7
91+
env: DJANGO=1.9 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
8592

8693
- python: 3.4
8794
env: DJANGO=1.8 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
95+
- python: 3.4
96+
env: DJANGO=1.9 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
8897

8998
- python: 3.5
9099
env: DJANGO=1.8 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
91-
92-
- python: 3.4
93-
env: DJANGO=1.9 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
100+
- python: 3.5
101+
env: DJANGO=1.9 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
94102

95103
fast_finish: true

‎AUTHORS

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Current and previous core designers:
2020
* Christian Bertschy
2121

2222

23-
Contributors (based on gitlog) (482):
23+
Contributors (based on gitlog) (515):
2424

2525
* A. Bram Neijt
2626
* aaloy

‎CHANGELOG.txt

+9-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
=== 3.2.1 (Unreleased) ===
77

8+
- Add support for Django 1.9 (with some deprecation warnings)
9+
- Add support for django-reversion 1.10+
810
- Fixed an issue with refreshing the UI when switching CMS language
911
- Fixed an issue with sideframe urls not being remembered after reload
1012
- Added placeholder name to the edit tooltip
@@ -14,6 +16,11 @@
1416
- Fix message with CMS version not showing up on hover in debug mode
1517
- Fix messages not being positioned correctly in debug mode
1618
- Fixed an issue where plugin parent restrictions where not respected when pasting a plugin.
19+
- Fixed an issue where "Copy all" menu item could've been clicked on empty placeholder
20+
- Added attr['is_page']=True to CMS Page navigation nodes
21+
- Fixed a bug where page tree styles didn't load from STATIC_URL that pointed
22+
to a different host
23+
- Honored CMS_RAW_ID_USERS in GlobalPagePermissionAdmin
1724

1825

1926
=== 3.2.0 (2015-11-24) ===
@@ -71,7 +78,7 @@
7178
- Fixed an issue where ``allow_children`` and ``disable_child_plugins`` didn't work on dragitems
7279

7380

74-
=== 3.1.4 ===
81+
=== 3.1.4 (2015-11-24) ===
7582

7683
- Fixed a problem in ``0010_migrate_use_structure.py`` that broke some migration paths to Django 1.8
7784
- Fixed ``fix_tree`` command
@@ -176,7 +183,7 @@
176183
- Add "Structure mode" permission
177184

178185

179-
=== 3.0.16 ===
186+
=== 3.0.16 (2015-11-24) ===
180187

181188
- Fixed JavaScript error when using ``PageSelectWidget``
182189
- Fixed whitespace markup issues in draft mode

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,5 @@ Credits
120120
`django-treebeard <https://tabo.pe/projects/django-treebeard/>`_.
121121
* JavaScript tree in admin uses `jsTree <http://www.jstree.com>`_.
122122
* Many thanks to the
123-
`over 250 contributors <https://github.com/divio/django-cms/blob/master/AUTHORS>`_
123+
`over 515 contributors <https://github.com/divio/django-cms/blob/master/AUTHORS>`_
124124
to the django CMS!

‎cms/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
22

3-
__version__ = '3.3.0.dev1'
3+
__version__ = '3.3.0.dev2'
44

55
default_app_config = 'cms.apps.CMSConfig'

0 commit comments

Comments
 (0)