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
|
ec6784246f
|
Merge branch '3' into 4
|
2018-02-12 14:44:50 +00: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
|
16d3498a56
|
Merge branch '4.1' into 4
|
2018-02-12 10:26:07 +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
|
4ca385e033
|
Partial revert of #7665 - overzealous string renames
|
2018-02-09 19:27:45 +00:00 |
|
Daniel Hensby
|
85e97d204b
|
Partial revert of #7665 - bad docblock changes
|
2018-02-09 19:27:11 +00:00 |
|
Daniel Hensby
|
5d00d28b2f
|
Partial revert #7665 - undo changes to thirdparty dir
|
2018-02-09 18:43:02 +00: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
|
747a98a07f
|
Merge branch '3.6' into 3
|
2018-02-09 13:21:15 +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 |
|
Robbie Averill
|
dd82820242
|
NEW Allow GridFieldConfig::addComponents to accept an array (#7844)
|
2018-02-08 11:06:27 +13:00 |
|
Damian Mooyman
|
dd3fbf2c73
|
BUG Fix installer checking wrong location for files
|
2018-02-08 10:50:27 +13:00 |
|
Chris Joe
|
e0e8ca0ee6
|
Merge pull request #7842 from open-sausages/pulls/4/fix-installer-public-search
BUG Fix installer checking wrong location for files
|
2018-02-08 10:26:54 +13:00 |
|
Andrew Aitken-Fincham
|
860fa2a05a
|
API Add excludeAny() and tests for complicated excludes/filters (#7838)
|
2018-02-08 09:20:17 +13:00 |
|
Robbie Averill
|
ef6b03a35a
|
Merge pull request #7843 from open-sausages/pulls/4/docs-blog-release
DOCS Blog on release process
|
2018-02-07 18:29:32 +13:00 |
|
Damian Mooyman
|
9bfa195e72
|
Update travis.yml
|
2018-02-07 17:48:31 +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 |
|
Ingo Schommer
|
b5987b68c6
|
DOCS Blog on release process
|
2018-02-07 16:02:27 +13:00 |
|
Damian Mooyman
|
19832000a5
|
BUG Fix installer checking wrong location for files
|
2018-02-07 15:27:23 +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 |
|
Damian Mooyman
|
e5ff48b352
|
BUG Fix incorrect BASE_URL when webroot is parent of public folder
|
2018-02-07 14:28:06 +13:00 |
|
Damian Mooyman
|
2f1f5c0caa
|
Merge remote-tracking branch 'origin/4.0' into 4
|
2018-02-07 11:48:46 +13:00 |
|
Chris Joe
|
aac7bbd3b0
|
Merge pull request #7840 from open-sausages/pulls/4/fix-session-test-unset
BUG Fix Director::test() not persisting removed session keys on teardown
|
2018-02-07 11:44:55 +13:00 |
|
Damian Mooyman
|
2225cf4c95
|
BUG Fix Director::test() not persisting removed session keys on teardown
|
2018-02-07 11:03:32 +13:00 |
|
Damian Mooyman
|
0c65a878b9
|
Merge pull request #7836 from dhensby/pulls/4.0/default-admin-encryptor
FIX Issue where default admin has no password encryption
|
2018-02-07 10:14:35 +13:00 |
|
Daniel Hensby
|
660dfd34a8
|
FIX Issue where default admin has no password encryption
|
2018-02-06 20:18:32 +00:00 |
|
Daniel Hensby
|
62057befdb
|
Merge branch '4.0' into 4
|
2018-02-06 10:08:17 +00:00 |
|
Loz Calver
|
97ce336409
|
Merge pull request #7834 from dhensby/pulls/4.0/fix-nightly
FIX Regex range identifier correctly escaped
|
2018-02-05 17:07:56 +00:00 |
|
Daniel Hensby
|
28ca11dd7e
|
FIX Regex range identifier correctly escaped
|
2018-02-05 15:17:20 +00:00 |
|
Damian Mooyman
|
e359948eb3
|
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
# src/Core/CoreKernel.php
|
2018-02-05 17:52:38 +13:00 |
|
Chris Joe
|
21da1bc317
|
Merge pull request #7832 from open-sausages/pulls/4/fix-getter-regression
BUG Fix regression in has_one getters breaking DataDifferencer
|
2018-02-05 17:45:49 +13:00 |
|
Damian Mooyman
|
e967ab09a2
|
Added 4.0.3 changelog
|
2018-02-05 17:10:00 +13:00 |
|
Damian Mooyman
|
e111da2769
|
Update translations
|
2018-02-05 16:58:21 +13:00 |
|
Damian Mooyman
|
f4b13fb2c4
|
Merge remote-tracking branch 'origin/3.6' into 3
# Conflicts:
# model/DataQuery.php
|
2018-02-05 16:53:15 +13:00 |
|