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.1 release to develop #6773

Merged
merged 19 commits into from Nov 26, 2019
Merged

Backport 3.7.1 release to develop #6773

merged 19 commits into from Nov 26, 2019

Conversation

@FinalAngel
Copy link
Member

FinalAngel commented Nov 26, 2019

No description provided.

FinalAngel and others added 18 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
* Improved and simplified permissions documentation (#6224)

[ci-skip]

* Updated branch policy (#6320)

* Updated branch policy

[ci only docs]

* Removed feature branch notes from policy

* Improve apphooks documentation (#6743)

Remove a reference to `urls` attribute on AppHook class in the documentation.

* Fix documentation bug regarding CMSPluginBase (#6744)

The documentation advertises that you can set the module attribute of
custom plugins to None.  If the user attempts this django they won't be able
to start up when django.contrib.admin.site.urls is included in urls.py
(tested with django 1.11.25 and django-cms 3.7.0).

* Added example of `get_plugin_instance` to the docs on nested plugins. (#6609)

* Amend Changelog and fixes from merged PRs (#6755)

* add missing changelog entries

* update docs

* updated changelog

* updates from comments

* Sites - Pass Site obj instead of pk when creating a StaticPlaceholder (#6679)

* Pass site object instead of pk when rendering menu

Add original fix by @saqlainsyed007

* Moved test to it's own class

* Update changelog

* Do not let non-staff users to log in via CMS Toolbar (#6705)

* Merged stale PR's (#6759)

* add missing changelog entries

* update docs

* updated changelog

* updates from comments

* merge #6347

* merged #6530

* merge #6538

* merge #6549

* merge #6704

* changelog for #6705

* Update issue templates

* Fixed #6737 -- Fix 'urls.W001' warning with custom apphook urls (#6738)

* Refs #6737 -- Add test for apphooks urls config check

* Fixed #6737 -- Fix 'urls.W001' warning with custom apphook urls

When rewriting the apphooks urls in appresolver.recurse_patterns,
the original RegexPattern.is_endpoint flag is lost, so urls with a callback
view throws an "include with a route ending with a '$'" warning ('urls.W001').

    @apphook_pool.register
    class MyApp(CMSApp):
        name = "MyApp"

        def get_urls(self, page=None, language=None, **kwargs):
            return [
                re_path(r"^$", views.MyAppView.as_view(), name="my-app-index")
                # or this
                # path(r"", views.MyAppView.as_view(), name="my-app-index")
            ]

    $ ./manage.py check
    System check identified some issues:

    WARNINGS:
    ?: (urls.W001) Your URL pattern '^my-app-url/my-view-url/$' [name='my-app-index']
    uses include with a route ending with a '$'. Remove the dollar from the
    route to avoid problems including URLs.

This fix set the RegexPattern flag is_endpoint to True for callback views
in appresolver.recurse_patterns as in
https://github.com/django/django/blob/stable/2.2.x/django/urls/conf.py#L70

* Updated documentation and files for 3.7 LTS (#6761)

* general updates

* updates from comments

* update form comments
* add newly generated strings

* Fix simple typo: seperated -> separated (#6767)

* Fix simple typo: seperated -> separated

* Update CHANGELOG.rst

* Update djangocms installer docs (#6764)
* update documentation

* Bumped version to 3.7.1

* compiled available languages

* update static files

* fix build

* bump date
# Conflicts:
#	CHANGELOG.rst
#	cms/__init__.py
#	cms/locale/ar/LC_MESSAGES/django.mo
#	cms/locale/ar/LC_MESSAGES/django.po
#	cms/locale/ar/LC_MESSAGES/djangojs.po
#	cms/locale/bg/LC_MESSAGES/django.mo
#	cms/locale/bg/LC_MESSAGES/django.po
#	cms/locale/bg/LC_MESSAGES/djangojs.po
#	cms/locale/bn/LC_MESSAGES/django.mo
#	cms/locale/bn/LC_MESSAGES/django.po
#	cms/locale/bn/LC_MESSAGES/djangojs.po
#	cms/locale/ca/LC_MESSAGES/django.mo
#	cms/locale/ca/LC_MESSAGES/django.po
#	cms/locale/ca/LC_MESSAGES/djangojs.po
#	cms/locale/cs/LC_MESSAGES/django.mo
#	cms/locale/cs/LC_MESSAGES/django.po
#	cms/locale/cs/LC_MESSAGES/djangojs.po
#	cms/locale/da/LC_MESSAGES/django.mo
#	cms/locale/da/LC_MESSAGES/django.po
#	cms/locale/da/LC_MESSAGES/djangojs.po
#	cms/locale/de/LC_MESSAGES/django.mo
#	cms/locale/de/LC_MESSAGES/django.po
#	cms/locale/de/LC_MESSAGES/djangojs.po
#	cms/locale/el/LC_MESSAGES/django.mo
#	cms/locale/el/LC_MESSAGES/django.po
#	cms/locale/el/LC_MESSAGES/djangojs.po
#	cms/locale/en/LC_MESSAGES/django.po
#	cms/locale/en/LC_MESSAGES/djangojs.po
#	cms/locale/en_GB/LC_MESSAGES/django.mo
#	cms/locale/en_GB/LC_MESSAGES/django.po
#	cms/locale/en_GB/LC_MESSAGES/djangojs.po
#	cms/locale/eo/LC_MESSAGES/django.mo
#	cms/locale/eo/LC_MESSAGES/django.po
#	cms/locale/eo/LC_MESSAGES/djangojs.po
#	cms/locale/es/LC_MESSAGES/django.mo
#	cms/locale/es/LC_MESSAGES/django.po
#	cms/locale/es/LC_MESSAGES/djangojs.po
#	cms/locale/es_AR/LC_MESSAGES/django.mo
#	cms/locale/es_AR/LC_MESSAGES/django.po
#	cms/locale/es_AR/LC_MESSAGES/djangojs.po
#	cms/locale/es_BO/LC_MESSAGES/django.mo
#	cms/locale/es_BO/LC_MESSAGES/django.po
#	cms/locale/es_BO/LC_MESSAGES/djangojs.po
#	cms/locale/es_DO/LC_MESSAGES/django.mo
#	cms/locale/es_DO/LC_MESSAGES/django.po
#	cms/locale/es_DO/LC_MESSAGES/djangojs.po
#	cms/locale/et/LC_MESSAGES/django.mo
#	cms/locale/et/LC_MESSAGES/django.po
#	cms/locale/et/LC_MESSAGES/djangojs.po
#	cms/locale/eu/LC_MESSAGES/django.mo
#	cms/locale/eu/LC_MESSAGES/django.po
#	cms/locale/eu/LC_MESSAGES/djangojs.po
#	cms/locale/fa/LC_MESSAGES/django.mo
#	cms/locale/fa/LC_MESSAGES/django.po
#	cms/locale/fa/LC_MESSAGES/djangojs.po
#	cms/locale/fa_IR/LC_MESSAGES/django.mo
#	cms/locale/fa_IR/LC_MESSAGES/django.po
#	cms/locale/fa_IR/LC_MESSAGES/djangojs.po
#	cms/locale/fi/LC_MESSAGES/django.mo
#	cms/locale/fi/LC_MESSAGES/django.po
#	cms/locale/fi/LC_MESSAGES/djangojs.po
#	cms/locale/fi_FI/LC_MESSAGES/django.mo
#	cms/locale/fi_FI/LC_MESSAGES/django.po
#	cms/locale/fi_FI/LC_MESSAGES/djangojs.po
#	cms/locale/fr/LC_MESSAGES/django.mo
#	cms/locale/fr/LC_MESSAGES/django.po
#	cms/locale/fr/LC_MESSAGES/djangojs.po
#	cms/locale/gl/LC_MESSAGES/django.mo
#	cms/locale/gl/LC_MESSAGES/django.po
#	cms/locale/gl/LC_MESSAGES/djangojs.po
#	cms/locale/gu/LC_MESSAGES/django.mo
#	cms/locale/gu/LC_MESSAGES/django.po
#	cms/locale/gu/LC_MESSAGES/djangojs.po
#	cms/locale/he/LC_MESSAGES/django.mo
#	cms/locale/he/LC_MESSAGES/django.po
#	cms/locale/he/LC_MESSAGES/djangojs.po
#	cms/locale/hi/LC_MESSAGES/django.mo
#	cms/locale/hi/LC_MESSAGES/django.po
#	cms/locale/hi/LC_MESSAGES/djangojs.po
#	cms/locale/hr/LC_MESSAGES/django.mo
#	cms/locale/hr/LC_MESSAGES/django.po
#	cms/locale/hr/LC_MESSAGES/djangojs.po
#	cms/locale/hu/LC_MESSAGES/django.mo
#	cms/locale/hu/LC_MESSAGES/django.po
#	cms/locale/hu/LC_MESSAGES/djangojs.po
#	cms/locale/id/LC_MESSAGES/django.mo
#	cms/locale/id/LC_MESSAGES/django.po
#	cms/locale/id/LC_MESSAGES/djangojs.po
#	cms/locale/is/LC_MESSAGES/django.mo
#	cms/locale/is/LC_MESSAGES/django.po
#	cms/locale/is/LC_MESSAGES/djangojs.po
#	cms/locale/it/LC_MESSAGES/django.mo
#	cms/locale/it/LC_MESSAGES/django.po
#	cms/locale/it/LC_MESSAGES/djangojs.po
#	cms/locale/ja/LC_MESSAGES/django.mo
#	cms/locale/ja/LC_MESSAGES/django.po
#	cms/locale/ja/LC_MESSAGES/djangojs.po
#	cms/locale/ka/LC_MESSAGES/django.mo
#	cms/locale/ka/LC_MESSAGES/django.po
#	cms/locale/ka/LC_MESSAGES/djangojs.po
#	cms/locale/kk/LC_MESSAGES/django.mo
#	cms/locale/kk/LC_MESSAGES/django.po
#	cms/locale/kk/LC_MESSAGES/djangojs.po
#	cms/locale/km/LC_MESSAGES/django.mo
#	cms/locale/km/LC_MESSAGES/django.po
#	cms/locale/km/LC_MESSAGES/djangojs.po
#	cms/locale/ko/LC_MESSAGES/django.mo
#	cms/locale/ko/LC_MESSAGES/django.po
#	cms/locale/ko/LC_MESSAGES/djangojs.po
#	cms/locale/ko_KR/LC_MESSAGES/django.mo
#	cms/locale/ko_KR/LC_MESSAGES/django.po
#	cms/locale/ko_KR/LC_MESSAGES/djangojs.po
#	cms/locale/ku_IQ/LC_MESSAGES/django.mo
#	cms/locale/ku_IQ/LC_MESSAGES/django.po
#	cms/locale/ku_IQ/LC_MESSAGES/djangojs.po
#	cms/locale/lt/LC_MESSAGES/django.mo
#	cms/locale/lt/LC_MESSAGES/django.po
#	cms/locale/lt/LC_MESSAGES/djangojs.po
#	cms/locale/lv/LC_MESSAGES/django.mo
#	cms/locale/lv/LC_MESSAGES/django.po
#	cms/locale/lv/LC_MESSAGES/djangojs.po
#	cms/locale/mn/LC_MESSAGES/django.mo
#	cms/locale/mn/LC_MESSAGES/django.po
#	cms/locale/mn/LC_MESSAGES/djangojs.po
#	cms/locale/mn_MN/LC_MESSAGES/django.mo
#	cms/locale/mn_MN/LC_MESSAGES/django.po
#	cms/locale/mn_MN/LC_MESSAGES/djangojs.po
#	cms/locale/nb/LC_MESSAGES/django.mo
#	cms/locale/nb/LC_MESSAGES/django.po
#	cms/locale/nb/LC_MESSAGES/djangojs.po
#	cms/locale/nl/LC_MESSAGES/django.mo
#	cms/locale/nl/LC_MESSAGES/django.po
#	cms/locale/nl/LC_MESSAGES/djangojs.po
#	cms/locale/no/LC_MESSAGES/django.mo
#	cms/locale/no/LC_MESSAGES/django.po
#	cms/locale/no/LC_MESSAGES/djangojs.po
#	cms/locale/pl/LC_MESSAGES/django.mo
#	cms/locale/pl/LC_MESSAGES/django.po
#	cms/locale/pl/LC_MESSAGES/djangojs.po
#	cms/locale/pt/LC_MESSAGES/django.mo
#	cms/locale/pt/LC_MESSAGES/django.po
#	cms/locale/pt/LC_MESSAGES/djangojs.po
#	cms/locale/pt_BR/LC_MESSAGES/django.mo
#	cms/locale/pt_BR/LC_MESSAGES/django.po
#	cms/locale/pt_BR/LC_MESSAGES/djangojs.po
#	cms/locale/pt_PT/LC_MESSAGES/django.mo
#	cms/locale/pt_PT/LC_MESSAGES/django.po
#	cms/locale/pt_PT/LC_MESSAGES/djangojs.po
#	cms/locale/ro/LC_MESSAGES/django.mo
#	cms/locale/ro/LC_MESSAGES/django.po
#	cms/locale/ro/LC_MESSAGES/djangojs.po
#	cms/locale/ru/LC_MESSAGES/django.mo
#	cms/locale/ru/LC_MESSAGES/django.po
#	cms/locale/ru/LC_MESSAGES/djangojs.po
#	cms/locale/sk/LC_MESSAGES/django.mo
#	cms/locale/sk/LC_MESSAGES/django.po
#	cms/locale/sk/LC_MESSAGES/djangojs.po
#	cms/locale/sk_SK/LC_MESSAGES/django.mo
#	cms/locale/sk_SK/LC_MESSAGES/django.po
#	cms/locale/sk_SK/LC_MESSAGES/djangojs.po
#	cms/locale/sl_SI/LC_MESSAGES/django.mo
#	cms/locale/sl_SI/LC_MESSAGES/django.po
#	cms/locale/sl_SI/LC_MESSAGES/djangojs.po
#	cms/locale/sq/LC_MESSAGES/django.mo
#	cms/locale/sq/LC_MESSAGES/django.po
#	cms/locale/sq/LC_MESSAGES/djangojs.po
#	cms/locale/sr@latin/LC_MESSAGES/django.mo
#	cms/locale/sr@latin/LC_MESSAGES/django.po
#	cms/locale/sr@latin/LC_MESSAGES/djangojs.po
#	cms/locale/sv/LC_MESSAGES/django.mo
#	cms/locale/sv/LC_MESSAGES/django.po
#	cms/locale/sv/LC_MESSAGES/djangojs.po
#	cms/locale/ta/LC_MESSAGES/django.mo
#	cms/locale/ta/LC_MESSAGES/django.po
#	cms/locale/ta/LC_MESSAGES/djangojs.po
#	cms/locale/th_TH/LC_MESSAGES/django.mo
#	cms/locale/th_TH/LC_MESSAGES/django.po
#	cms/locale/th_TH/LC_MESSAGES/djangojs.po
#	cms/locale/tr/LC_MESSAGES/django.mo
#	cms/locale/tr/LC_MESSAGES/django.po
#	cms/locale/tr/LC_MESSAGES/djangojs.po
#	cms/locale/tr_TR/LC_MESSAGES/django.mo
#	cms/locale/tr_TR/LC_MESSAGES/django.po
#	cms/locale/tr_TR/LC_MESSAGES/djangojs.po
#	cms/locale/uk/LC_MESSAGES/django.mo
#	cms/locale/uk/LC_MESSAGES/django.po
#	cms/locale/uk/LC_MESSAGES/djangojs.po
#	cms/locale/zh-Hans/LC_MESSAGES/django.mo
#	cms/locale/zh-Hans/LC_MESSAGES/django.po
#	cms/locale/zh-Hans/LC_MESSAGES/djangojs.po
#	cms/locale/zh/LC_MESSAGES/django.mo
#	cms/locale/zh/LC_MESSAGES/django.po
#	cms/locale/zh/LC_MESSAGES/djangojs.po
#	cms/locale/zh_CN/LC_MESSAGES/django.mo
#	cms/locale/zh_CN/LC_MESSAGES/django.po
#	cms/locale/zh_CN/LC_MESSAGES/djangojs.po
#	cms/locale/zh_TW/LC_MESSAGES/django.mo
#	cms/locale/zh_TW/LC_MESSAGES/django.po
#	cms/locale/zh_TW/LC_MESSAGES/djangojs.po
#	cms/static/cms/css/3.6.0/cms.base.css
#	cms/static/cms/css/3.6.0/cms.pagetree.css
#	cms/static/cms/css/3.6.0/cms.welcome.css
#	cms/static/cms/css/3.6.0/cms.wizard.css
#	cms/static/cms/css/3.7.0/cms.base.css
#	cms/static/cms/css/3.7.0/cms.pagetree.css
#	cms/static/cms/css/3.7.0/cms.welcome.css
#	cms/static/cms/css/3.7.0/cms.wizard.css
#	cms/static/cms/css/3.7.1/cms.base.css
#	cms/static/cms/css/3.7.1/cms.pagetree.css
#	cms/static/cms/css/3.7.1/cms.welcome.css
#	cms/static/cms/css/3.7.1/cms.wizard.css
#	cms/static/cms/fonts/3.6.0/django-cms-iconfont.eot
#	cms/static/cms/fonts/3.6.0/django-cms-iconfont.svg
#	cms/static/cms/fonts/3.6.0/django-cms-iconfont.ttf
#	cms/static/cms/fonts/3.6.0/django-cms-iconfont.woff
#	cms/static/cms/fonts/3.7.0/django-cms-iconfont.eot
#	cms/static/cms/fonts/3.7.0/django-cms-iconfont.svg
#	cms/static/cms/fonts/3.7.0/django-cms-iconfont.ttf
#	cms/static/cms/fonts/3.7.0/django-cms-iconfont.woff
#	cms/static/cms/fonts/3.7.1/django-cms-iconfont.eot
#	cms/static/cms/fonts/3.7.1/django-cms-iconfont.svg
#	cms/static/cms/fonts/3.7.1/django-cms-iconfont.ttf
#	cms/static/cms/fonts/3.7.1/django-cms-iconfont.woff
#	cms/static/cms/js/dist/3.6.0/bundle.admin.base.min.js
#	cms/static/cms/js/dist/3.6.0/bundle.admin.changeform.min.js
#	cms/static/cms/js/dist/3.6.0/bundle.admin.pagetree.min.js
#	cms/static/cms/js/dist/3.6.0/bundle.admin.widget.min.js
#	cms/static/cms/js/dist/3.6.0/bundle.forms.apphookselect.min.js
#	cms/static/cms/js/dist/3.6.0/bundle.forms.pageselectwidget.min.js
#	cms/static/cms/js/dist/3.6.0/bundle.forms.pagesmartlinkwidget.min.js
#	cms/static/cms/js/dist/3.6.0/bundle.forms.slugwidget.min.js
#	cms/static/cms/js/dist/3.6.0/bundle.toolbar.min.js
#	cms/static/cms/js/dist/3.7.0/bundle.admin.base.min.js
#	cms/static/cms/js/dist/3.7.0/bundle.admin.changeform.min.js
#	cms/static/cms/js/dist/3.7.0/bundle.admin.pagetree.min.js
#	cms/static/cms/js/dist/3.7.0/bundle.admin.widget.min.js
#	cms/static/cms/js/dist/3.7.0/bundle.forms.apphookselect.min.js
#	cms/static/cms/js/dist/3.7.0/bundle.forms.pageselectwidget.min.js
#	cms/static/cms/js/dist/3.7.0/bundle.forms.pagesmartlinkwidget.min.js
#	cms/static/cms/js/dist/3.7.0/bundle.forms.slugwidget.min.js
#	cms/static/cms/js/dist/3.7.0/bundle.toolbar.min.js
#	cms/static/cms/js/dist/3.7.1/bundle.admin.base.min.js
#	cms/static/cms/js/dist/3.7.1/bundle.admin.changeform.min.js
#	cms/static/cms/js/dist/3.7.1/bundle.admin.pagetree.min.js
#	cms/static/cms/js/dist/3.7.1/bundle.admin.widget.min.js
#	cms/static/cms/js/dist/3.7.1/bundle.forms.apphookselect.min.js
#	cms/static/cms/js/dist/3.7.1/bundle.forms.pageselectwidget.min.js
#	cms/static/cms/js/dist/3.7.1/bundle.forms.pagesmartlinkwidget.min.js
#	cms/static/cms/js/dist/3.7.1/bundle.forms.slugwidget.min.js
#	cms/static/cms/js/dist/3.7.1/bundle.toolbar.min.js
#	cms/static/cms/sass/components/_iconography.scss
@coveralls

This comment has been minimized.

Copy link

coveralls commented Nov 26, 2019

Coverage Status

Coverage remained the same at 78.215% when pulling 5604aaa on FinalAngel:develop into f389439 on divio:develop.

@FinalAngel FinalAngel merged commit 4efe4f1 into divio:develop Nov 26, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr 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.