38b356c256
Merge branch '2.1' into 2.2
...
# Conflicts:
# tests/php/SiteTreeSubsitesTest.php
2019-09-25 15:00:35 -07:00
5cf44c9d02
Merge branch '2.0' into 2.1
2019-09-25 15:00:00 -07:00
917640699d
FIX Prevent undefined index notice when trying to determine HTTP… ( #440 )
...
FIX Prevent undefined index notice when trying to determine HTTP_HOST during dev/build
2019-07-30 10:36:48 +12:00
09abe2b2f2
Use Director::host() over direct $_SERVER access
2019-07-29 10:38:14 +02:00
9a7cdbbe2d
FIX Prevent undefined index notice when trying to determine HTTP_HOST during dev/build
2019-07-26 09:53:54 +02:00
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
58f89801b0
FIX Ensure constant is accessed correctly
2019-07-12 15:24:10 +12:00
9feef185dc
Adding documentation about cascading themes
2019-07-12 13:34:42 +12:00
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
7d27abf2b1
Update expected json content type in unit test
2019-06-25 16:05:38 +12:00
e41dc8b018
Merge branch '2.1' into 2.2
2019-06-25 15:44:37 +12:00
9655371276
Merge branch '2.0' into 2.1
2019-06-25 15:43:59 +12:00
67d10ec0cb
Remove SilverStripe 4.0-4.2 from Travis builds
2019-06-25 15:43:50 +12:00
4fdf2e24e3
FIX LeftAndMainSubsites::canAccess() now accepts a Member argument and falls back to the session member
2019-06-25 15:42:54 +12:00
614819a1d3
Reduce Behat builds to SS 4.3 and update postgres version
2019-06-25 11:12:16 +12:00
eddbc90524
Remove SilverStripe 4.0-4.2 from Travis builds
2019-06-25 10:01:27 +12:00
4249fffc0f
FIX LeftAndMainSubsites::canAccess() now accepts a Member argument and falls back to the session member
2019-06-25 10:00:13 +12:00
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
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
f6503822e8
DOCS Fix typos
...
[ci skip]
Co-Authored-By: Garion Herman <garion@silverstripe.com>
2019-06-05 15:09:57 +12:00
2b26876596
Add test for URLSegment prefix set to primary subsite domain for page
2019-05-31 16:41:36 +12:00
900d04d94a
Add tests and move logic into the if statement
2019-05-31 16:32:28 +12:00
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
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
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
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
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
c60acb3190
FIX Field labels for subsites virtual pages are no longer repeated
2019-05-31 11:29:30 +12:00
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
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
68c763da3e
Tidy output of IsPublic value in Subsites admin
2019-05-31 11:27:47 +12:00
1e44e1d4ba
FIX Domains now default to "Automatic" protocol, and have the correct help description
2019-05-31 11:26:46 +12:00
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
f003fb5e74
Add PHP 7.3 to build matrix and move Behat builds to SilverStripe 4.3
2019-02-10 12:41:59 +03:00
9dbdd992f7
FIX Content editor group users can now insert links into contents while using subsites
2019-02-10 12:18:19 +03:00
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
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
59f6685e2a
FIX Catching situation where database has no tables but it exists
2018-11-08 12:05:36 +13:00
a0ecbdf4b6
Remove obsolete branch alias
2018-11-07 16:28:40 +02:00
e4fe534f10
Merge branch '2.1'
2018-11-07 16:28:10 +02:00
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
2a35a5c70a
FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4
2018-10-28 21:41:32 +00:00
1fa549886f
Define explode limit when removing port
2018-10-20 23:16:05 +02:00
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
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
5e79abdbbc
Update testDomainProtocol to use a dataProvider
...
This might help with test state leakage
2018-10-19 21:51:32 +02:00
ff9997e0f2
FIX Ignore ports when matching domain for subsite
2018-10-19 20:51:43 +02:00
bf7dd9c37b
Merge branch '2.1'
...
# Conflicts:
# src/Extensions/SiteTreeSubsites.php
2018-10-19 16:28:50 +02:00
9199d509d6
Merge branch '2.0' into 2.1
2018-10-19 16:27:38 +02:00
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
Robbie Averill
Guy Marriott
Robbie Averill
Garion Herman
Robbie Averill
Dylan Wagstaff
Daniel Hensby