Commit Graph

106 Commits

Author SHA1 Message Date
Steve Boyd
212790ae29 Merge branch '2.3' into 2 2020-09-12 18:39:03 +12:00
Mohamed Alsharaf
27bae53017 Adjusting query used in getSubsiteIDForDomain
Prevent unknow database field error when a new DB field added
to Subsite data object.
2020-09-11 16:39:33 +12:00
Corey Sewell
f1fce6f739 Fix "Column 'URLSegment' in where clause is ambiguous" when duplicating pages 2020-01-17 12:35:08 +13: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
Robbie Averill
5cf44c9d02 Merge branch '2.0' into 2.1 2019-09-25 15:00:00 -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
09abe2b2f2 Use Director::host() over direct $_SERVER access 2019-07-29 10:38:14 +02:00
Robbie Averill
9a7cdbbe2d FIX Prevent undefined index notice when trying to determine HTTP_HOST during dev/build 2019-07-26 09:53:54 +02: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
58f89801b0
FIX Ensure constant is accessed correctly 2019-07-12 15:24:10 +12: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
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
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
2a9f3ac0f6 DOCS Fix phpdoc in summary_fields
[ci skip]
2019-05-31 11:44:09 +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
fe20bc2907 Merge branch '2.2' into 2.3 2019-04-15 16:27:36 +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
1294671086 Merge branch '2.2' 2019-01-28 21:22:31 +02: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
Guy Marriott
59f6685e2a
FIX Catching situation where database has no tables but it exists 2018-11-08 12:05:36 +13: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
Robbie Averill
ff9997e0f2 FIX Ignore ports when matching domain for subsite 2018-10-19 20:51:43 +02:00
Robbie Averill
bf7dd9c37b Merge branch '2.1'
# Conflicts:
  #	src/Extensions/SiteTreeSubsites.php
2018-10-19 16:28:50 +02:00
Robbie Averill
9199d509d6 Merge branch '2.0' into 2.1 2018-10-19 16:27:38 +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
Robbie Averill
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
Robbie Averill
2a6f7b5dfb Automated linting fix 2018-10-18 11:03:16 +02:00
bergice
e52fe41a23 BUG: Fix MigrateFileTask not migrating files for subsites
Fixes #352
2018-10-18 18:41:07 +13:00
DorsetDigital
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
Dylan Wagstaff
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
Robbie Averill
bb226a0652 FIX Remove duplicate Configuration tabs when creating a new subsite 2018-09-14 09:42:29 +02:00