tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
773 Commits 29 Branches 78 Tags 4 MiB
Commit Graph

773 Commits

Author SHA1 Message Date
Robbie Averill e129cafa94 NEW Add SubsiteState and initialisation middleware, replace Subsite::currentSubsiteID use 2017-08-30 11:47:11 +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
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
Werner M. Krauß 9673c881c1 fixing code analysis: simplify if-return statements 2017-06-01 15:48:01 +02:00
Werner M. Krauß fea1684f5c fixing code analysis: use static::assertContains 2017-06-01 15:44:32 +02:00
Werner M. Krauß 9d3c4506af fixing code analysis: fix parameter in method call 2017-06-01 15:43:30 +02:00
Werner M. Krauß 849c0061e8 fixing code analysis: phpunit: use assertInstanceOf 2017-06-01 15:32:46 +02:00
Werner M. Krauß 25754e1158 fixing code analysis: updating phpdoc 2017-06-01 15:32:45 +02:00
Werner M. Krauß 17010f39a3 fixing code analysis: removing unneeded else statements 2017-06-01 15:32:44 +02:00
Werner M. Krauß abe1ac9fe6 fixing code analysis: replacing deprecated methods 2017-06-01 15:32:38 +02:00
Werner M. Krauß 4fc13b19f7 fixing code analysis: removing unnecessary parenthesis 2017-06-01 15:32:36 +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
Werner M. Krauß e86cc55ba6 fixing a PHP7 only statement to be 5.6 compatible 2017-06-01 14:43:25 +02:00
Werner M. Krauß e03e7d9ce9 fixing a namespaced ORM call 2017-06-01 14:42:56 +02:00
Werner M. Krauß 212e4797b0 marking some tests as skipped that need more refactoring 2017-05-31 06:41:45 +02:00
Werner M. Krauß 6f1e1ab953 SubsiteVirtualPage: SubsiteID should not be a virtual field 2017-05-30 21:43:37 +02:00
Werner M. Krauß 709cbfa2c8 fix SubsiteAdminTest 2017-05-30 21:21:15 +02:00
Werner M. Krauß f348f5fa97 fix SiteConfigSubsites AugmentSQL: get the right table name to filter 2017-05-30 20:50:52 +02:00