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.

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

Jump to bottom

feat: Use grouper admin to resolve usability issues #167

Merged
merged 54 commits into from
May 23, 2023
Merged

feat: Use grouper admin to resolve usability issues #167

merged 54 commits into from
May 23, 2023

Conversation

fsbraun
Copy link
Sponsor Member

@fsbraun fsbraun commented Apr 1, 2023 •
edited

fsbraun and others added 30 commits March 16, 2023 21:57
@fsbraun
feat: grouper admin
1a367a2
@fsbraun
Update to new GrouperModelAdmin
5d086f1
@fsbraun
Update to match latest cms.admin.utils
58ab6d2
@fsbraun
Fix message, isort, flake8 and transifex integration
d39daaa
@fsbraun
Remove unneeded svg
ff47023
@fsbraun
Update tests
e247434
@fsbraun
Run tests on any branch
e253a85
@fsbraun
Update test dependencies
a57ee8d
@fsbraun
Update readme, add created by and modified fields in versioned change…
64b8abd 
… list
@fsbraun
Fix: MySql annotation error
d79b5d1
@fsbraun
Flipped lines fixed
71e3853
@fsbraun
Fix: alias content admin redirect
b337aec
@fsbraun
Add some type hints
6545303
@fsbraun
fix isort
710f14f
@fsbraun
Update changelog
852a13b
@fsbraun
add messages
44fce6a
@fsbraun
fix isort
4c49e5d
@fsbraun
Fix missing icons
4f04c18
@fsbraun
Merge branch 'master' into feat/grouper_admin
9d0000f
@pre-commit-ci
ci: auto fixes from pre-commit hooks
0ab75bb 
for more information, see https://pre-commit.ci
@fsbraun
fix flake8
0eab9d8
@fsbraun
Fix static alias language detection bug
e082838
@pre-commit-ci
ci: auto fixes from pre-commit hooks
d75fba6 
for more information, see https://pre-commit.ci
@fsbraun
Fix flake8
919f7af
@pre-commit-ci
ci: auto fixes from pre-commit hooks
fdda8ff 
for more information, see https://pre-commit.ci
@fsbraun
Adjust tests
3e88275
@fsbraun
fix pre-commit.ci
a427938
@fsbraun
Remove get_versioning_state from admin list_display
d24250a
@fsbraun
Update changelog
a4243ca
@fsbraun
Fix: get_langauge_from_request to get the language of toolbar object …
dc7cbd1 
…does not have one.
@fsbraun fsbraun marked this pull request as ready for review April 25, 2023 20:03
@fsbraun fsbraun marked this pull request as draft April 26, 2023 10:27
fsbraun and others added 16 commits April 27, 2023 16:35
@fsbraun
Create alias content warning-free
79d6efc
@pre-commit-ci
ci: auto fixes from pre-commit hooks
7c8b99b 
for more information, see https://pre-commit.ci
@fsbraun
Django 4.2 compatibility
51299e0
@fsbraun
Merge branch 'feat/grouper_admin' of github.com:fsbraun/djangocms-ali…
91093a4 
…as into feat/grouper_admin
@fsbraun
Refactor
8a5f2f3
@pre-commit-ci
ci: auto fixes from pre-commit hooks
fcaf9ea 
for more information, see https://pre-commit.ci
@fsbraun
Fix lint errors
67ebb76
@fsbraun
Merge branch 'feat/grouper_admin' of github.com:fsbraun/djangocms-ali…
0310bfa 
…as into feat/grouper_admin
@fsbraun
Remove unused admin filter and tests
d7b126b
@fsbraun
Update translations
aa6d425
@fsbraun
Fix cms config
bb0f18e
@fsbraun
Merge branch 'feat/grouper_admin' of github.com:fsbraun/djangocms-ali…
dfa8987 
…as into feat/grouper_admin

# Conflicts:
#	djangocms_alias/admin.py
@pre-commit-ci
ci: auto fixes from pre-commit hooks
72f16c7 
for more information, see https://pre-commit.ci
@fsbraun
Update test requirements
c79c656
@fsbraun
Merge branch 'feat/grouper_admin' of github.com:fsbraun/djangocms-ali…
0da9f5a 
…as into feat/grouper_admin
@fsbraun
Undo change to site selection logic
813acdb
@fsbraun fsbraun marked this pull request as ready for review May 19, 2023 15:55
@fsbraun fsbraun requested a review from marksweb May 19, 2023 15:56
marksweb
marksweb approved these changes May 20, 2023
View reviewed changes
Copy link
Sponsor Member

@marksweb marksweb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fsbraun fsbraun merged commit 801e889 into django-cms:master May 23, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marksweb marksweb marksweb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
django CMS v4
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@fsbraun @marksweb