1193 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robbie Averill	1ac6e78bb3	FIX Remove session coupling, leave it to middleware. Use state instead.	2017-09-04 11:45:21 +12:00
Robbie Averill	793b46ede3	FIX Update i18n::validate_locale for SS4	2017-09-01 12:33:16 +12:00
Robbie Averill	314f218306	Merge branch '1'	2017-09-01 12:30:43 +12:00
Robbie Averill	ffe0d61c4f	Merge branch '1.3' into 1	2017-09-01 12:29:48 +12:00
Robbie Averill	c3471ece1c	Merge pull request #288 from gregsmirnov/pulls/1.3/fix-subsite-page-language ... Fix page rendering with proper subsite locale	2017-09-01 12:22:34 +12:00
Robbie Averill	b9582167c7	Mark SubsitesVirtualPage tests as incomplete, need to be fixed later	2017-08-31 14:17:47 +12:00
Robbie Averill	d934fbe08c	FIX Update behat tests and add configuration	2017-08-31 10:21:46 +12:00
Robbie Averill	1a9797c185	FIX Remove last use of static session methods, update some namespaces and assertion fixes	2017-08-31 09:44:09 +12:00
Damian Mooyman	46bcffaa86	Merge pull request #293 from creative-commoners/pulls/2.0/add-subsite-state ... NEW Add SubsiteState and initialisation middleware	2017-08-30 17:42:41 +12:00
Robbie Averill	b0087b9035	FIX Allow persisted subsite IDs to session from state, fix remaining unit tests	2017-08-30 15:29:13 +12:00
Robbie Averill	c155855100	FIX Update API changes in ErrorPage and typo in extension config class name	2017-08-30 12:14:11 +12:00
Robbie Averill	c620ff02f4	FIX LeftAndMain references to owner class, replace Member::currentUser usage	2017-08-30 12:04:43 +12:00
Robbie Averill	38031887a9	FIX Update alternateTreeTitle to updateTreeTitle	2017-08-30 11:54:42 +12:00
Robbie Averill	e129cafa94	NEW Add SubsiteState and initialisation middleware, replace Subsite::currentSubsiteID use	2017-08-30 11:47:11 +12:00
Damian Mooyman	5cf2d87e59	Merge pull request #291 from creative-commoners/pulls/2.0/update-travis-config ... Update Travis configuration for PHP 5.6-7.1, add composer dependencies and codecov.io config	2017-08-29 18:18:04 +12:00
Robbie Averill	ce360aa383	Comment out Behat Travis runs, needs some love	2017-08-29 17:49:01 +12:00
Robbie Averill	c081de1202	FIX Replace static assertions with instance calls	2017-08-29 17:43:29 +12:00
Robbie Averill	7ffaf61aeb	FIX Update tests API implementations, add missing fixture namespaces	2017-08-29 17:43:29 +12:00
Robbie Averill	8d8ee14cc2	FIX Run SS standard PHP linter, separate SiteTree test mock classes	2017-08-29 17:43:28 +12:00
Robbie Averill	9fdc1d6607	Update Travis configuration for PHP 5.6-7.1, add composer dependencies and codecov.io config	2017-08-29 17:43:14 +12:00
Damian Mooyman	60725e7b5c	Merge pull request #289 from wernerkrauss/fix-ss-4-master ... SilverStripe 4 Compatibility	2017-08-29 16:47:29 +12:00
Garion Herman	8be959f747	Migrate excluded report to YAML config.	2017-08-28 22:23:39 +12:00
Garion Herman	ddefef11d6	Fix Subsite picker UI, reformat CSS.	2017-08-28 22:10:40 +12:00
Garion Herman	af6f499cac	Add non-blank default to ThemeFieldEmptyString translation.	2017-08-28 22:05:01 +12:00
Garion Herman	9a289a2e17	Merge branch 'master' into fix-ss-4-master	2017-08-28 21:52:32 +12:00
Franco Springveldt	428a5f958e	Update translations	2017-08-25 16:44:47 +12:00
Gregory Smirnov	ab81117c5e	Fix page rendering with proper subsite locale	2017-08-10 20:14:59 +02: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
Robbie Averill	9b09eb94e0	Merge remote-tracking branch 'origin/1.3' into 1	2017-08-02 15:10:09 +12:00
Robbie Averill	4d38452435	Update branch alias for 1.4.x-dev	2017-08-02 14:55:15 +12:00
Robbie Averill	9b97f8af89	Use dist:precise for Travis builds to ensure PHP 5.3 works	2017-08-02 14:52:30 +12:00
Robbie Averill	a4f647c9ed	Merge remote-tracking branch 'origin/1.3' into 1	2017-08-02 14:49:52 +12:00
Robbie Averill	43d128d520	Merge remote-tracking branch 'origin/1.2' into 1.3	2017-08-02 14:48:26 +12:00
Robbie Averill	6eed988317	Merge remote-tracking branch 'origin/1.1' into 1.2	2017-08-02 14:47:53 +12:00
Garion Herman	5ec1c94410	Bring session / validation calls in line with SS4b1 API, replace icon.	2017-07-25 14:25:58 +12:00
Garion Herman	438836bfcc	Shift LeftAndMain_Menu template to force override.	2017-07-21 12:30:59 +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
Robbie Averill	8bc9728104	Merge pull request #287 from timkung/hotfix/default-subsite-query ... Adjusting query used in getSubsiteIDForDomain	2017-07-19 18:22:16 +12:00
Tim Kung	24ebd1c9f9	adjusting query used in getSubsiteIDForDomain to prevent new DB fields being added to the SQL call if they are not yet added to the DB	2017-07-19 17:57:23 +12:00
Daniel Hensby	83b0afe4d4	Merge pull request #282 from creative-commoners/pulls/1.3/travis-php7 ... Add PHP7 + SS3.6 build to Travis configuration	2017-06-15 17:00:11 +01:00
Robbie Averill	5be5f1c3b3	Add PHP7 + SS3.6 build to Travis configuration	2017-06-15 11:41:17 +12:00
Werner M. Krauß	2b7c3d1f85	Updating README	2017-06-08 08:35:06 +02: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
Garion Herman	c2484365cf	Fix misc. Subsite docblocks, remove DataObject::get_by_id call.	2017-06-04 14:34:38 +12:00
Garion Herman	49fbfcb459	Adapt to Permission::reset, DataObject::duplicate API changes.	2017-06-04 14:33:04 +12:00
Garion Herman	21a8c56217	Adapt SubsiteXHRController to LeftAndMain API changes.	2017-06-04 14:30:51 +12:00
Werner M. Krauß	a4a1ab6a78	formatting code	2017-06-01 15:57:53 +02:00
Werner M. Krauß	55c7240425	fixing code analysis: simplify if statements	2017-06-01 15:56:28 +02:00