tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity
773 Commits 30 Branches 84 Tags 5.2 MiB
e129cafa94
Commit Graph

773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
helpfulrobot
a9ee70c5dd Added standard editor config 2015-11-19 13:26:50 +13:00
Damian Mooyman
984d5d9a59 Update translations 2015-11-17 16:07:38 +13:00
Damian Mooyman
5e18e8dca3 Merge remote-tracking branch 'origin/1.1' 
Conflicts:
	.travis.yml
 2015-11-13 19:06:09 +13:00
Damian Mooyman
c22c8dc810 Merge remote-tracking branch 'origin/1.0' into 1.1 
Conflicts:
	code/extensions/LeftAndMainSubsites.php
	tests/SiteTreeSubsitesTest.php
 2015-11-13 19:02:12 +13:00
Damian Mooyman
e9678221fc Merge pull request #209 from chillu/pulls/subsites-dropdown 
BUG Subsites selection on SubsitesVirtualPage (fixes #45 and #47)
 2015-11-13 18:52:23 +13:00
Ingo Schommer
cf534aad31 BUG Subsites selection on SubsitesVirtualPage (fixes #45 and #47) 2015-11-13 17:31:44 +13:00
Scott Hutchinson
63aa46aa36 Merge pull request #207 from tractorcow/pulls/tests 
Test 3 / 3.2 branches and php 5.6
 2015-10-30 18:45:54 +13:00
Damian Mooyman
c7077ae749 Test 3 / 3.2 branches and php 5.6 2015-10-30 17:51:53 +13:00
Damian Mooyman
79625583bd Merge pull request #206 from scott1702/1.1 
Add sticky nav toggle button
 2015-10-30 15:57:13 +13:00
scott1702
8c9c62f08c Add sticky nav toggle button 2015-10-30 15:46:16 +13:00
Daniel Hensby
0d9d697286 Merge pull request #204 from bummzack/issue-203-missing-route 
Added missing route to `SubsiteXHRController`
 2015-10-29 14:55:37 +00:00
Roman Schmid
798a1158d6 Added missing route to SubsiteXHRController for SilverStripe 3.2 compatibility. 2015-10-28 10:39:21 +01:00
Will Rossiter
b979b38694 FIX: #138 allow subsite summary fields to be customized 2015-10-21 09:09:10 +13:00
Damian Mooyman
3bcaa48d67 Update translations 2015-08-20 12:47:37 +12:00
Will Rossiter
9c9e0bfa94 Correct link to editing a subsite virtual page. 2015-07-27 10:57:10 +12:00
Daniel Hensby
ce3f8c9060 Merge pull request #191 from wernerkrauss/patch-1 
Wrong edit link in SubsitesVirtualPage
 2015-07-22 13:39:44 +01:00
Daniel Hensby
0274b9effd Move to new travis containerised infrastructure 2015-07-20 15:58:43 +01:00
Damian Mooyman
80daa54dfc Merge pull request #188 from torleif/patch-2 
SubsitesVirtualPage icon disapears in CMS
 2015-07-02 12:13:06 +12:00
wernerkrauss
996abfcc58 Wrong edit link in SubsitesVirtualPage 
In SS3.1 we have /admin/pages for cms, was still old link.
 2015-06-17 16:30:56 +02:00
Daniel Hensby
6f06dd565b Updating travis provisioner 
Travis will now be more resilient to `composer self-update` failures
 2015-06-15 10:02:06 +01:00
Damian Mooyman
601e174b34 Merge pull request #190 from assertchris/3.2-compat 
3.2 compat changes
 2015-06-09 11:12:45 +12:00
Christopher Pitt
750cdbcff9 3.2 compat changes 2015-06-09 10:50:43 +12:00
torleif
c97b1140bf SubsitesVirtualPage icon disapears in CMS 
The SubsitesVirtualPage icon is hidden in the CMS when using the subsite module and CWP
 2015-05-27 15:46:39 +12:00
Ingo Schommer
5604879146 4.x core compat 2015-04-30 22:39:22 +12:00
Damian Mooyman
bfc70f9b06 Fix subsites to use correct permissions 
See http://www.silverstripe.org/software/download/security-releases/ss-2015-008-sitetree-creation-permission-vulnerability

Conflicts:
	tests/SiteTreeSubsitesTest.php
 2015-04-30 22:34:28 +12:00
Ingo Schommer
c18a0a266f Adjusted tests to new SiteTree->canCreate() logic in 3.1.11+ 
Checks SiteConfig permissions by default now
 2015-04-30 22:34:28 +12:00
Ingo Schommer
999c115961 Merge pull request #173 from dhensby/master 
Adding .editorconfig
 2015-04-30 19:51:48 +12:00
Damian Mooyman
c389f36eda Merge pull request #184 from unclecheese/patch-2 
MINOR: Update documentation to have more clarity around risks/benefits
 2015-03-25 11:43:03 +13:00
unclecheese
2d4d35b1a7 MINOR: Update documentation to have more clarity around risks/benefits 2015-03-25 10:07:12 +13:00
Sean Harvey
d701afcb61 Merge pull request #183 from tractorcow/pulls/1.0/update-test-permissions 
Fix subsites to use correct permissions
 2015-03-23 14:58:11 +13:00
Damian Mooyman
2595d655cb Fix subsites to use correct permissions 
See http://www.silverstripe.org/software/download/security-releases/ss-2015-008-sitetree-creation-permission-vulnerability
 2015-03-23 14:35:52 +13:00
Daniel Hensby
831a918f8d Merge pull request #181 from tractorcow/pulls/3.2-compat 
Use 3.2 compatible API
 2015-02-24 16:52:56 +00:00
Damian Mooyman
73e0202dec Merge pull request #180 from micmania1/fix-unnecessary-redirect 
FIX: Removed unnecessary redirect.
 2015-02-24 14:52:11 +13:00
Damian Mooyman
5b9af35566 Use 3.2 compatible API 2015-02-24 09:34:34 +13:00
Damian Mooyman
e6c8dff7be Merge remote-tracking branch 'origin/1.0' 
Conflicts:
	.travis.yml
	code/extensions/LeftAndMainSubsites.php
	composer.json
 2015-02-24 09:12:38 +13:00
micmania1
3ca2861c2d FIX: Removed unnecessary redirect. This is early enough in the script that the correct subsite will be used from hereon. 2015-02-17 01:13:56 +00:00
Damian Mooyman
ebebff248f Merge pull request #172 from dnadesign/redirect_fix_between_CMS_sections 
redirect_fix_between_CMS_sections
 2015-02-09 09:44:43 +13:00
Jason
d99785d773 Update SubsiteDomain.php 
Add $default_sort.
 2014-12-17 10:44:43 +11:00
Daniel Hensby
6d6667aa08 Adding .editorconfig 2014-12-04 15:48:23 +00:00
John Milmine
91591a3752 redirect_fix_between_CMS_sections 
previously if you were editing settings and you changed subsites ti would revert you to /admin, now it stays within your current controller
 2014-11-24 15:32:05 +13:00
James Cocker
498d6e0619 Fixes #135: LeftAndMain switching between subsites 
When trying to switch to a different subsite from a page's editing view, it wouldn't switch. This was partly due to a $record always existing due to the homepage fallback on currentPageID : https://github.com/silverstripe/silverstripe-cms/blob/3.1/code/controllers/CMSMain.php#L816

So as currentPage() couldn't actually be used to test for the existance of a current page, I've added in a check for isset($this->owner->urlParams['ID']).

I've also moved the check for $_GET['SubsiteID’] which indicated a forced subsite switch (eg. via the dropdown switcher) above the check for a current page, as it should take precedence, and it wasn't being run when both conditions matched causing the subsite not to change.

Tested changing subsites from /admin/pages, from page edit view, from a page edit URL, and from other CMS sections such as Files and Security, and all seems to be working perfectly now.
 2014-11-24 15:25:53 +13:00
Will Rossiter
0520b57f84 Merge pull request #145 from purplespider/patch-2 
Fixes #135: LeftAndMain switching between subsites
 2014-11-24 15:11:12 +13:00
Damian Mooyman
b6f59741d6 Update master-alias to follow stable release versioning 2014-11-19 14:12:34 +13:00
Damian Mooyman
bf747f98be Update translations 2014-11-19 12:09:52 +13:00
Damian Mooyman
533c7fae8d Merge pull request #163 from unclecheese/patch-1 
Update subsites caveat to align more with other references.
 2014-10-06 11:05:45 +13:00
unclecheese
8acc4a230a Update subsites caveat to align more with other references. 
e.g. here https://www.cwp.govt.nz/about/how-does-cwp-work/

Rewording of subsites caveat
 2014-10-06 10:59:58 +13:00
Sean Harvey
62f47628e3 Merge pull request #158 from tractorcow/pulls/0.5/compat 
Fix composer and travis to framework 3.1
 2014-08-27 09:23:21 +12:00
Damian Mooyman
71e3b9db2d Fix composer and travis to framework 3.1 2014-08-27 09:14:52 +12:00
Sean Harvey
4203a707bc Fixing travis for 3.1 builds 2014-08-27 09:06:16 +12:00
Sean Harvey
ba6cb193b7 Merge pull request #157 from tractorcow/pulls/0.6/branch 
BUG Fix incompatibility with framework 3.2
 2014-08-26 18:06:40 +12:00