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

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

Merged
merged 3 commits into from Aug 7, 2019

Conversation

@FinalAngel
Copy link
Member

commented Aug 7, 2019

backport

FinalAngel and others added 3 commits Aug 6, 2019
* test something

* further updates and add 3.7 to test

* updates

* simplify for tests

* add 3.7 support
* Fix content mode related to #6694

* Add Dmytro Litvinov to AUTHORS according to PR template
@FinalAngel FinalAngel merged commit c6f400a into divio:release/3.7.x Aug 7, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@coveralls

This comment has been minimized.

Copy link

commented Aug 7, 2019

Coverage Status

Coverage remained the same at 78.215% when pulling b014f80 on FinalAngel:release/3.7.x into f6d104f on divio:release/3.7.x.

@FinalAngel FinalAngel added the backport label Sep 26, 2019
FinalAngel added a commit that referenced this pull request Sep 26, 2019
* Add missing parenthesis in code (#6677) (#6690)

* Adding support for Django 2.2 LTS (#6655) (#6691)

* 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

* Fixes test suite (#6688) (#6692)

* add information for testing

* fix tests

* updated CHANGELOG

* update

* 1.8.5

* fix tests locally

* update text

* Release 3.7.0a1 (internal) (#6693)

* bumped version to 3.7.0a1

* updated staticfiles

* updated translations

* Adapt test suite for recent Travis changes (#6709) (#6710)

* 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) (#6711)

* 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) (#6712)

* 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

* Documenation: Add 'prepopulated_fields' to ignored options list on CMSPluginBase (#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

* Release 3.7.0rc1 (#6715)

* update django version in sphinx

* bumped version

* updated existing translations

* update static files

* update docs

* update authors file

*  Override urlconf_module so that Django system checks don't crash. (#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

* Release 3.7.0rc2 (#6724)

* regenerated translation files

* bumped version

* update existing translation

* compile static files

* updated release notes

* Updated compatibility table (#6727)

* Release 3.7.0 (#6735)

* Bumped version to 3.7.0

* updated translation files

* added static files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.