tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,153 Commits 29 Branches 77 Tags 4.1 MiB
Commit Graph

1153 Commits

Author SHA1 Message Date
Robbie Averill d8088edfa9 Merge branch '2.1' 2018-07-26 15:15:29 +12:00
Robbie Averill 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
Robbie Averill 4b6804eaab [SS-2018-016] Group table name is escaped to prevent possibility of SQL injection 2018-07-16 11:22:58 +12:00
Raissa North 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
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 c732c0c799
Merge pull request #375 from creative-commoners/pulls/2.2/deprecate-old-preview-url-function 
Deprecate alternatePreviewLink function as per CMS
 2018-07-05 10:48:37 +12:00
Dylan Wagstaff ffbcb9a0c8 Deprecate alternatePreviewLink function as per CMS 
SilverStripe CMS 4.0.0 issues a deprecation notice before calling
alternatePreviewLink on any page that hasMethod (i.e. is applied via an
extension such as SiteTreeSubsites). Instead of double-issuing a notice,
we will just mark this as deprecated in the next minor version via
docblocks.
 2018-07-05 09:55:45 +12:00
Dylan Wagstaff d78e3c4662 Merge branch '2.1' 2018-07-05 09:50:21 +12:00
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 c43abb05c2
Merge branch '2.1' 2018-06-20 17:11:18 +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