Commit Graph

19804 Commits

Author SHA1 Message Date
Robbie Averill
a9cc4d4844 FIX Ensure consistent return type for FieldList::removeByName 2018-03-14 19:40:17 +13:00
Daniel Hensby
856e89998b
Merge branch '4.0' into 4.1 2018-02-26 10:56:45 +00:00
Chris Joe
deebc78caf
Merge pull request #7890 from open-sausages/pulls/4.0/fix-tests-bootstrapping
BUG Fix incorrect assets created when ASSETS_PATH !== BASE_PATH . '/assets'
2018-02-26 16:16:03 +13:00
Chris Joe
225bda13f4
Merge pull request #7886 from open-sausages/pulls/4.1/dont-log-me-out-bro
Improve Environment::getVariables() array copy
2018-02-26 15:17:11 +13:00
Damian Mooyman
b27102f810
BUG Fix incorrect assets created when ASSETS_PATH !== BASE_PATH . '/assets' 2018-02-26 13:12:08 +13:00
Christopher Joe
f650c92436 Added comment about array_merge() not working 2018-02-26 12:24:02 +13:00
Aaron Carlino
d91648dd6e Update getVariables to return a copy of globals rather than including the reference in an array merge 2018-02-23 16:25:41 +13:00
Daniel Hensby
c04ff8c55a
Merge branch '4.0' into 4.1 2018-02-21 13:40:30 +00:00
Robbie Averill
7fe8da3222
Merge pull request #7881 from oddnoc/shortcode-docs
DOCS: remove backticks from Markdown link
2018-02-21 15:30:56 +13:00
Fred Condo
2f2390be59 DOCS: remove backticks from Markdown link
Markdown does not render links within backticks.
2018-02-20 16:54:18 -08:00
Daniel Hensby
2074f8fc69
Merge pull request #7878 from open-sausages/pulls/4.0/fix-unstaged-versioned
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 11:44:05 +00:00
Damian Mooyman
0e26c06644
BUG Fix behaviour towards versioned but unstagable records 2018-02-20 12:20:18 +13:00
Damian Mooyman
b0c742b0a9 Added 4.1.0-rc2 changelog 2018-02-15 11:29:30 +13:00
Damian Mooyman
e809c0fd62
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-02-15 09:27:51 +13:00
Chris Joe
ffddc6945a
Merge pull request #7868 from open-sausages/pulls/4.1/upgrade-test-usage
Update reference to TestAssetStore
2018-02-14 20:46:21 +13:00
Damian Mooyman
4e5a664183
Merge pull request #7865 from open-sausages/pulls/4.0/i-configured-this-out
Fix docs for configuring before/after a specific config file
2018-02-14 16:35:00 +13:00
Damian Mooyman
34233c0470
Update reference to TestAssetStore 2018-02-14 16:24:12 +13:00
Daniel Hensby
e357d1e903
Merge branch '3.6' into 4.0 2018-02-13 16:32:32 +00:00
Daniel Hensby
9c50b03b86
Merge branch '3.5' into 3.6 2018-02-13 14:30:29 +00:00
Daniel Hensby
690eec52c6
Merge pull request #7864 from open-sausages/pulls/4.1/fix-slashes
BUG Fix incorrect convert slashes argument
2018-02-13 10:52:22 +00:00
Daniel Hensby
1bec8a5d0c
Merge pull request #7850 from jonom/singleton-fix-3x
FIX Singleton creation
2018-02-13 08:29:47 +00:00
Jonathon Menz
c767e472dc FIX DataObject singleton creation
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878)
2018-02-12 20:30:35 -08:00
Damian Mooyman
0b7cf80331
BUG Fix incorrect convert slashes argument 2018-02-13 16:33:35 +13:00
Christopher Joe
f2b82b1f77 Fix docs for configuring before/after a specific config file 2018-02-13 16:31:51 +13:00
Chris Joe
d13ab11940
Merge pull request #7861 from zanderwar/pulls/enhancements/composerjson-check
ENHANCEMENT composer.json missing notice
2018-02-13 13:48:12 +13:00
zanderwar
9ce21338a3 ENHANCEMENT composer.json missing notice 2018-02-13 09:03:01 +10:00
Damian Mooyman
6b38031a1e BUG Fix Director::test() not persisting removed session keys on teardown 2018-02-13 11:35:16 +13:00
Reece Alexander
833b600018 Update 4.1.0-rc1.md (#7859) 2018-02-13 10:07:23 +13:00
Robbie Averill
1a91806bcc
Merge pull request #7857 from dhensby/pulls/3.5/add-license
Create licence file so that GitHub (and humans) can more easily find it
2018-02-13 09:32:24 +13:00
Daniel Hensby
24ea2638fe
Create licence file so that GitHub (and humans) can more easily find it 2018-02-12 11:21:03 +00:00
Daniel Hensby
2fb2caba06
Merge branch '4.0' into 4.1 2018-02-12 10:24:30 +00:00
Robbie Averill
175b41683e
Merge pull request #7853 from DrMartinGonzo/patch-1
Removed bad quote in i18n doc
2018-02-11 10:30:30 +13:00
Martin Portevin
90f77a7134
Removed bad quote 2018-02-10 03:05:59 +01:00
Daniel Hensby
7ec5fa2c8d
Merge branch '4.0' into 4.1 2018-02-09 15:19:15 +00:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0 2018-02-09 14:32:58 +00:00
Daniel Hensby
48a8a82326
Merge branch '3.5' into 3.6 2018-02-09 13:20:38 +00:00
Chris Joe
95308e1af6
Merge pull request #7849 from open-sausages/pulls/4.0/fix-debug-string-class-cli
BUG Fix issue with CLIDebugView failing on class name of existing class
2018-02-09 15:41:18 +13:00
Daniel Hensby
d3278d5470 FIX Add Nested DB transaction support (#7848)
* TEST Prove nested transactions break

* Add nested transaction support
2018-02-09 10:28:32 +13:00
Damian Mooyman
0a486b8f57
BUG Fix issue with CLIDebugView failing on class name of existing class
Fixes #7827
2018-02-09 09:52:32 +13:00
Daniel Hensby
2a8d365aac
Merge pull request #6973 from steadlane/fix/csv-unescaped-values
Fix for badly escaped values in CSV export
2018-02-08 13:45:52 +00:00
JorisDebonnet
5df1ec7eee
Use fputcsv in GridFieldExportButton 2018-02-08 12:26:29 +00:00
Daniel Hensby
09f88c76cf
Merge pull request #7812 from oddnoc/configure-nginx-ss4
DOCS: Update nginx configuration for SilverStripe 4
2018-02-08 11:45:32 +00:00
Loz Calver
adc9f02390
Merge pull request #7846 from dhensby/pulls/4.0/test-cms
Actually run CMS tests
2018-02-08 11:14:19 +00:00
Fred Condo
6976d09bba
Correct location block for SS4
SS4 uses /index.php so the location block and documentation need to also
use that.
2018-02-08 10:40:25 +00:00
Daniel Hensby
03c91f232d
Actually run CMS tests 2018-02-08 10:32:56 +00:00
Damian Mooyman
dd3fbf2c73 BUG Fix installer checking wrong location for files 2018-02-08 10:50:27 +13:00
Damian Mooyman
93cc660474
Update 4 alias to 4.2 2018-02-07 17:46:57 +13:00
Damian Mooyman
7d1e3e1c72 Added 4.1.0-rc1 changelog 2018-02-07 16:07:32 +13:00
Damian Mooyman
21ffb270a5 Update translations 2018-02-07 16:07:27 +13:00
Chris Joe
aa7aae3900
Merge pull request #7841 from open-sausages/pulls/4/fix-nonpublic-root
BUG Fix incorrect BASE_URL when webroot is parent of public folder
2018-02-07 15:26:09 +13:00