Dylan Wagstaff
75b851326d
Merge branch '2.0' into 2.1
2018-07-05 09:49:11 +12:00
Robbie Averill
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
Dylan Wagstaff
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
Guy
56bc57a5c5
Removing obsolete branch alias
2018-06-20 17:10:32 +12:00
Dylan Wagstaff
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
Robbie Averill
153db12d42
Switch count for exists() check for readability
2018-06-20 09:27:04 +12:00
Dylan Wagstaff
f0a5dcf63c
Merge pull request #370 from creative-commoners/pulls/2.1/hide-single-subsite
...
NEW Hide subsite selector dropdown if no subsites have been created yet
2018-06-19 17:06:11 +12:00
Dylan Wagstaff
f19b82f029
Merge pull request #369 from creative-commoners/pulls/2.0/fix-edit-check
...
FIX Do no provide input for canEdit or canPublish if no subsites exist
2018-06-19 17:04:15 +12:00
Robbie Averill
21f4d80ef2
NEW Hide subsite selector dropdown if no subsites have been created yet
...
Note that "Main site" is always included in the list of subsites, even though it is not an actual record
2018-06-19 15:51:33 +12:00
Robbie Averill
dc9d6de62d
FIX Do no provide input for canEdit or canPublish if no subsites exist
2018-06-19 15:43:09 +12:00
Raissa North
9038a166bd
Merge pull request #367 from creative-commoners/pulls/2.0/escaped-menu
...
FIX Double escaping subsites title in CMS menu
2018-06-19 13:56:02 +12:00
Robbie Averill
315621892d
FIX Double escaping subsites title in CMS menu
2018-06-19 13:47:15 +12:00
Robbie Averill
5285a68404
Merge pull request #365 from creative-commoners/pulls/master/add-supported-module-badge
...
Add supported module badge to readme
2018-06-19 09:23:14 +12:00
Dylan Wagstaff
90bddc7e55
Add supported module badge to readme
2018-06-15 17:49:52 +12:00
Robbie Averill
aae3e655c4
Merge branch '2.0'
2018-06-15 09:44:24 +12:00
Dylan Wagstaff
875f5519ed
Merge pull request #361 from creative-commoners/pulls/2.0/canedit-fix
...
FIX Do not make subsite based file permission decisions when no subsite is set
2018-06-11 10:41:20 +12:00
Dylan Wagstaff
e8b292ecc5
Merge pull request #362 from creative-commoners/pulls/2.0/fix-group-tablename
...
FIX Use correct table name for Group model when performing DB upgrades from older versions
2018-06-08 11:30:07 +12:00
Robbie Averill
b6ba567ee5
FIX Do not make subsite based file permission decisions when no subsite is set
2018-06-08 10:05:23 +12:00
Robbie Averill
8222f619f8
FIX Use correct table name for Group model when performing DB upgrades from older versions
2018-06-08 10:04:58 +12:00
Robbie Averill
1e5ee559b0
Merge pull request #363 from creative-commoners/pulls/2.0/re-enable-behat
...
FIX Re-enable Behat using chromedriver and silverstripe/recipe-testing
2018-06-08 10:03:53 +12:00
Robbie Averill
c30c0d94eb
Increase memory limit in Travis configuration
2018-06-07 16:00:52 +12:00
Robbie Averill
af06f803c5
FIX Re-enable Behat using chromedriver and silverstripe/recipe-testing
2018-06-01 15:48:19 +12:00
Robbie Averill
032ea73154
Update branch alias for 2.x-dev
2018-05-25 15:18:34 +12:00
Robbie Averill
631498fd1d
Remove obsolete branch alias
2018-05-25 15:17:58 +12:00
Robbie Averill
5c801a4392
Update translations
2018-05-25 15:16:40 +12:00
Robbie Averill
94e88b5be9
Update createDefaultPages to use SubsiteState API
2018-05-04 14:04:50 +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
531a38e043
Merge branch '1.4' into 1
2018-05-04 13:44:30 +12:00
Dylan Wagstaff
6a8da1caaa
Merge pull request #359 from creative-commoners/pulls/1.4/default-page-on-creation
...
FIX Automatically create default SiteTree records for new subsites
2018-04-20 21:10:52 +12:00
Robbie Averill
b4943fb77c
FIX Automatically create default SiteTree records for new subsites
2018-04-20 17:14:06 +12:00
Dylan
7115d060a6
Update translations
2018-04-04 10:17:01 +12:00
Daniel Hensby
418fa586a3
Merge pull request #353 from creative-commoners/pulls/2.0/count-properly
...
FIX be consistent with the variable setting
2018-03-27 12:24:21 +01:00
Dylan
fe1c0a58c0
FIX be consistent with the variable setting
...
So as to avoid fatal errors while attempting to count.
2018-03-27 11:51:30 +01:00
Robbie Averill
c7425ef23e
Merge pull request #354 from dhensby/pulls/live-test
...
FIX Versioned regressions
2018-03-27 07:50:54 +13:00
Daniel Hensby
67bb7e0028
FIX Versioned regressions
2018-03-26 13:51:20 +01:00
Dylan Wagstaff
0fcde6c0bb
Merge pull request #350 from creative-commoners/pulls/2.0/fix-cmsmain-tests
...
Use injected CMSMain to prevent unit test error missing dependencies
2018-03-19 11:15:33 +13:00
Robbie Averill
2f7dc7a7a8
Clear hints cache for SS 4.1 only if method exists (SS 4.0 support)
2018-03-19 10:03:32 +13:00
Robbie Averill
30454dc04f
FIX Support blacklist for SS 4.0 and 4.1, remove old Translatable reference in test class
2018-03-15 17:15:19 +13:00
Robbie Averill
6feec1de34
Prefer source to ensure that TestAssetStore is installed
2018-03-15 17:05:12 +13:00
Robbie Averill
856496e09d
Ensure SiteTree class name hints cache gets cleared between tests
2018-03-15 17:03:41 +13:00
Robbie Averill
7f77bb0c17
Add different installer versions to Travis build matrix
2018-03-15 16:47:00 +13:00
Robbie Averill
afd23be64c
FIX Correctly decode page type blacklist from JSON
2018-03-15 16:44:48 +13:00
Robbie Averill
8398a361cd
Use injected CMSMain to prevent unit test error missing dependencies
2018-03-15 15:56:10 +13:00
Robbie Averill
f8f39c135f
Merge branch '1'
2018-02-22 11:38:07 +13:00
Robbie Averill
24ee5a186e
Merge branch '1.4' into 1
2018-02-22 11:37:26 +13:00
Robbie Averill
e04d04dc70
Merge branch '1.3' into 1.4
2018-02-22 11:35:52 +13:00
Robbie Averill
742c4a7fa3
Update branch alias for 1.5.x-dev
2018-02-22 10:22:58 +13:00
Robbie Averill
e4702dc132
Remove obsolete branch-alias
2018-02-22 09:25:11 +13:00
Dylan Wagstaff
299f12765c
Merge pull request #344 from creative-commoners/pulls/2.0/fix-subsite-redirect
...
FIX Redirect user back to the full current URL after changing subsites
2018-02-09 10:21:24 +13:00
