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

[2.x] Add but don't enable the Content Lock module #580

Merged
merged 7 commits into from
Sep 4, 2023

Conversation

stephen-cox
Copy link
Member

Fixes #543

@finnlewis
Copy link
Member

Stephen says this is not quite ready yet.

Finn (me) asked about documentation. Should we add some notes to clarify there are optional modules included that can be enabled? README.md? Dev docs? Both?

@stephen-cox stephen-cox marked this pull request as draft July 10, 2023 12:43
@stephen-cox stephen-cox marked this pull request as ready for review August 14, 2023 12:18
ekes added a commit that referenced this pull request Aug 24, 2023
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 changed the title Add but don't enable the Content Lock module [2.x] Add but don't enable the Content Lock module Aug 24, 2023
Copy link
Member

@ekes ekes left a comment

Choose a reason for hiding this comment

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

Approve but merge #611 first. I don't think we should be doing development on 2.x first any more, but porting back from dev on 3.x. Certainly don't want to accidentally be adding features to 2.x without them already being added to 3.x

For the rest I've done a manual test, and automated tests, and merged with current 2.x.

I wondered about putting it in the profile (rather than core), but as it's mainly bring in the dependency in composer and the menu it seems a pretty profile-y thing.

@finnlewis finnlewis merged commit 3bf2543 into 2.x Sep 4, 2023
8 checks passed
@finnlewis finnlewis deleted the feature/2.x/543-content-locl branch September 4, 2023 13:35
@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.

Block concurrent editing
3 participants