10000 ci: Merge back `release/4.1.x` (4.1.0rc4) into `develop-4` by fsbraun · Pull Request #7640 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

ci: Merge back release/4.1.x (4.1.0rc4) into develop-4 #7640

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 18 commits into from
Sep 1, 2023
Merged

ci: Merge back release/4.1.x (4.1.0rc4) into develop-4 #7640

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2e31793
Merge pull request #7617 from fsbraun/develop-4
fsbraun Aug 7, 2023
318d417
Fix: modal.scss dark-mode compatibilitiy
fsbraun Aug 8, 2023
5232220
Add: Build all assets as part of the frontend test
fsbraun Aug 8, 2023
94cc9b0
fix: Better action feedback
fsbraun Aug 8, 2023
4c7939e
Merge pull request #7621 from fsbraun/fix/dart-sass
fsbraun Aug 8, 2023
4ab1f58
fix: Update _modal.scss
fsbraun Aug 8, 2023
fcc2f7a
fix: Remove publish/draft reference from grouper admin message
fsbraun Aug 8, 2023
e703659
Merge pull request #7622 from fsbraun/fix/grouper-message
fsbraun Aug 8, 2023
33fbdb1
fix ruff
fsbraun Aug 8, 2023
d79eddc
Add Django 4.2 support to release notes
fsbraun Aug 8, 2023
369f776
Fix transifex-pull-strings
fsbraun Aug 9, 2023
06ecf3a
fix: Update transifex source file (#7629)
fsbraun Aug 22, 2023
ac74c21
Fix: Open new plugin window in language of toolbar not of page (#7632)
fsbraun Aug 23, 2023
33f93d6
Fix: Broken page actions menu if CMS_PERMISSIONS is set
fsbraun Aug 24, 2023
d871d9f
Build: release 4.1.0rc4 (#7637)
fsbraun Aug 25, 2023
58ed512
fix: en locale in `release/4.1.x` (#7638)
fsbraun Aug 25, 2023
b3edda3
fix: en locale typo (#7639)
fsbraun Aug 25, 2023
121acf1
Merge branch 'develop-4' into release/4.1.x
fsbraun Aug 30, 2023
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
Fix: Broken page actions menu if CMS_PERMISSIONS is set
  • Loading branch information
@fsbraun
fsbraun authored Aug 24, 2023
commit 33f93d63f3f35ead956053512b2ddf3211a3bd25
12 changes: 0 additions & 12 deletions cms/templates/admin/cms/page/tree/actions_dropdown.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,6 @@
<span>{% trans "Advanced settings" %}</span>
</a>
</li>
{% if CMS_PERMISSION %}
<li>
{% if has_change_permissions_permission %}
<a href="{% url opts|admin_urlname:'permissions' page.id %}" title="{% filter escapejs %}{% trans "Permissions" %}{% endfilter %}">
{% else %}
<a href="#" class="cms-pagetree-dropdown-item-disabled">
{% endif %}
<span class="cms-icon cms-icon-lock"></span>
<span>{% trans "Permissions" %}</span>
</a>
</li>
{% endif %}
{% endblock actions %}
<li class="cms-pagetree-dropdown-separator">&nbsp;</li>
<li>
Expand Down
0