46653e2b07
Merge branch '2.3'
2019-04-15 16:27:59 +12:00
fe20bc2907
Merge branch '2.2' into 2.3
2019-04-15 16:27:36 +12:00
ec327aee7c
Update dependencies for SilverStripe ^4.4
2019-04-15 16:26:53 +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
1294671086
Merge branch '2.2'
2019-01-28 21:22:31 +02: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
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
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
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
e510213c3e
Merge branch '2.2'
2018-11-07 16:28:55 +02: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
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
5b8a0dbf13
Merge pull request #386 from creative-commoners/pulls/2.2/deprecate-duplicate
...
API Deprecate duplicateSubsiteRelations. Use "cascade_duplicates" config API instead.
2018-08-24 10:27:21 +12:00
8af796fa7a
API Deprecate duplicateSubsiteRelations. Use "cascade_duplicates" config API instead.
2018-08-24 10:13:22 +12:00
7f28c32427
FIX Pages now correctly duplicate children across subsites
2018-08-24 10:12:05 +12:00
6747b5ffe8
Merge pull request #381 from lekoala/patch-1
...
allow disabling filter using queryParam
2018-08-24 08:50:47 +12:00
9ba1275b49
Merge pull request #382 from lekoala/patch-2
...
allow using queryParam to disable filter
2018-08-24 08:50:41 +12:00
687e013793
Merge branch '2.1'
2018-08-20 09:58:59 +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
6e35807dc7
allow using queryParam to disable filter
...
much better than global state (and should potentially replace cookie usage that is user controlled)
2018-08-16 16:20:48 +02:00
c177a9f640
allow disabling filter using queryParam
...
It is much better than relying on global state
2018-08-16 16:19:25 +02:00
Robbie Averill
Robbie Averill
Dylan Wagstaff
Guy Marriott
Daniel Hensby
bergice
DorsetDigital
Thomas Portelange