10000 Sites - Pass Site obj instead of pk when creating a StaticPlaceholder by michauds · Pull Request #6679 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

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

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.

Sign up for GitHub

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 7 commits into from
Nov 8, 2019
Merged

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

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
463984d
Pass site object instead of pk when rendering menu
michauds May 8, 2019
fe3ce77
Moved test to it's own class
michauds Jun 1, 2019
f90db3d
Merge branch 'develop' of https://github.com/divio/django-cms into ad…
michauds Aug 29, 2019
884bb37
Update changelog
michauds Aug 29, 2019
68013f5
Merge branch 'develop' of https://github.com/divio/django-cms into ad…
michauds Oct 26, 2019
a2dafee
Merge branch 'develop' into add_tests_for_79a35c1
FinalAngel Nov 7, 2019
e8e8fcb
Merge branch 'develop' into add_tests_for_79a35c1
FinalAngel Nov 7, 2019
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
Merge branch 'develop' into add_tests_for_79a35c1
  • Loading branch information
@FinalAngel
FinalAngel authored Nov 7, 2019
commit e8e8fcbb8e7bf5db5b9f5d8b9f2b12b5afb3f510
5 changes: 3 additions & 2 deletions CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
=== 3.8.0 (unreleased) ===
* Fixed ``ValueError`` when creating a ``Site``-bound ``StaticPlaceholder``
=== 3.7.1 (unreleased) ===

* Fixed ``ValueError`` when creating a ``Site``-bound ``StaticPlaceholder``
* Updated branch policy
* Improved and simplified permissions documentation
* Improved apphooks documentation
* Improved CMSPluginBase documentation
* Improved documentation related to nested plugins


=== 3.7.0 (2019-09-25) ===

* Introduced Django 2.2 support.
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0