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 |
|
Robbie Averill
|
46653e2b07
|
Merge branch '2.3'
|
2019-04-15 16:27:59 +12:00 |
|
Robbie Averill
|
fe20bc2907
|
Merge branch '2.2' into 2.3
|
2019-04-15 16:27:36 +12:00 |
|
Robbie Averill
|
ec327aee7c
|
Update dependencies for SilverStripe ^4.4
|
2019-04-15 16:26:53 +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
|
1294671086
|
Merge branch '2.2'
|
2019-01-28 21:22:31 +02: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
|
d9fcaa3319
|
Merge pull request #403 from creative-commoners/pulls/2.3/bootstrap-notice
NEW Use Bootstrap styled alerts in assets notification
|
2018-11-28 14:40:49 +13:00 |
|
Robbie Averill
|
da2e8fcc8b
|
NEW Use Bootstrap styled alerts in assets notification
This will be the default in SilverStripe 4.4, and has been partially implemented in 4.3
|
2018-11-27 16:23:58 +01: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
|
e510213c3e
|
Merge branch '2.2'
|
2018-11-07 16:28:55 +02: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 |
|