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

637 Commits

Author SHA1 Message Date
Sam Minnee 79dc6c1a20 FIX: Fixed test matrix to get builds passing 2020-10-13 16:39:28 +13:00
Sam Minnee 2e2fe0718d MNT: Fix casing in composer.json 2020-10-13 16:25:20 +13:00
Aaron Carlino c9652ee5d4
Merge pull request #449 from silverstripe/pulls/1.1/new-docs 
Update to new docs site
 2019-12-19 12:44:19 +13:00
Aaron Carlino ccb28c51bb Add frontmatter to subpages 2019-12-09 12:43:49 +13:00
Aaron Carlino a6464af465 Update userguide for compliance with new docs site 2019-12-06 15:02:21 +13:00
Robbie Averill c1bf1bcc21 Merge branch '1.0' into 1.1 2017-09-08 14:41:11 +12:00
Robbie Averill 2cbdeba69a BUG Remove Behat tests from Travis matrix for SS3 2017-09-08 14:31:02 +12:00
Robbie Averill 669995d544 Use precise distro on Travis 2017-09-08 13:52:59 +12:00
Robbie Averill 20b81fc4b0 Merge branch '1.0' into 1.1 2017-09-08 13:52:05 +12:00
Damian Mooyman bd26907abf Merge pull request #306 from creative-commoners/pulls/1.0/remove-transifex 
SS3 translations are frozen. Please contribute translation fixes via pull requests to lang files.
 2017-09-08 13:09:23 +12:00
Robbie Averill df4f68be08 SS3 translations are frozen. Please contribute translation fixes via pull requests to lang files. 2017-09-07 16:47:42 +12:00
Daniel Hensby 50cc4f857a Merge pull request #246 from tractorcow/pulls/1.1/sudo-false 
Set sudo:false to use new containerised structure
 2016-05-16 10:07:25 +01:00
Damian Mooyman 6e91600507 Set sudo:false to use new containerised structure 2016-05-16 17:18:22 +12:00
Damian Mooyman 20c6cbc851 Merge pull request #178 from dnadesign/ImageTrackingFix 
redoing bugfix
 2016-02-04 17:05:29 +13:00
Damian Mooyman fb670d30d7 Merge pull request #224 from mandrew/1.1 
Moved user docs into userguide folder to display on userhelp site
 2016-01-05 14:00:15 +13:00
Damian Mooyman 18f248fadd Merge pull request #225 from mandrew/1.0 
Moved user docs into userguide folder to display on userhelp site
 2015-12-21 14:52:59 +13:00
Mike Andrewartha 257d71d946 moved user content into userhelp folder, removed user manual, added index file, updated readme links 2015-12-21 11:16:45 +13:00
Mike Andrewartha 280562fb7e moved user content into userhelp folder, removed old user manual pdf, added index file, updated readme links 2015-12-21 11:08:11 +13:00
Damian Mooyman 145b8e6633 Remove alias from 1.1 branch 2015-11-25 11:49:10 +13:00
Daniel Hensby a4c925b625 Merge pull request #220 from tractorcow/psr-2 
Reformat for psr-2
 2015-11-24 09:50:28 +00:00
Damian Mooyman a0ede56c0e Reformat for psr-2 2015-11-23 16:53:45 +13:00
Scott Hutchinson 5f02e0c406 Merge pull request #214 from tractorcow/pulls/release-110 
Add changelog for 1.1.0 release
 2015-11-19 17:13:38 +13:00
Damian Mooyman 1fc2fe5440 Add changelog for 1.1.0 release 2015-11-19 16:48:57 +13:00
Damian Mooyman 984d5d9a59 Update translations 2015-11-17 16:07:38 +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
Damian Mooyman 3bcaa48d67 Update translations 2015-08-20 12:47:37 +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
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
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
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