10000 Backport 3.7.1 release to develop by FinalAngel · Pull Request #6773 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

Backport 3.7.1 release to develop #6773

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

Merged
merged 19 commits into from
Nov 26, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Backport to prepare for 3.7.1 (#6762)
* 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
  • Loading branch information
FinalAngel authored Nov 12, 2019
commit e0e203e7324ea75919066a400f753a5c0631cbc4
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[run]
branch = False
source =
cms
menus
branch = False
omit =
cms/migrations/*
cms/south_migrations/*
Expand Down
78 changes: 0 additions & 78 deletions .github/CONTRIBUTING.rst

This file was deleted.

30 changes: 0 additions & 30 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/---bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
name: "\U0001F41E Bug report"
about: Something isn't working as expected? Here is the right place to report.
title: ''
labels: ''
assignees: ''

---

<!--
Please fill in each section below, otherwise, your issue will be closed.
This info allows django CMS maintainers to diagnose (and fix!) your issue
as quickly as possible.
-->

## Description

<!--
If this is a security issue stop immediately and follow the instructions at:
http://docs.django-cms.org/en/latest/contributing/development-policies.html#reporting-security-issues
-->

## Steps to reproduce

<!--
Clear steps describing how to reproduce the issue.
-->

## Expected behaviour

<!--
A clear and concise description of what you expected to happen.
-->

## Actual behaviour

<!--
A clear and concise description of what is actually happening.
-->

## Additional information

<!--
Add any other context about the problem such as environment,
CMS/Python/Django versions, logs etc. here.
-->
13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE/---feature-requests.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
name: "\U0001F4A1 Feature requests"
about: Please submit and discuss feature requests via google groups.
title: "[FEATURE]"
labels: 'status: marked for rejection'
assignees: ''

---

<!--
Please submit any feature requests through our developers email list:
https://groups.google.com/forum/#!forum/django-cms-developers
-->
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/---question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: "\U0001F914 Question"
about: Please use our community channels to ask for questions.
title: ''
labels: 'status: marked for rejection'
assignees: ''

---

<!--
For *help with django CMS*, please use our one of the following channels:

* StackOverflow: https://stackoverflow.com/questions/tagged/django-cms
* Users mailing list: https://groups.google.com/forum/#!forum/django-cms
* #django-cms on freenode.net

Questions submitted through GitHub will be closed. Our community is very
helpful and we try to answer as many questions as you may have.
-->
34 changes: 20 additions & 14 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
## Description

<!--
If this is a security-related patch stop immediately!
See http://docs.django-cms.org/en/latest/contributing/development-policies.html
If this is a security issue stop right here and follow our documentation:
http://docs.django-cms.org/en/latest/contributing/development-policies.html#reporting-security-issues
-->

## Related resources

### Summary

Fixes #


### Links to related discussion
<!--
Add here links to existing issues or conversation from GitHub
or any other resource.
-->

* #...
* #...

### Proposed changes in this pull request
## Checklist

<!--
Please check the following items before submitting, otherwise,
your pull request will be closed.

### General checklist
Use 'x' to check each item: [x] I have ...
-->

* [ ] I have updated the CHANGELOG.txt
* [ ] I have created backports if necessary
* [ ] I have updated the documentation and/or amended the upgrade section
if necessary
* [ ] I have opened this pull request against ``develop``
* [ ] I have updated the **CHANGELOG.rst**
* [ ] I have added or modified the tests when changing logic
7 changes: 3 additions & 4 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[main]
host = https://www.transifex.com

[django-cms.js]
file_filter = cms/locale/<lang>/LC_MESSAGES/djangojs.po
source_file = cms/locale/en/LC_MESSAGES/djangojs.po
source_lang = en

[main]
host = https://www.transifex.com

[django-cms.core]
file_filter = cms/locale/<lang>/LC_MESSAGES/django.po
source_file = cms/locale/en/LC_MESSAGES/django.po
source_lang = en

Loading
0