Commit Graph

21285 Commits

Author SHA1 Message Date
Aaron Carlino
fc6213c293 Merge branch '4.3' into 4 2019-03-27 13:25:57 +13:00
Guy Marriott
0f00154563
Merge pull request #8840 from open-sausages/pulls/4.3/has-extension-injectable
ENHANCEMENT: has_extension() should allow injector overrides
2019-03-27 13:23:30 +13:00
Aaron Carlino
9eac374b13 Use strcasecmp 2019-03-27 12:40:56 +13:00
Jonathon Menz
fae19c16b5 FIX has_one File form scaffolding
Only allow selection of a single file when scaffolding has_one File relationship (fixes #8862)
2019-03-26 09:50:59 -07:00
Damian Mooyman
6dc41e50a0
MINOR Linting fixes 2019-03-26 17:35:58 +13:00
Andre Kiste
f3535972e4 DOC Add more clear instructions on handling upgrade conflicts (#8836)
* Add more clear instructions on handling upgrade conflicts

* More module upgrading info

* Make it make sense

* Tweak sentence
2019-03-26 16:20:53 +13:00
Damian Mooyman
83ec0b69fa
BUG Resolve issue where schema changes between enum / non-enum types 2019-03-26 14:16:05 +13:00
Robbie Averill
2972acd251
Merge pull request #8878 from DorsetDigital/patch-3
Update 02_RSSFeed.md

[ci skip]
2019-03-25 08:57:17 +13:00
DorsetDigital
abe76e9b29
Update 02_RSSFeed.md
Change file name to PageController to match code.
Change example code to use parameter in `Link()` method rather than using concatenation
2019-03-23 13:22:37 +00:00
Guy Marriott
5243ec2179
Merge pull request #8811 from Juanitou/patch-5
Correct typo and commit hash in 4.3.1 changelog
2019-03-23 10:03:18 +13:00
Loz Calver
8483a9644c
Merge pull request #8874 from johannesx75/fix-pdoconnector-generatedid-type-2
Fix PDOConnector GeneratedID return type
2019-03-22 09:09:23 +00:00
Guy Marriott
4f431d5db5
Correct typo and commit hash in 4.3.1 changelog
Co-Authored-By: Juanitou <Juanitou@users.noreply.github.com>
2019-03-22 09:51:38 +01:00
Daniel Hensby
6d4d332448
Merge pull request #8830 from ntd/pr7
Fix #8829: mention get_one does not escape field names
2019-03-21 14:38:34 +00:00
Johannes Hammersen
e1190e33d2 Fix PDOConnector GeneratedID return type 2019-03-21 09:26:14 +01:00
Aaron Carlino
f6a7bddd8d Linting 2019-03-20 15:50:54 +13:00
Aaron Carlino
388baa01b4 Fix linting 2019-03-20 13:19:10 +13:00
Aaron Carlino
aa491d9294 Fix tests 2019-03-20 12:33:00 +13:00
Aaron Carlino
39a29fa2f6 ENHANCEMENT: has_extension() should allow injector overrides 2019-03-20 12:33:00 +13:00
Damian Mooyman
6b450395ce API Allow empty arraylists to be typed (#8866)
* API Allow empty arraylists to be typed

* PHPCBF fixes
2019-03-20 11:46:35 +13:00
Aaron Carlino
0b524464cd Update translations 2019-03-19 16:22:35 +13:00
Aaron Carlino
3421f931a7 Added 4.3.3 changelog 2019-03-19 16:22:35 +13:00
Robbie Averill
0777ab5ee7
Merge pull request #8847 from blueo/pulls/optional-test-teardown
Add option to leave Temp DB when exiting
2019-03-19 15:58:31 +13:00
Robbie Averill
94e5d0a642
Merge pull request #8849 from kinglozzer/middleware-requesthandler-order
FIX: RequestHandler::__construct() should run after middlewares (fixes #8848)
2019-03-19 14:43:22 +13:00
Bernard Hamlin
8d1a238e97 Add option to leave Temp DB when exiting 2019-03-19 14:37:13 +13:00
Aaron Carlino
075716f80d Update translations 2019-03-19 14:34:33 +13:00
Robbie Averill
2f9aeddb8f
Merge pull request #8863 from jchenevey/patch-3
Update 00_CSV_Import.md

[ci skip]
2019-03-19 11:53:05 +13:00
Aaron Carlino
07b32fd7eb Added 4.3.3 changelog 2019-03-19 11:48:59 +13:00
Joe Chenevey
af34fab461
Update 00_CSV_Import.md
Fix reference in `$model_importers` to use `Player::class` for namespaced model reference.
2019-03-18 10:55:41 -04:00
Loz Calver
ca781c684d FIX: RequestHandler::__construct() should run after middlewares (fixes #8848) 2019-03-11 11:08:03 +00:00
Ingo Schommer
19e5e9197f
Merge pull request #8647 from dnsl48/4
Documentation / update Server Requirements
2019-03-11 21:34:54 +13:00
Ingo Schommer
b803a174ed
Merge branch '4' into 4 2019-03-11 21:31:22 +13:00
Ingo Schommer
b388114dd3
Merge pull request #8826 from open-sausages/pulls/4/docs-cve-security-process
DOCS Clarify security process, introduce CVE and CVSS
2019-03-11 21:28:18 +13:00
Nicola Fontana
252397d8d1 Fix #8829: mention get_one does not escape field names 2019-03-08 08:20:47 +01:00
Robbie Averill
cb8ec9ae1d
DOCS Mark 4.4.0 as unreleased to avoid confusion on docs.silverstripe.org
[ci skip]
2019-03-07 09:20:45 +13:00
Dan Hensby
765d1568ab
Merge branch '4.3' into 4 2019-03-06 11:04:50 +00:00
Dan Hensby
a8605b04e0
Merge branch '4.2' into 4.3 2019-03-06 11:04:14 +00:00
Dan Hensby
7e34167ddf
Merge branch '4.1' into 4.2 2019-03-06 11:01:17 +00:00
Dan Hensby
625e6d5f54
Merge branch '4.0' into 4.1 2019-03-06 11:00:41 +00:00
Loz Calver
80f83b9043
Merge pull request #8843 from dhensby/pulls/4.0/doinit-comparison
FIX doInit comparison should be lowercased
2019-03-06 09:53:51 +00:00
Aaron Carlino
406b286325 Merge branch '4.3' into 4 2019-03-06 11:13:13 +13:00
Maxime Rainville
c40e6d38a0 Add reference to #8815 in change log 2019-03-06 11:13:02 +13:00
Aaron Carlino
92050578ce Added 4.3.2 changelog 2019-03-06 11:13:01 +13:00
Guy Marriott
f8f6983773
Merge pull request #8793 from wilr/pulls/orm-exception
Throw error message when searchable_field does not return a object
2019-03-06 08:50:50 +13:00
Daniel Hensby
7416ce275b
FIX doInit comparison should be lowercased 2019-03-05 19:01:12 +00:00
Maxime Rainville
66e60a334b
Merge pull request #8807 from open-sausages/pulls/4/class-to-trait
Add class to trait visitor.
2019-03-04 14:10:48 +13:00
bergice
e9ab2ed381 Add class to trait visitor.
This lets us replace classes that extend certain other classes with a provided list of traits.
2019-03-04 13:52:28 +13:00
Robbie Averill
8af1ca53a7
Merge pull request #8818 from oddnoc/8579-nginx-assets
Update nginx example to support assets better
2019-03-01 10:47:21 +11:00
Daniel Hensby
3629875e12
Merge pull request #8831 from tractorcow/pulls/4.2/fix-write-base-record
BUG Fix writeBaseRecord with unique indexes
2019-02-28 13:54:08 +00:00
Ingo Schommer
71c32fea20 DOCS Clarify legacy_filenames=true tradeoffs 2019-02-28 08:56:53 +13:00
Ingo Schommer
1f08ed3765 DOCS Note about replaced files on keep_archived_files flag 2019-02-28 08:27:29 +13:00