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

[3.x] Add but don't enable the Content Lock module #611

Merged
merged 1 commit into from
Sep 4, 2023

Conversation

ekes
Copy link
Member

@ekes ekes commented Aug 24, 2023

Fixes #543 and should be merged before (at the same time as) #580

Squashed commit of the following:

commit c2ff5d9
Merge: 90d3d0f 5dc2608
Author: ekes <ekes@iskra.net>
Date:   Thu Aug 24 17:23:59 2023 +0200

    Merge branch '2.x' into feature/2.x/543-content-locl

commit 90d3d0f
Author: Stephen Cox <stephen@agile.coop>
Date:   Mon Aug 14 13:37:24 2023 +0100

    Don't configure content locking if syncing from config

commit 2ca2289
Merge: a6b1b2b 7711669
Author: Stephen Cox <stephen@agile.coop>
Date:   Mon Aug 14 13:18:51 2023 +0100

    Merge branch '2.x' into feature/2.x/543-content-locl

commit a6b1b2b
Author: Stephen Cox <stephen@agile.coop>
Date:   Mon Aug 14 13:12:39 2023 +0100

    Coding standards fixes

commit 73fabb3
Author: Stephen Cox <stephen@agile.coop>
Date:   Mon Aug 14 13:06:59 2023 +0100

    Added test for content lock configuration

commit 5328995
Author: Stephen Cox <stephen@agile.coop>
Date:   Mon Aug 14 12:43:32 2023 +0100

    Added localgov_content_lock module to customise content lock settings #543

commit 993d00a
Author: Stephen Cox <stephen@agile.coop>
Date:   Fri Jun 30 13:09:17 2023 +0100

    Add but don't enable the Content Lock module #543
@ekes ekes requested a review from stephen-cox August 24, 2023 16:36
@finnlewis finnlewis merged commit 1e9b949 into 3.x Sep 4, 2023
4 checks passed
@finnlewis finnlewis deleted the feature/3.x/543-content-lock branch September 4, 2023 13:34
@andybroomfield andybroomfield mentioned this pull request Sep 4, 2023
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