tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-07-02 17:39:26 +02:00
Code Issues Projects Releases Wiki Activity
768 Commits 31 Branches 79 Tags 4.6 MiB
9fdc1d6607
Commit Graph

56 Commits

Author SHA1 Message Date
Garion Herman
9a289a2e17 Merge branch 'master' into fix-ss-4-master 2017-08-28 21:52:32 +12:00
Robbie Averill
a13bf10184 Merge remote-tracking branch 'origin/1' 2017-08-02 16:39:32 +12:00
Robbie Averill
03e52101bb Revert "SS4 namespaces compatibility" 
This reverts commit e8f5f58bb0.
 2017-08-02 15:51:37 +12:00
Garion Herman
32c45d0856 Merge branch 'fix-ss-4-alpha-7' into fix-ss-4-master 2017-07-21 12:27:57 +12:00
Werner M. Krauß
877f4f5f9d Add Subsite theme as main theme; allow cascading of themes 2017-06-07 12:18:35 +02:00
Garion Herman
1975861aec Fix Duplicate to Subsite functionality. 2017-06-04 15:05:59 +12:00
Werner M. Krauß
a4a1ab6a78 formatting code 2017-06-01 15:57:53 +02:00
Werner M. Krauß
9673c881c1 fixing code analysis: simplify if-return statements 2017-06-01 15:48:01 +02:00
Werner M. Krauß
25754e1158 fixing code analysis: updating phpdoc 2017-06-01 15:32:45 +02:00
Werner M. Krauß
e7ad086641 fixing code analysis: safely use single quotes 2017-06-01 15:32:30 +02:00
Werner M. Krauß
76852594a8 fixing code analysis: public method and case mismatch 2017-06-01 15:31:30 +02:00
Tim Kung
5d3af16aaf - namespacing all classes 
- moving all phpunit tests into tests/php
- moving all extensions from _config.php into config.yml and removing obsolete _config.php
- moving GridFieldSubsiteDetailForm_ItemRequest into own file

(cherry picked from commit ee02828)
 2017-05-30 15:13:40 +02:00
Werner M. Krauß
b8f98323ae merge #2 2017-05-30 11:14:51 +02:00
Werner M. Krauß
9862cf5ea6 merge ss4 fixes by cheddam 2017-05-29 13:42:42 +02:00
Werner M. Krauß
c5f507b3f9 reformat code and tests 2017-05-24 15:26:28 +02:00
Werner M. Krauß
ef602abe47 replace config::inst()->update() with config::modify->set() 2017-05-24 15:20:51 +02:00
Werner M. Krauß
e33a5b4cae upgrader: upgrade code 2017-05-24 13:36:04 +02:00
Werner M. Krauß
2c84e627db upgrader: namespacing classes 2017-05-24 12:32:05 +02:00
David Craig
ae6badf5c0
Fix copying child pages to subsite 2016-11-11 16:18:41 +13:00
Loz Calver
e8f5f58bb0 SS4 namespaces compatibility 2016-09-23 09:34:23 +01: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
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
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
Damian Mooyman
a98958fdf9
BUG Fix issue with urlsegment being renamed in subsites 2016-05-23 15:29:01 +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
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
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
Damian Mooyman
5e18e8dca3 Merge remote-tracking branch 'origin/1.1' 
Conflicts:
	.travis.yml
 2015-11-13 19:06:09 +13:00
Christopher Pitt
750cdbcff9 3.2 compat changes 2015-06-09 10:50:43 +12:00
Ingo Schommer
5604879146 4.x core compat 2015-04-30 22:39:22 +12:00
Damian Mooyman
5b9af35566 Use 3.2 compatible API 2015-02-24 09:34:34 +13:00
Damian Mooyman
a97b0d33eb BUG Fix incompatibility with framework 3.2 2014-08-26 11:42:50 +12:00
Juul Hobert
2e32eab6ae Bugfix for urls with %28 in the url 2014-08-22 13:21:18 +02:00
Shoaib Ali
1f2cb4380d Removed hard coding of HTTP protocol 2014-08-18 21:03:52 +12:00
Stig Lindqvist
bd5bd877fd Security: XSS can be injected in the group edit view 2014-08-01 10:48:44 +12:00
James Cocker
38e4bc196d Fixes #139 - Broken URL Segment CMS Links 
Fixes issue #139 using normann's solution that seems to work perfectly with both long and short links.
 2014-06-04 13:12:28 +01:00
Mateusz Uzdowski
82159e38d3 Make canEdit fall back to session if the object's SubsiteID not there. 
This problem manifests when a GridField-managed relationship tries to
create an object that references the container from canEdit - the
container in this case has empty fields.

An example of that is a HomePage with CarouselItem - if the
CarouselItem::canEdit tries to call $this->Page()->canEdit(), the "Page"
will be a dummy object, not the actual instance of the HomePage that's
doing the manipulation.

This is similar to the behaviour of SiteTree::canEdit, which solves
this situation by falling back to "return
$this->getSiteConfig()->canEdit($member);"
 2014-01-10 09:58:53 +13:00
Ingo Schommer
5ff3b691d7 More globalisation 2013-10-30 13:44:06 +01:00
spronkey
23e9cd40a0 Better fix for #106 using DataQuery queryParams. Thanks simon_w 2013-09-12 15:33:18 +12:00
Frank Mullenger
7bf6e89320 BUGFIX: Session var for active subsite out of sync with current subsite. Refs silverstripe/silverstripe-subsites#93. 2013-07-10 12:24:42 +02:00
Mateusz Uzdowski
0fb49ba502 Change the preview iframe to use injected SubsiteID GET/POST params. 
Use the CMS domain for fetching the preview content to avoid SSL
errors and single-origin violations on the iframe.
 2013-05-26 13:18:52 +12:00
Sean Harvey
306cb79b19 Fixing more statics that weren't private, and nested_urls deprecated usage 2013-05-06 22:32:40 +12:00
Sean Harvey
8ffeeb1ee6 Fixing declaration of statics to private for 3.1+ compatibility 2013-05-06 22:21:09 +12:00
Sean Harvey
ffaaed072f Removing bits of test that broke because of removal of related pages 2013-05-01 17:01:56 +12:00
Sean Harvey
0247765563 API Removed related pages functionality, this is now a separate module 
If you need this functionality still, please checkout
github.com/silverstripe-labs/silverstripe-subsites_relatedpages
 2013-05-01 12:35:17 +12:00
Ingo Schommer
82f1d980e8 Merge remote-tracking branch 'origin/0.3' 
Conflicts:
	code/SubsiteAdmin.php
	code/extensions/LeftAndMainSubsites.php
	code/extensions/SiteTreeSubsites.php
	code/model/Subsite.php
	composer.json
	javascript/SubsitesTreeDropdownField.js
	lang/en_US.php
	tests/SubsiteAdminTest.php
	tests/SubsiteTest.php
	tests/SubsiteTest.yml
	tests/SubsitesVirtualPageTest.php
 2013-01-03 21:03:26 +01:00
Kirk Mayo
e7c5dd5d93 BUG: Fixing creating subsites from templates trac/7318 2012-07-18 12:21:35 +12:00
Kirk Mayo
c345f6fcc5 BUG: Coding convention fixes 
BUG: more coding convention fixing
 2012-07-16 11:44:54 +12:00