990 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Robbie Averill	8af796fa7a	API Deprecate duplicateSubsiteRelations. Use "cascade_duplicates" config API instead.	2018-08-24 10:13:22 +12:00
Robbie Averill	7f28c32427	FIX Pages now correctly duplicate children across subsites	2018-08-24 10:12:05 +12:00
Robbie Averill	6747b5ffe8	Merge pull request #381 from lekoala/patch-1 ... allow disabling filter using queryParam	2018-08-24 08:50:47 +12:00
Robbie Averill	9ba1275b49	Merge pull request #382 from lekoala/patch-2 ... allow using queryParam to disable filter	2018-08-24 08:50:41 +12:00
Guy Marriott	687e013793	Merge branch '2.1'	2018-08-20 09:58:59 +12:00
Guy Marriott	f24fd60f14	Merge pull request #383 from creative-commoners/pulls/2.1/loosen-json-test ... Loosen test assertion on content type for application/json	2018-08-20 09:57:26 +12:00
Robbie Averill	87485e39f4	Loosen test assertion on content type for application/json ... See https://github.com/silverstripe/silverstripe-framework/issues/5594 This was changed in Silverstripe 4.3	2018-08-20 09:19:54 +12:00
Thomas Portelange	6e35807dc7	allow using queryParam to disable filter ... much better than global state (and should potentially replace cookie usage that is user controlled)	2018-08-16 16:20:48 +02:00
Thomas Portelange	c177a9f640	allow disabling filter using queryParam ... It is much better than relying on global state	2018-08-16 16:19:25 +02:00
Robbie Averill	d8088edfa9	Merge branch '2.1'	2018-07-26 15:15:29 +12:00
Robbie Averill	bf2c81dce6	Merge pull request #1 from silverstripe-security/pulls/2.1/ss-2018-016 ... [SS-2018-016] Group table name is escaped to prevent possibility of SQL injection	2018-07-25 09:55:14 +12:00
Robbie Averill	4b6804eaab	[SS-2018-016] Group table name is escaped to prevent possibility of SQL injection	2018-07-16 11:22:58 +12:00
Raissa North	7e1c2eb0aa	Merge pull request #378 from creative-commoners/pulls/2.1/initial-publish-bug ... Add subsite switching and page publish behat tests	2018-07-16 10:13:20 +12:00
Robbie Averill	191c63bd9b	Remove extra subsite fixture definition	2018-07-13 16:31:10 +12:00
Robbie Averill	f635aa9811	Add subsite switching behat tests and a test that shows a UI bug in publishing	2018-07-13 15:59:37 +12:00
Robbie Averill	c732c0c799	Merge pull request #375 from creative-commoners/pulls/2.2/deprecate-old-preview-url-function ... Deprecate alternatePreviewLink function as per CMS	2018-07-05 10:48:37 +12:00
Dylan Wagstaff	ffbcb9a0c8	Deprecate alternatePreviewLink function as per CMS ... SilverStripe CMS 4.0.0 issues a deprecation notice before calling alternatePreviewLink on any page that hasMethod (i.e. is applied via an extension such as SiteTreeSubsites). Instead of double-issuing a notice, we will just mark this as deprecated in the next minor version via docblocks.	2018-07-05 09:55:45 +12:00
Dylan Wagstaff	d78e3c4662	Merge branch '2.1'	2018-07-05 09:50:21 +12:00
Dylan Wagstaff	75b851326d	Merge branch '2.0' into 2.1	2018-07-05 09:49:11 +12:00
Robbie Averill	19f0162265	Merge pull request #374 from creative-commoners/pulls/2.0/cms-preview-nonbreakage ... FIX apply SubsiteID getVar to CMS Preview fetches	2018-07-04 15:57:32 +12:00
Dylan Wagstaff	5370bc8af6	FIX apply SubsiteID getVar to CMS Preview fetches ... A preview link must be loaded on the same domain the CMS is loaded through, which was previously causing issues when a page (identified via URLSegment) did not exist on the subsite domain. By _always_ prepending the identifier to the preview link, this should never happen.	2018-07-04 15:21:47 +12:00
Guy	c43abb05c2	Merge branch '2.1'	2018-06-20 17:11:18 +12:00