504342b45e
Add changelog for 1.2.1 release
2016-02-04 17:34:48 +13:00
cef0781c92
BUG: The move to subsite folder dropdown in files is gone
...
Rebase of https://github.com/silverstripe/silverstripe-subsites/pull/152
2016-02-04 17:22:03 +13:00
20c6cbc851
Merge pull request #178 from dnadesign/ImageTrackingFix
...
redoing bugfix
2016-02-04 17:05:29 +13:00
6ea8dc7ca8
Update translations
2016-02-04 11:03:42 +13:00
8a0afcf225
Merge pull request #232 from tractorcow/pulls/33compat
...
Update templates for 3.3 compatibility
2016-02-03 16:47:45 +13:00
a1aba25708
Update templates for 3.3 compatibility
2016-02-03 13:27:03 +13:00
69693e77ca
Merge pull request #230 from ianherbert/patch-1
...
DOCS Update README.md
2016-01-27 18:17:00 +00:00
8b049fd46c
Update README.md
...
Fixing broken links to userguide documentation.
2016-01-27 15:58:00 +13:00
c15491c8c5
Merge pull request #229 from ctx2002/patch-1
...
BUG Fix Subsite module does not picks up themes
2016-01-25 15:49:11 +13:00
598d45aca6
Subsite module does not picks up themes
...
This PR fixed unable to create subsite problm.
I was unable to create a subsite, because of no themes been shown in Theme dropdown menu.
How to test:
1> Use composer to install a fresh copy of Silverstripe 3.2
2> Use composer to install subsite module.
3> Try to create a subsite.
4> No themes loaded into Theme dropdown menu.
5> Apply this PR.
6> fresh page / or dev/build, now, themes loaded into The dropdown menu.
2016-01-25 15:36:20 +13:00
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
540071c449
Merge pull request #227 from mandrew/1.2
...
DOCS: Moved user docs into userguide folder to display on userhelp site
2016-01-05 14:00:04 +13:00
3f3fa95e2c
moved user content into userhelp folder, removed old user manual pdf, added index file, updated readme links
2016-01-05 13:44:15 +13:00
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
257d71d946
moved user content into userhelp folder, removed user manual, added index file, updated readme links
2015-12-21 11:16:45 +13:00
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
145b8e6633
Remove alias from 1.1 branch
2015-11-25 11:49:10 +13:00
b4024c94bb
Add changelog for 1.2.0
2015-11-25 11:48:01 +13:00
1876b78204
Merge pull request #221 from tractorcow/pulls/1.1/fix-https
...
API Add option to specify http / https on subsite domains
2015-11-24 09:50:39 +00:00
a4c925b625
Merge pull request #220 from tractorcow/psr-2
...
Reformat for psr-2
2015-11-24 09:50:28 +00:00
ce90c2124b
API Add option to specify http / https on subsite domains
2015-11-24 18:03:49 +13:00
a0ede56c0e
Reformat for psr-2
2015-11-23 16:53:45 +13:00
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
1fc2fe5440
Add changelog for 1.1.0 release
2015-11-19 16:48:57 +13:00
984d5d9a59
Update translations
2015-11-17 16:07:38 +13:00
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
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
cf534aad31
BUG Subsites selection on SubsitesVirtualPage ( fixes #45 and #47 )
2015-11-13 17:31:44 +13:00
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
c7077ae749
Test 3 / 3.2 branches and php 5.6
2015-10-30 17:51:53 +13:00
79625583bd
Merge pull request #206 from scott1702/1.1
...
Add sticky nav toggle button
2015-10-30 15:57:13 +13:00
8c9c62f08c
Add sticky nav toggle button
2015-10-30 15:46:16 +13:00
0d9d697286
Merge pull request #204 from bummzack/issue-203-missing-route
...
Added missing route to `SubsiteXHRController`
2015-10-29 14:55:37 +00:00
798a1158d6
Added missing route to `SubsiteXHRController` for SilverStripe 3.2 compatibility.
2015-10-28 10:39:21 +01:00
3bcaa48d67
Update translations
2015-08-20 12:47:37 +12:00
ce3f8c9060
Merge pull request #191 from wernerkrauss/patch-1
...
Wrong edit link in SubsitesVirtualPage
2015-07-22 13:39:44 +01:00
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
601e174b34
Merge pull request #190 from assertchris/3.2-compat
...
3.2 compat changes
2015-06-09 11:12:45 +12:00
750cdbcff9
3.2 compat changes
2015-06-09 10:50:43 +12:00
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
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
999c115961
Merge pull request #173 from dhensby/master
...
Adding .editorconfig
2015-04-30 19:51:48 +12:00
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
2d4d35b1a7
MINOR: Update documentation to have more clarity around risks/benefits
2015-03-25 10:07:12 +13:00
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
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
831a918f8d
Merge pull request #181 from tractorcow/pulls/3.2-compat
...
Use 3.2 compatible API
2015-02-24 16:52:56 +00:00
73e0202dec
Merge pull request #180 from micmania1/fix-unnecessary-redirect
...
FIX: Removed unnecessary redirect.
2015-02-24 14:52:11 +13:00
5b9af35566
Use 3.2 compatible API
2015-02-24 09:34:34 +13:00
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
Damian Mooyman
Scott Hutchinson
Daniel Hensby
Ian Herbert
ctx2002
Mike Andrewartha
Ingo Schommer
scott1702
Roman Schmid
Damian Mooyman
wernerkrauss
Christopher Pitt
Ingo Schommer
unclecheese
Sean Harvey