Damian Mooyman
504342b45e
Add changelog for 1.2.1 release
2016-02-04 17:34:48 +13:00
Damian Mooyman
7ee8bdbf72
Merge pull request #176 from jason-zz/patch-1
...
Update SubsiteDomain.php
2016-02-04 17:26:56 +13:00
Damian Mooyman
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
Damian Mooyman
20c6cbc851
Merge pull request #178 from dnadesign/ImageTrackingFix
...
redoing bugfix
2016-02-04 17:05:29 +13:00
Damian Mooyman
0a93a42c2c
Merge pull request #210 from helpfulrobot/add-standard-scrutinizer-config
...
Added standard Scrutinizer config
2016-02-04 17:04:16 +13:00
Damian Mooyman
6ea8dc7ca8
Update translations
2016-02-04 11:03:42 +13:00
Scott Hutchinson
8a0afcf225
Merge pull request #232 from tractorcow/pulls/33compat
...
Update templates for 3.3 compatibility
2016-02-03 16:47:45 +13:00
Damian Mooyman
a1aba25708
Update templates for 3.3 compatibility
2016-02-03 13:27:03 +13:00
Daniel Hensby
69693e77ca
Merge pull request #230 from ianherbert/patch-1
...
DOCS Update README.md
2016-01-27 18:17:00 +00:00
Ian Herbert
8b049fd46c
Update README.md
...
Fixing broken links to userguide documentation.
2016-01-27 15:58:00 +13:00
Damian Mooyman
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
ctx2002
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
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
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
Mike Andrewartha
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
Damian Mooyman
686bf3bdda
Merge pull request #226 from helpfulrobot/update-license-year
...
Updated license year
2016-01-05 11:20:13 +13:00
helpfulrobot
d803de205f
Updated license year
2016-01-01 06:45:57 +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
Scott Hutchinson
8458c52429
Merge pull request #222 from tractorcow/pulls/master-template
...
BUG Fix menu compatibility with framework 4.x
2015-11-26 13:36:52 +13:00
Damian Mooyman
8afbb6842f
BUG Fix menu compatibility with framework 4.x
2015-11-26 13:24:29 +13:00
Damian Mooyman
145b8e6633
Remove alias from 1.1 branch
2015-11-25 11:49:10 +13:00
Damian Mooyman
b4024c94bb
Add changelog for 1.2.0
2015-11-25 11:48:01 +13:00
Damian Mooyman
2803573a9c
Update master branch to 2.0.0 for 4.x compatibility
2015-11-25 11:45:34 +13:00
Daniel Hensby
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
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
ce90c2124b
API Add option to specify http / https on subsite domains
2015-11-24 18:03:49 +13:00
Daniel Hensby
218382b984
Merge pull request #218 from tractorcow/pulls/fix-config
...
API Fix compatibility with framework 4.x
2015-11-23 09:36:50 +00:00
Daniel Hensby
4c17537d1d
Merge pull request #219 from helpfulrobot/add-standard-code-of-conduct
...
Added standard code of conduct
2015-11-23 09:33:14 +00:00
Damian Mooyman
a0ede56c0e
Reformat for psr-2
2015-11-23 16:53:45 +13:00
helpfulrobot
e241e70fbf
Added standard code of conduct
2015-11-21 20:17:10 +13:00
helpfulrobot
a38c3a6ff3
Added standard Scrutinizer config
2015-11-21 19:32:46 +13:00
Damian Mooyman
0d7dc49d6b
API Rename mysiteconfig to subsiteconfig
...
API make ErrorPageSubsite 4.x compatible
BUG Fix incorrect yml
BUG Fix incorrect DataExtension::augmentSQL implementation
2015-11-20 17:04:23 +13:00
Daniel Hensby
d45ff44edb
Merge pull request #213 from helpfulrobot/add-standard-editor-config
...
Added standard editor config
2015-11-19 17:30:39 +00:00
Daniel Hensby
2fc67a1e5d
Merge pull request #215 from helpfulrobot/add-standard-license
...
Added standard license
2015-11-19 17:21:16 +00:00
Daniel Hensby
7ba4a20b75
Merge pull request #216 from helpfulrobot/add-license-to-composer
...
Added license to composer.json
2015-11-19 11:59:31 +00:00
Daniel Hensby
933cfc8cfa
Merge pull request #217 from helpfulrobot/add-standard-git-attributes
...
Added standard git attributes
2015-11-19 10:41:36 +00:00
helpfulrobot
9000bc47c5
Added standard git attributes
2015-11-19 19:13:41 +13:00
helpfulrobot
415206e70b
Added license to composer.json
2015-11-19 18:53:20 +13:00
helpfulrobot
4b0440b15b
Added standard license
2015-11-19 18:32:20 +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
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
