1153 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robbie Averill	ce63a9ed08	Merge pull request #427 from creative-commoners/pulls/2.0/cascading-themes ... FIX Improving support for cascading themes	2019-07-15 12:14:30 +02:00
Guy Marriott	58f89801b0	FIX Ensure constant is accessed correctly	2019-07-12 15:24:10 +12:00
Guy Marriott	9feef185dc	Adding documentation about cascading themes	2019-07-12 13:34:42 +12:00
Guy Marriott	2eb04ffa78	FIX Improving support for cascading themes ... - Fixes an issue where themes would cascade "up" the list of themes - Provides configuration for defining custom theme options with their own sets of cascading themes Fixes #392	2019-07-12 13:34:42 +12:00
Guy Marriott	e73d622bdb	Update README.md (#435) ... Update README.md	2019-07-08 12:19:26 +12:00
Greg808	d0054a1294	Update README.md ... Subsite::currentSubsiteID() is deprecated use SubsiteState::singleton()->getSubsiteId()	2019-07-04 16:52:04 +02:00
Robbie Averill	c4adf556cf	Merge pull request #433 from Greg808/patch-3 ... Update README.md	2019-06-29 13:32:03 +12:00
Greg808	644b9c8b90	Update README.md ... Subsite::currentSubsiteID() is deprecated. class_exists needs a fully-qualified class name to work	2019-06-28 10:49:47 +02:00
Robbie Averill	81e6d0fe59	Merge pull request #432 from Greg808/patch-1 ... Update README.md	2019-06-28 08:00:10 +12:00
Greg808	9abaca6d48	Update README.md ... I am not quite sure if this is needed but i'd expect the code snipets to work with Silverstripe 4 if the requirement say Silverstripe 4. I testet it with SS 4.4.1 Subsite::currentSubsiteID() is deprecated. class_exists needs namespace to work correctly	2019-06-27 17:32:11 +02:00
Robbie Averill	7d27abf2b1	Update expected json content type in unit test	2019-06-25 16:05:38 +12:00
Robbie Averill	001f44d73b	Merge branch '2.3'	2019-06-25 15:45:17 +12:00
Robbie Averill	ca01e2680a	Merge branch '2.2' into 2.3	2019-06-25 15:45:08 +12:00
Robbie Averill	e41dc8b018	Merge branch '2.1' into 2.2	2019-06-25 15:44:37 +12:00
Robbie Averill	9655371276	Merge branch '2.0' into 2.1	2019-06-25 15:43:59 +12:00
Robbie Averill	67d10ec0cb	Remove SilverStripe 4.0-4.2 from Travis builds	2019-06-25 15:43:50 +12:00
Robbie Averill	4fdf2e24e3	FIX LeftAndMainSubsites::canAccess() now accepts a Member argument and falls back to the session member	2019-06-25 15:42:54 +12:00
Robbie Averill	614819a1d3	Reduce Behat builds to SS 4.3 and update postgres version	2019-06-25 11:12:16 +12:00
Robbie Averill	be3bcab715	Merge branch '2.3'	2019-06-25 10:01:52 +12:00
Robbie Averill	135ae961bf	Merge branch '2.2' into 2.3	2019-06-25 10:01:46 +12:00
Robbie Averill	eddbc90524	Remove SilverStripe 4.0-4.2 from Travis builds	2019-06-25 10:01:27 +12:00
Robbie Averill	a4e99a2df5	Merge branch '2.3'	2019-06-25 10:01:06 +12:00
Robbie Averill	77fafe6450	Merge branch '2.2' into 2.3	2019-06-25 10:00:47 +12:00
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
Dylan Wagstaff	b3bd51cb6c	Merge pull request #430 from creative-commoners/pulls/2.3/access-passed-member ... FIX LeftAndMainSubsites::canAccess() now accepts a Member argument and falls back to the session member	2019-06-24 11:49:50 +12:00
Robbie Averill	0275bb1eca	FIX LeftAndMainSubsites::canAccess() now accepts a Member argument and falls back to the session member	2019-06-24 10:19:58 +12:00
Robbie Averill	483a867289	Merge pull request #428 from harmoney-dev/detect-subsite-by-domain-in-mock-requests ... Detect domains correctly in Director sub-calls	2019-06-12 15:42:23 +12:00
Nik Rolls	46a863557b	Detect domains correctly in Director sub-calls ... Previously it relied on the PHP-level $_SERVER variable; now it will use the HTTPRequest so it works correctly in more situations.	2019-06-12 15:14:09 +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	2a9f3ac0f6	DOCS Fix phpdoc in summary_fields ... [ci skip]	2019-05-31 11:44:09 +12:00
Robbie Averill	fadd42910b	Merge pull request #424 from creative-commoners/pulls/2.3/travis-segfault ... Remove code coverage, it is segfaulting on SS 4.4	2019-05-31 11:42:29 +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	2644083a2d	Remove code coverage, it is segfaulting on SS 4.4	2019-05-31 11:17:51 +12:00
Robbie Averill	ee961594bc	Merge branch '2.3'	2019-05-10 11:14:12 +12:00
Robbie Averill	e313f2ed5d	FIX Update Behat assertion to use correct label for "Search or choose Page"	2019-05-10 10:03:35 +12:00
Robbie Averill	536420ec68	FIX Update Behat assertion to use correct field label for SilverStripe 4.4	2019-05-10 09:46:21 +12:00
Guy Marriott	f8e4804cc1	Update translations	2019-05-09 15:44:59 +12:00