Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport 3.7.0 release to develop #6736

Merged
merged 14 commits into from Sep 26, 2019

Conversation

@FinalAngel
Copy link
Member

commented Sep 26, 2019

No description provided.

FinalAngel and others added 14 commits Jun 25, 2019
* New changes for cms 3.7

* Fix typo

* Fixed issue with force_color

* Removed unused import

* Added docs to index.rst

* Fixed travis jobs

* Fixed force_color command

* Changes after review

* Fixed django version in setup

* Update django-2.2.txt
* add information for testing

* fix tests

* updated CHANGELOG

* update

* 1.8.5

* fix tests locally

* update text
* bumped version to 3.7.0a1

* updated staticfiles

* updated translations
* test something

* further updates and add 3.7 to test

* updates

* simplify for tests

* add 3.7 support
* Adapt test suite for recent Travis changes (#6709)

* test something

* further updates and add 3.7 to test

* updates

* simplify for tests

* add 3.7 support

* Fix content mode related to #6694 (#6696)

* Fix content mode related to #6694

* Add Dmytro Litvinov to AUTHORS according to PR template
* Adapt test suite for recent Travis changes (#6709)

* test something

* further updates and add 3.7 to test

* updates

* simplify for tests

* add 3.7 support

* Fix content mode related to #6694 (#6696)

* Fix content mode related to #6694

* Add Dmytro Litvinov to AUTHORS according to PR template

* Self install doc tweaks (#6673)

* Add missing template context processor to self install docs

Fixes #5828

* Reword self install docs for clarity

* Add to AUTHORS file
…SPluginBase (#6667) (#6713)

* Add 'prepopulated_fields' to ignore list

Added `prepopulated_fields` to the list of options that will be ignored when creating a custom DjangoCMS plugin with CMSPluginBase (which is based on ModelAdmin)

* Update AUTHORS
* update django version in sphinx

* bumped version

* updated existing translations

* update static files

* update docs

* update authors file
…6719) (#6723)

* Add a test case for #6717.

* Override urlconf_module so that Django system checks don't crash.

Without this fix, Django system checks in Django 2.2 will try to resolve the
"app_resolver" module, which does not exist. Overriding ``urlconf_module``
prevents the issue.

Fixes #6717
* regenerated translation files

* bumped version

* update existing translation

* compile static files

* updated release notes
* Bumped version to 3.7.0

* updated translation files

* added static files
@FinalAngel FinalAngel added the backport label Sep 26, 2019
@coveralls

This comment has been minimized.

Copy link

commented Sep 26, 2019

Coverage Status

Coverage remained the same at 78.215% when pulling 317ee96 on release/3.7.x into efbeaa0 on develop.

@FinalAngel FinalAngel merged commit 3b5df95 into develop Sep 26, 2019
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.