1012 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robbie Averill	4249fffc0f	FIX LeftAndMainSubsites::canAccess() now accepts a Member argument and falls back to the session member	2019-06-25 10:00:13 +12:00
Garion Herman	19edb78756	Merge pull request #425 from creative-commoners/pulls/2.2/re-save-virtual-page ... FIX Subsites virtual pages now allow you to re-save them when used in conjunction with silverstripe-fluent	2019-06-05 06:18:24 +01:00
Garion Herman	5c4a655106	Merge pull request #418 from creative-commoners/pulls/2.3/fluent-domain-docs ... Ensure URL segment field type before using its API, and add docs around subsite and fluent domain compatibility	2019-06-05 05:27:06 +01:00
Robbie Averill	f6503822e8	DOCS Fix typos ... [ci skip] Co-Authored-By: Garion Herman <garion@silverstripe.com>	2019-06-05 15:09:57 +12:00
Robbie Averill	2b26876596	Add test for URLSegment prefix set to primary subsite domain for page	2019-05-31 16:41:36 +12:00
Robbie Averill	900d04d94a	Add tests and move logic into the if statement	2019-05-31 16:32:28 +12:00
Robbie Averill	1f51fcd909	FIX Subsites virtual pages now allow you to re-save them when used in conjunction with silverstripe-fluent	2019-05-31 14:41:37 +12:00
Robbie Averill	33244fb430	Merge pull request #422 from creative-commoners/pulls/2.3/noice ... Tidy output of IsPublic value in Subsites admin	2019-05-31 13:48:51 +12:00
Robbie Averill	b8576744a1	Merge pull request #419 from creative-commoners/pulls/2.3/fix-sitetree-hints-caching ... FIX allowed pagetypes displaying incorrectly when switching subsite	2019-05-31 13:34:37 +12:00
Robbie Averill	1595079156	Merge pull request #421 from creative-commoners/pulls/2.3/subsites-virtual-labels ... FIX Field labels for subsites virtual pages are no longer repeated	2019-05-31 13:22:32 +12:00
Robbie Averill	9ee451f706	Merge pull request #417 from creative-commoners/pulls/2.3/default-automatic-protocol ... FIX Domains now default to "Automatic" protocol, and have the correct help description	2019-05-31 11:59:54 +12:00
Robbie Averill	c60acb3190	FIX Field labels for subsites virtual pages are no longer repeated	2019-05-31 11:29:30 +12:00
Garion Herman	4d7641e16a	FIX allowed pagetypes displaying incorrectly when switching subsite ... This patch depends on an update to the CMS module that provides this extension point. The code is inert when matched with existing CMS versions.	2019-05-31 11:28:15 +12:00
Robbie Averill	3b8207d70c	Ensure URL segment field type before using its API, and add docs around subsite and fluent domain compatibility	2019-05-31 11:27:58 +12:00
Garion Herman	68c763da3e	Tidy output of IsPublic value in Subsites admin	2019-05-31 11:27:47 +12:00
Robbie Averill	1e44e1d4ba	FIX Domains now default to "Automatic" protocol, and have the correct help description	2019-05-31 11:26:46 +12:00
Robbie Averill	d1fc84d15c	Merge pull request #408 from creative-commoners/pulls/2.2/insert-a-link ... FIX Content editor group users can now insert links into contents while using subsites	2019-02-10 12:52:33 +03:00
Robbie Averill	f003fb5e74	Add PHP 7.3 to build matrix and move Behat builds to SilverStripe 4.3	2019-02-10 12:41:59 +03:00
Robbie Averill	9dbdd992f7	FIX Content editor group users can now insert links into contents while using subsites	2019-02-10 12:18:19 +03:00
Robbie Averill	fbd98ff402	FIX Disable transactions in SubsiteTest to prevent global state bugs in CWP kitchen sink test suite	2019-01-28 21:22:12 +02:00
Dylan Wagstaff	ce9dd1a856	Merge pull request #402 from creative-commoners/pulls/2.2/subsites-is-off-the-table-or-maybe-its-on-it-now-idk ... FIX Catching situation where database has no tables but it exists	2018-11-08 12:26:59 +13:00
Guy Marriott	59f6685e2a	FIX Catching situation where database has no tables but it exists	2018-11-08 12:05:36 +13:00
Robbie Averill	a0ecbdf4b6	Remove obsolete branch alias	2018-11-07 16:28:40 +02:00
Robbie Averill	e4fe534f10	Merge branch '2.1'	2018-11-07 16:28:10 +02:00
Guy Marriott	3afdd01d41	Merge pull request #400 from creative-commoners/pulls/2.1/remove-json-methods ... FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4	2018-10-29 11:46:16 +13:00
Robbie Averill	2a35a5c70a	FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4	2018-10-28 21:41:32 +00:00
Robbie Averill	1fa549886f	Define explode limit when removing port	2018-10-20 23:16:05 +02:00
Daniel Hensby	2bf4812947	Merge pull request #399 from creative-commoners/pulls/2.1/separate-test ... Update testDomainProtocol to use a dataProvider	2018-10-19 22:50:43 +01:00
Dylan Wagstaff	810ee63ea6	Merge pull request #398 from creative-commoners/pulls/2.1/ignore-domain-port ... FIX Ignore ports when matching domain for subsite	2018-10-20 10:31:10 +13:00
Robbie Averill	5e79abdbbc	Update testDomainProtocol to use a dataProvider ... This might help with test state leakage	2018-10-19 21:51:32 +02:00
Robbie Averill	ff9997e0f2	FIX Ignore ports when matching domain for subsite	2018-10-19 20:51:43 +02:00
Robbie Averill	bf7dd9c37b	Merge branch '2.1' ... # Conflicts: # src/Extensions/SiteTreeSubsites.php	2018-10-19 16:28:50 +02:00
Robbie Averill	9199d509d6	Merge branch '2.0' into 2.1	2018-10-19 16:27:38 +02:00
Robbie Averill	bbfb93d50d	Merge pull request #397 from silverstripe/revert-388-pulls/2.1/fix-role-permissions ... Revert "FIX CMS permission checks for subsite are now handled in the state context"	2018-10-19 11:27:37 +02:00
Guy Marriott	7cc86199e7	Revert "FIX CMS permission checks for subsite are now handled in the state context"	2018-10-19 12:00:50 +13:00
Robbie Averill	1a5666182e	Merge pull request #396 from open-sausages/pulls/2.0/352-fix-migrate-file-task ... BUG: Fix `MigrateFileTask` not migrating files for subsites	2018-10-18 11:37:21 +02:00
Robbie Averill	2a6f7b5dfb	Automated linting fix	2018-10-18 11:03:16 +02:00
Robbie Averill	6a8f15a194	Merge pull request #395 from DorsetDigital/patch-1 ... Change source of admin URL in getIsAdmin()	2018-10-18 11:02:46 +02:00
bergice	e52fe41a23	BUG: Fix MigrateFileTask not migrating files for subsites ... Fixes #352	2018-10-18 18:41:07 +13:00
DorsetDigital	1e458ef03d	Change source of admin URL in getIsAdmin() ... As per #394 Change direct call to the AdminRootController config setting, using instead the admin_url() method on the class which provides detection via the Director rules, and the fallback to the config setting.	2018-10-17 23:20:20 +01:00
Dylan Wagstaff	4323db52f0	Merge pull request #391 from creative-commoners/pulls/2.1/duplicate-tabs ... FIX Remove duplicate Configuration tabs when creating a new subsite	2018-09-14 19:55:33 +12:00
Robbie Averill	bb226a0652	FIX Remove duplicate Configuration tabs when creating a new subsite	2018-09-14 09:42:29 +02:00
Dylan Wagstaff	fa3f1fa767	Merge pull request #389 from creative-commoners/pulls/2.1/dont-catch-exceptions ... FIX Only continue delegation when DB exceptions are caused by no database selected	2018-09-08 18:54:51 +12:00
Robbie Averill	313d22ffca	FIX Only continue delegation when DB exceptions are caused by no database selected ... This prevents the middleware from interrupting legitimate database exceptions from being propagated.	2018-09-07 11:06:55 +02:00
Guy Marriott	70dc70f494	Merge pull request #388 from creative-commoners/pulls/2.1/fix-role-permissions ... FIX CMS permission checks for subsite are now handled in the state context	2018-08-27 14:16:13 +12:00
Robbie Averill	7681634cb2	Remove irrelevant check for subsites list size, use func_num_args() and add break to loop	2018-08-27 10:04:57 +12:00
Robbie Averill	6af985420f	FIX CMS permission checks for subsite are now handled in the state context ... We now check the subsite state for the context and validate it against the current member's group permissions using the SilverStripe ORM relationships instead of using SQL queries. More granular permission checks e.g. canView etc are still up to data models to define and handle.	2018-08-24 16:58:36 +12:00
Guy Marriott	039a7a8c84	Merge pull request #387 from creative-commoners/pulls/2.1/fix-cross-subsite-duplication ... FIX Pages now correctly duplicate children across subsites	2018-08-24 11:03:56 +12:00
Robbie Averill	e8a72e1c33	FIX Duplicate page's parent IDs are now assumed or zeroed after duplication	2018-08-24 10:30:27 +12:00
Guy Marriott	5b8a0dbf13	Merge pull request #386 from creative-commoners/pulls/2.2/deprecate-duplicate ... API Deprecate duplicateSubsiteRelations. Use "cascade_duplicates" config API instead.	2018-08-24 10:27:21 +12:00