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
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
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
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
7cc86199e7
Revert "FIX CMS permission checks for subsite are now handled in the state context"
2018-10-19 12:00:50 +13:00
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
2a6f7b5dfb
Automated linting fix
2018-10-18 11:03:16 +02:00
6a8f15a194
Merge pull request #395 from DorsetDigital/patch-1
...
Change source of admin URL in getIsAdmin()
2018-10-18 11:02:46 +02:00
e52fe41a23
BUG: Fix `MigrateFileTask` not migrating files for subsites
...
Fixes #352
2018-10-18 18:41:07 +13:00
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
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
bb226a0652
FIX Remove duplicate Configuration tabs when creating a new subsite
2018-09-14 09:42:29 +02:00
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
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
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
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
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
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
e8a72e1c33
FIX Duplicate page's parent IDs are now assumed or zeroed after duplication
2018-08-24 10:30:27 +12:00
7f28c32427
FIX Pages now correctly duplicate children across subsites
2018-08-24 10:12:05 +12:00
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
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
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
4b6804eaab
[SS-2018-016] Group table name is escaped to prevent possibility of SQL injection
2018-07-16 11:22:58 +12:00
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
191c63bd9b
Remove extra subsite fixture definition
2018-07-13 16:31:10 +12:00
f635aa9811
Add subsite switching behat tests and a test that shows a UI bug in publishing
2018-07-13 15:59:37 +12:00
75b851326d
Merge branch '2.0' into 2.1
2018-07-05 09:49:11 +12:00
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
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
56bc57a5c5
Removing obsolete branch alias
2018-06-20 17:10:32 +12:00
de0bba0df2
Merge pull request #371 from creative-commoners/pulls/2.0/exists
...
Switch count for exists() check for readability
2018-06-20 09:44:51 +12:00
153db12d42
Switch count for exists() check for readability
2018-06-20 09:27:04 +12:00
Robbie Averill
Guy Marriott
Robbie Averill
Daniel Hensby
Dylan Wagstaff
Robbie Averill
bergice
DorsetDigital
Raissa North
Dylan Wagstaff