Commit Graph

709 Commits

Author SHA1 Message Date
Damian Mooyman
0e61dfc3f6 BUG Prevent translatable / subdirs interfering with test state 2016-08-23 12:36:12 +12:00
Damian Mooyman
7c97a8ae74 Update translations 2016-08-17 11:08:01 +12:00
Daniel Hensby
65bf5c732b Merge pull request #255 from dnadesign/copy_children_subsites
NEW: Add IncludeChildren option for copying pages between subsites.
2016-07-18 11:40:23 +01:00
Daniel Hensby
b8667fb933 Merge pull request #256 from madmatt/pulls/fix-null-dataquery
Fix error when dataQuery is a null object
2016-07-18 11:39:47 +01:00
madmatt
3962df53cd Fix error when dataQuery is a null object 2016-07-18 17:10:11 +12:00
Will Rossiter
c8f6f4a588 NEW: Add IncludeChildren option for copying pages between subsites. 2016-07-18 16:41:38 +12:00
Ingo Schommer
871e2bcefd Merge pull request #250 from open-sausages/pulls/fix-copy
BUG Fix copy to subsite breaking on sub-pages
2016-06-13 10:24:13 +12:00
Damian Mooyman
ff28ac1b1e BUG Fix copy to subsite breaking on sub-pages
Fixes #192

Signed-off-by: Damian Mooyman <damian@silverstripe.com>
Signed-off-by: Ingo Schommer <ingo@silverstripe.com>
2016-06-13 10:23:33 +12:00
Daniel Hensby
f7bab259b7 Merge pull request #249 from open-sausages/pulls/fix-xhr-canaccess
BUG Prevent SubsiteXHRController failing if there are no subsites available
2016-06-06 12:37:31 +01:00
Damian Mooyman
98636f8f58
BUG Prevent SubsiteXHRController failing if there are no subsites available
Fixes #200
2016-05-27 15:55:27 +12:00
Damian Mooyman
bdecbe9097 Update changelog for 1.2.3 2016-05-24 16:58:07 +12:00
Daniel Hensby
9e7142d229 Merge pull request #247 from tractorcow/pulls/1.2/fix-subsites-urlsegment
BUG Fix issue with urlsegment being renamed in subsites
2016-05-23 10:06:34 +01:00
Damian Mooyman
a98958fdf9
BUG Fix issue with urlsegment being renamed in subsites 2016-05-23 15:29:01 +12:00
Damian Mooyman
e556a57250 Update changelog for 1.2.2 2016-05-19 11:28:13 +12:00
Damian Mooyman
8572263cb6 Update translations 2016-05-18 16:58:44 +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
Daniel Hensby
c7dbf44f11 DOCS Fixing broken link 2016-04-06 12:09:06 +01:00
Damian Mooyman
01f976aa28 Merge pull request #234 from gorriecoe/CMSMenu-attributes-fix
Added attributes to menu link
2016-02-10 09:28:34 +13:00
Gorrie
07d449fa2d Removed target attribute to match main template 2016-02-09 16:09:21 +13:00
Gorrie
cf642aae2f Added attributes to menu link
Fix for missing attributes defined in CMSMenu::add_link($id, $title,
$link, $priority, $attributes);
2016-02-05 11:20:51 +13:00
Damian Mooyman
504342b45e Add changelog for 1.2.1 release 2016-02-04 17:34:48 +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
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
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
Damian Mooyman
b4024c94bb Add changelog for 1.2.0 2015-11-25 11:48:01 +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
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