Damian Mooyman
|
6afac5f9af
|
Merge pull request #196 from dnadesign/duplication_improvements
made duplication between subsites more robust
|
2016-08-10 18:30:14 +12:00 |
|
John Milmine
|
3587bc666f
|
made duplication between subsites more robust
and added some extra methods so it's easier to overwrite or extend
|
2016-03-22 21:55:11 +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
|
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
|
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 |
|
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
|
2803573a9c
|
Update master branch to 2.0.0 for 4.x compatibility
|
2015-11-25 11:45:34 +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 |
|
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 |
|
helpfulrobot
|
a9ee70c5dd
|
Added standard editor config
|
2015-11-19 13:26:50 +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 |
|