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
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
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
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
Zac Pullar-Strecker
5e19d905f8
Fix loading indicator position ( fixes #6153 )
...
Fix through a different element target in js. This is untested
because node_modules is hopelessly broken on my machine.
2017-01-27 11:07:18 +00:00
Daniel Hensby
a282b3f420
Merge pull request #6528 from zacps/3310-permissions
...
Simplify permissions displayed when admin (fixes #3310 )
2017-01-27 10:26:12 +00:00
Damian Mooyman
9e24adbe5d
Merge pull request #6571 from colintucker/fix-form-field-casting
...
Cast SmallFieldHolder to HTMLFragment - fixes #6568
2017-01-27 16:56:07 +13:00
Colin Tucker
34398b0faa
Cast SmallFieldHolder to HTMLFragment - fixes #6568
2017-01-27 09:16:58 +11:00
Dan Hensby
578f12204d
Added 3.5.2-rc1 changelog
2017-01-26 21:47:37 +00:00
Dan Hensby
247ddd5d46
Update translations
2017-01-26 21:47:36 +00:00
Damian Mooyman
8ce8be99bd
Merge pull request #6570 from sunnysideup/patch-50
...
MINOR: stop Aggregate clear cache on DataObject::write()
2017-01-27 10:31:54 +13:00
Daniel Hensby
3a6d41042f
Merge branch '3.4' into 3.5
2017-01-26 21:25:14 +00:00
Dan Hensby
c5a8963d32
Added 3.4.4-rc1 changelog
2017-01-26 18:57:28 +00:00
Dan Hensby
393ad5b8a2
Update translations
2017-01-26 18:57:27 +00:00
Nicolaas
f027b5eaf5
MINOR: stop Aggregate clear cache on DataObject::write()
...
see: https://github.com/silverstripe/silverstripe-framework/issues/6383 for details
2017-01-27 07:51:42 +13:00
Daniel Hensby
9574d627f9
Merge pull request #39 from silverstripe-security/patch/3.4/SS-2017-001
...
[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::…
2017-01-26 18:10:36 +00:00
Daniel Hensby
c81959cce0
Merge pull request #6558 from open-sausages/pulls/4.0/i18n-symfony
...
API Replace i18n message localisation with symfony/translation
2017-01-26 13:11:59 +00:00
Daniel Hensby
c6c6c13fc2
[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::forTemplate
2017-01-26 12:56:31 +00:00
Daniel Hensby
c8525c026c
Merge branch '3.5' into 3
2017-01-25 13:46:49 +00:00
Daniel Hensby
7c79374704
Merge pull request #6566 from andrewandante/feat/backport_buildtask_segment_config
...
add segment config var to buildtask
2017-01-25 11:27:02 +00:00
Daniel Hensby
90072e27e3
Merge pull request #6559 from robbieaverill/feature/4.0-upgrade-guide
...
DOCS Add 4.0 upgrade guide, update "composer" and "modules" to include 4.x recommended practices
2017-01-25 11:13:15 +00:00
Daniel Hensby
b4fc46d63e
Merge pull request #6565 from open-sausages/pulls/4.0/safe-root
...
BUG Ensure root path of any local adapter is safely created and mapped from symlink
2017-01-25 11:12:37 +00:00
Andrew Aitken-Fincham
2e1eb4afad
add segment config var to buildtask
2017-01-25 09:22:20 +00:00
