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

feat: [GAPS-26] - djangocms-moderation integration #13

Merged
merged 34 commits into from
Sep 22, 2021

Conversation

Aiky30
Copy link
Contributor

@Aiky30 Aiky30 commented Sep 8, 2021

The changes in this PR are dependant on changes in moderation to function correctly: django-cms/djangocms-moderation#194

The fonts added in this PR are from font awesome 4.7: django-cms/djangocms-versioning#237

@Aiky30 Aiky30 changed the title Initial working implementation djangocms-moderation integration Sep 8, 2021
@Aiky30 Aiky30 changed the title djangocms-moderation integration feat: [GAPS-26] - djangocms-moderation integration Sep 8, 2021
…es to ContentExpiry records and resulted in not being able to view items in moderation that you should have been able to.
…angocms-content-expiry into feature/moderation-integration
…iry into feature/initial-changelist-implementation

# Conflicts:
#	.github/workflows/pr.yml
#	djangocms_content_expiry/admin.py
#	test_settings.py
#	tests/requirements/requirements_base.txt
Copy link
Contributor

@Bernardvdv Bernardvdv left a comment

Choose a reason for hiding this comment

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

Looks good

@Aiky30 Aiky30 merged commit 091140b into EligaServices:main Sep 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants