Commit Graph

18055 Commits

Author SHA1 Message Date
Damian Mooyman
60aa4bcfb9 Update translations 2017-02-08 10:29:07 +13:00
Damian Mooyman
971fd5fcbb Merge branch '3.5' into 3 2017-02-08 10:15:09 +13:00
Damian Mooyman
89a927d152 Merge 3.4 into 3.5 2017-02-08 10:01:14 +13:00
Damian Mooyman
5b200d92f6 Merge pull request #6605 from dhensby/pulls/3.4/revert-treenode-fix
Partial revert of LeftAndMain_TreeNode::forTemplate()
2017-02-08 09:03:55 +13:00
Daniel Hensby
0fe4ec4537
Partial revert of c6c6c13fc2 2017-02-07 15:33:20 +00:00
Robbie Averill
4daa1b4a89 DOCS Add note about using dotenv on SilverStripe Platform (#6602)
Include link to shiv example for importing `_ss_environment.php` constants into dotenv compatible environment variables.
2017-02-07 17:14:34 +13:00
Daniel Hensby
040ebdb66e DOCS Update routing docs to include FQCN in config 2017-02-03 17:06:02 +00:00
Aaron Carlino
0982f77ec7 Feature/aggregate data filters (#6553) 2017-02-03 09:03:19 +13:00
Daniel Hensby
c753d820fe Merge pull request #6592 from adover/patch-2
Update 01_Syntax.md
2017-02-02 12:59:53 +00:00
Damian Mooyman
8d5ff9b2fe Merge pull request #6583 from robbieaverill/bugfix/remove-theme-dir
API Remove ViewableData::ThemeDir, update changelog to reflect suggested replacement
2017-02-02 12:57:20 +13:00
Andrew Dover
0574cce1c6 Update 01_Syntax.md
Fixed spelling mistake
2017-02-02 12:26:30 +13:00
Loz Calver
6014c31a42 Merge pull request #6591 from sminnee/doc-populatetemplate
DOC Added note about Email::populateTemplate() replacement
2017-02-01 09:25:27 +00:00
Sam Minnee
59f8e42f1e DOC Added note about Email::populateTemplate() replacement 2017-02-01 21:21:03 +13:00
Ingo Schommer
78a892fbe1 Merge pull request #6590 from open-sausages/pulls/4.0/remove-symfony3-dep
Remove optional Symfony 3.x dependencies
2017-02-01 20:43:28 +13:00
Ingo Schommer
b95c1dec45 Remove optional Symfony 3.x dependencies
They cause issues with installing silverstripe/behat-extension after the fact,
since it requires 2.x - and would need the existing project to downgrade the dep.
While this should be composer's default behaviour (https://github.com/composer/composer/issues/6121), from a SilverStripe perspective we should have consistent dependencies regardless of the execution path in your require calls - anything else will lead to fragile test vs. prod errors.

We can require Symfony 3.x once we've upgraded to Behat 3.x.
2017-02-01 18:09:25 +13:00
Daniel Hensby
8c6547f878 Merge pull request #6587 from zanderwar/patch-1
Removed references to an archived module
2017-02-01 01:21:36 +00:00
Daniel Hensby
6a107ff9ba
Merge branch '3' 2017-02-01 01:20:12 +00:00
Daniel Hensby
305bcac971
Merge branch '3.5' into 3 2017-02-01 01:02:09 +00:00
Daniel Hensby
9bd85ac773
Merge branch '3.4' into 3.5 2017-02-01 00:55:35 +00:00
Daniel Hensby
d54f2b35c5
Merge tag '3.5.2' into 3.5
Release 3.5.2
2017-02-01 00:55:31 +00:00
Daniel Hensby
8b1af9f0c0
Merge tag '3.4.4' into 3.4
Release 3.4.4
2017-02-01 00:54:02 +00:00
Reece Alexander
384311f2c1 Removed references to an archived module
Removed references to the BBCodeParser module as it has been removed from SS4

> Removed TextParser and BBCodeParser. These are available in an archived module, silverstripe-archive/bbcodeparser
> We recommend that you update your code to make use of another BBCode parsing library.
2017-02-01 10:29:38 +10:00
Damian Mooyman
b4536bf36e Merge pull request #6337 from dhensby/pulls/4/dotenv
NEW replace _ss_environment.php with .env and environment vars
2017-02-01 13:09:10 +13:00
Daniel Hensby
8c8231c03e
NEW Director::host() to determine host name of site 2017-01-31 21:36:04 +00:00
Daniel Hensby
6e096f6172
DOCS Updated environment management docs to use .env file 2017-01-31 21:28:51 +00:00
Daniel Hensby
873fd8c5bc
NEW replace _ss_environment.php with .env and environment vars 2017-01-31 20:40:17 +00:00
Daniel Hensby
a5da085cc7
Merge branch '3' 2017-01-31 17:03:53 +00:00
Daniel Hensby
669f6a3d41
Merge branch '3.5' into 3 2017-01-31 13:33:26 +00:00
Daniel Hensby
56b887f578
Merge branch '3.4' into 3.5 2017-01-31 13:33:00 +00:00
Daniel Hensby
73a83954ea
Merge branch '3.4.4' into 3.4 2017-01-31 13:32:31 +00:00
Dan Hensby
00cdc33845 Added 3.5.2 changelog 2017-01-31 12:07:13 +00:00
Dan Hensby
2e61655715 Update translations 2017-01-31 12:07:13 +00:00
Dan Hensby
02a87d4ed1 Added 3.4.4 changelog 2017-01-31 11:39:09 +00:00
Dan Hensby
56653cb5e2 Update translations 2017-01-31 11:39:08 +00:00
Daniel Hensby
efb5c5bfe9 Merge pull request #6567 from open-sausages/pulls/4.0/flush-tests
BUG Ensure that tests run with flush=1 clean Flushables
2017-01-31 11:36:07 +00:00
Damian Mooyman
7b26b4a1f3 BUG Ensure that tests run with flush=1 clean Flushables
BUG Restore opt-in flushing (regression from #4404)
2017-01-31 18:59:19 +13:00
Damian Mooyman
609b0a612c Merge pull request #6512 from silverstripe/pulls/3.4/ensure-string-return
Test fixes - reorder assertions and ensure string returned
2017-01-31 17:25:34 +13:00
Robbie Averill
da3db5ff3a DOCS Update Requirements to use the ThemeResourceLoader to find themed javascript and CSS 2017-01-31 17:00:13 +13:00
Damian Mooyman
780f3eea39 Merge pull request #6577 from robbieaverill/patch-5
DOCS Update themes document for SS4
2017-01-31 16:49:51 +13:00
Damian Mooyman
08faa7d786 Merge pull request #6575 from robbieaverill/bugfix/zend-autoloader
FIX Ensure that Zend_ classes can still be autoloaded
2017-01-31 16:45:22 +13:00
Ingo Schommer
f10a259708 Merge pull request #6527 from open-sausages/pulls/4.0/form-field-name
API Scaffolded redux form fields have the parent form name
2017-01-31 13:49:05 +13:00
Robbie Averill
9d35ff8f95 API Remove ViewableData::ThemeDir, update changelog to reflect suggested replacement 2017-01-31 10:56:52 +13:00
Damian Mooyman
6d88ed1627 Merge pull request #6573 from dhensby/pulls/4/travis-npm-dist-build
CI Check dist files are correctly built
2017-01-31 10:12:40 +13:00
Daniel Hensby
13c32fed66
CI Check dist files are correctly built 2017-01-30 20:26:27 +00:00
Robbie Averill
fa5370e4dd Update themes document for SS4
* Remove module specific subthemes documentation as it's removed
* Added notes about cascading theme configuration
* Update links to Themes listing to point to addons
* Remove references to tarballs, and put composer publishing instructions in place instead
2017-01-30 15:35:33 +13:00
Daniel Hensby
c3cd8f4344 Merge pull request #6526 from open-sausages/pulls/3/remove-webpi
Remove WebPI references
2017-01-29 23:24:16 +00:00
Robbie Averill
232b218dfb FIX Ensure that Zend_ classes can still be autoloaded 2017-01-30 11:12:24 +13:00
Daniel Hensby
77bfea1197 Merge pull request #6564 from Quadra-Digital/dbfield-setter-improvements
ENHANCEMENT: DBField 'setter' methods return instance of themselves
2017-01-28 09:23:39 +00:00
Loz Calver
d3c24769ac Merge pull request #6469 from dhensby/pulls/4/image-backend-interface
FIX Make sure image backends implement method getImageResource
2017-01-27 16:59:46 +00:00
Daniel Hensby
28907f64c1 Merge pull request #6543 from zacps/loading-indicator
Fix loading indicator position (fixes #6153)
2017-01-27 11:43:39 +00:00