Commit Graph

209 Commits

Author SHA1 Message Date
Sabina Talipova
fbeff6d879 MNT Remove TODO comments 2023-10-26 09:45:22 +13:00
Steve Boyd
903c482036 Merge branch '2' into 3 2023-02-03 10:31:29 +13:00
Steve Boyd
4f7f6cc313
Merge pull request #502 from creative-commoners/pulls/3/frontend-build-stack
DEP Upgrade frontend build stack
2023-01-30 13:50:37 +13:00
Guy Sartorelli
229152d354
MNT Fix behat test 2023-01-27 13:44:48 +13:00
Steve Boyd
d4bc28e65c API Remove deprecated code
Co-authored-by: Sabina Talipova <sabina.talipova@silverstripe.com>
2023-01-27 09:55:04 +13:00
Sabina Talipova
a67b7ef45f
DEP PHP Support in CMS5 (#497) 2023-01-10 13:31:07 +13:00
Guy Sartorelli
6770dedc2a
Merge branch '2.7' into 2 2022-12-19 03:00:28 +00:00
Guy Sartorelli
901dbc8848
Merge branch '2.6' into 2.7-release 2022-12-19 13:52:24 +13:00
Steve Boyd
73f3d15bfb
[CVE-2022-42949] Subsite file permissions 2022-12-19 11:30:59 +13:00
Steve Boyd
416f55ad03 API Stop using deprecated API 2022-11-28 17:49:50 +13:00
Sabina Talipova
5eb7e8a7a3 ENH Replace ADMIN permissions with less permissions in Behat test 2022-09-09 15:16:40 +12:00
Bart van Irsel
74b6cec374
ENH added config setting to ignore subsite language (#481)
added config setting to ignore subsite language; when using subsites in combination with fluent it picked up wrong yml file
2022-07-28 12:19:33 +12:00
Steve Boyd
ed4663be9b ENH PHP 8.1 compatibility 2022-04-13 13:49:48 +12:00
Steve Boyd
cae9bd51ec MNT Update behat tests 2021-11-12 12:38:44 +13:00
Steve Boyd
13ab072303 API phpunit 9 support 2021-10-27 18:24:03 +13:00
Steve Boyd
643b8d436a MNT Fix test to work with session-manager module 2021-09-07 15:36:57 +12:00
Robbie Averill
5d015c7a96 Merge branch '2.2' into 2.3 2019-09-25 15:00:47 -07:00
Robbie Averill
38b356c256 Merge branch '2.1' into 2.2
# Conflicts:
 #	tests/php/SiteTreeSubsitesTest.php
2019-09-25 15:00:35 -07:00
Nik Rolls
b1c1931d5d 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-08-15 10:16:20 +12:00
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
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
Robbie Averill
9655371276 Merge branch '2.0' into 2.1 2019-06-25 15:43:59 +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
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
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
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
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
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
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
Robbie Averill
2a35a5c70a FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4 2018-10-28 21:41:32 +00: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
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
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
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
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
7f28c32427 FIX Pages now correctly duplicate children across subsites 2018-08-24 10:12:05 +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
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
adc0395c25 Automated linting 2018-05-04 13:57:25 +12:00
Robbie Averill
cc064c43ce Merge branch '1' 2018-05-04 13:56:26 +12:00
Robbie Averill
b4943fb77c FIX Automatically create default SiteTree records for new subsites 2018-04-20 17:14:06 +12:00
Daniel Hensby
67bb7e0028
FIX Versioned regressions 2018-03-26 13:51:20 +01:00