Commit Graph

20009 Commits

Author SHA1 Message Date
Stephan
710bc683fd
Removed SS_CONFIGSTATICMANIFEST 2018-09-10 16:10:35 +02:00
Robbie Averill
b6ff21f72a Merge branch '4.0' into 4.1 2018-09-06 13:26:13 +02:00
Loz Calver
536a1c08b3
Merge pull request #8358 from creative-commoners/pulls/4.0/check-scheme
FIX Check scheme is truthy before setting it to the request
2018-09-03 09:31:03 +01:00
Robbie Averill
b922c0d732 FIX Check scheme is truthy before setting it to the request 2018-09-03 08:59:37 +02:00
Maxime Rainville
dd3379e68f
Merge pull request #8075 from creative-commoners/pulls/4.0/remap-polymorphics
FIX Polymorphic relationship class columns have obsolete class names remapped
2018-08-28 17:03:39 +12:00
Robbie Averill
d651d0fbfc FIX Use base class (not remapping target class) when looking up whether object is versioned 2018-08-28 14:15:02 +12:00
Scott Hutchinson
4da5569232 FIX ensure createFromVariables takes correct params on CLIRequestBuilder 2018-08-27 16:12:52 +12:00
Robbie Averill
66c09afc9c Merge branch '4.0' into 4.1 2018-08-27 16:12:04 +12:00
Robbie Averill
3178fbf3bb
Merge pull request #8028 from andrewandante/pulls/4.0/unset_http_scheme_on_cli
unset http scheme on CLIRequestBuilder
2018-08-27 16:11:42 +12:00
Robbie Averill
c459130986
Merge pull request #8323 from lekoala/patch-11
email rendering should not include requirements
2018-08-23 15:10:41 +12:00
Thomas Portelange
27ac001d5b FIX email rendering should not include requirements
If no body is defined, the email is rendered according to a template. Clearing requirements prevent unnecessary styles/scripts to be included in the html (and that needs to be processed/stripped down the line).
2018-08-23 14:01:27 +12:00
Robbie Averill
1ad2d6535e Merge branch '4.0' into 4.1 2018-08-15 13:22:46 +12:00
Robbie Averill
953153500d FIX Polymorphic relationship class columns have obsolete class names remapped 2018-08-15 10:40:51 +12:00
Robbie Averill
88d3794828
Merge pull request #8321 from scott1702/patch-4
Fix indentation on pagination guide
2018-08-14 15:39:07 +12:00
Scott Hutchinson
3bd2cbf199 DOCS indentation on pagination guide [ci skip]
For all those copy + paste fiends
2018-08-14 15:36:52 +12:00
Loz Calver
106ca6643a
Merge pull request #8263 from dhensby/pulls/4.1/mask-backtrace
FIX updateValidatePassword calls need to be masked from backtraces
2018-07-16 10:30:22 +01:00
Robbie Averill
d122995652 FIX Duplicate config values for cascade_duplicates no longer duplicate their duplicates
Previously you could define identical values for this config prop via a DataExtension and on the base
class, resulting in double duplication
2018-07-16 12:04:56 +12:00
Daniel Hensby
8703839eb1
FIX updateValidatePassword calls need to be masked from backtraces 2018-07-15 01:06:45 +01:00
Daniel Hensby
ec9281ee02
Merge branch '4.0' into 4.1 2018-07-13 16:42:00 +01:00
Loz Calver
f0e545ada8
Merge pull request #7971 from dhensby/pulls/4.0/fix-extension-config
FIX Config from extension should not override
2018-07-13 16:15:18 +01:00
Daniel Hensby
d80ef3d9e6
DOCS Update docs to reflect true config merge priorities 2018-07-13 15:43:56 +01:00
Daniel Hensby
4acec33562
FIX Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important 2018-07-12 00:55:39 +01:00
Robbie Averill
725212a707 FIX Allow dispatcher in Embed to be configured with injector (#8192) 2018-06-20 11:37:35 +12:00
Robbie Averill
87159ea820
Merge pull request #7949 from martinduparc/patch-7
Use LimitWordCount instead of LimitWordCountXML
2018-06-19 21:36:36 +12:00
Damian Mooyman
9f764f4ec3 Added 4.1.2 changelog 2018-06-19 17:06:01 +12:00
Damian Mooyman
2bbb3bd798 Update translations 2018-06-19 16:50:07 +12:00
Maxime Rainville
3f80e2dc67 FIX Don't reload form session data using FormField::setSubmittedValue… (#8184) 2018-06-19 11:27:09 +12:00
Damian Mooyman
8181dc4fd2 ENHANCEMENT Ensure extensions are told the internal item request class for gridfield detail form (#8164)
Fixes https://github.com/silverstripe/silverstripe-framework/issues/8136
2018-06-15 17:58:53 +12:00
Robbie Averill
e48ad4c9e2
Merge pull request #8170 from open-sausages/pulls/4.1/fix-arabic-date-handling
BUG Fix internal date formatting inheriting default locale
2018-06-15 11:47:53 +12:00
Damian Mooyman
b636587945
Respect semver and add tests 2018-06-15 11:04:12 +12:00
Damian Mooyman
c414388220
FIX DatetimeFieldTest 2018-06-14 18:14:12 +12:00
Damian Mooyman
310a259c5f
Add locale to Format
Fix up some regressions
2018-06-14 17:28:16 +12:00
Damian Mooyman
02ae2e7ed0
BUG Fix internal date formatting inheriting default locale
Fixes #8097
2018-06-13 13:32:11 +12:00
Damian Mooyman
c2123f772f
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-06-13 11:24:12 +12:00
Damian Mooyman
f06b36bb22
Merge pull request #8163 from oddnoc/nginx-config-docs-4.1
Update nginx sample configuration for 4.1
2018-06-13 10:51:02 +12:00
Robbie Averill
18fba211b0
Merge pull request #8165 from open-sausages/pulls/4.0/fix-duplicate-upgrade-keys
BUG Remove duplicate key
2018-06-13 09:29:28 +12:00
Damian Mooyman
7b04949caa
BUG Remove duplicate key 2018-06-12 15:00:22 +12:00
Robbie Averill
f256045020
Merge pull request #8158 from open-sausages/pulls/4.0/fix-cli-canonical-middleware
BUG Prevent canonical URL causing a redirect on CLI unless explicitly enabled
2018-06-12 10:53:37 +12:00
Fred Condo
6d12deb4b9 Update nginx sample configuration for 4.1
- Remove unneeded denials (due to public folder)
- Add caveats about public folder, error pages, and HTTPS
2018-06-11 09:32:40 -04:00
Daniel Hensby
ce58890baf
Merge branch '4.0' into 4.1 2018-06-11 09:27:42 +01:00
Robbie Averill
27e24a4728
Merge pull request #8142 from open-sausages/pulls/4.0/fix-injector-empty
BUG Safely handle empty injector factory responses
2018-06-11 15:20:24 +12:00
Damian Mooyman
2a51f34c3e
BUG Prevent canonical URL causing a redirect on CLI unless explicitly enabled
Replaces #8157
2018-06-11 13:54:27 +12:00
Nicolaas
8f03c7df05 PATCH: removing duplicate key (SS_TRUSTED_PROXY_HOST_HEADER) 2018-06-11 13:35:27 +12:00
Damian Mooyman
546c6c3e22
Merge pull request #8125 from open-sausages/pulls/4/date-field-tweaks
Remove legacy logic from DateField_Disabled
2018-06-11 09:23:33 +12:00
Daniel Hensby
e260319823
Merge branch '4.0' into 4.1 2018-06-08 23:05:24 +01:00
Daniel Hensby
cfe93b7f23
Merge branch '3.6' into 4.0 2018-06-08 14:41:04 +01:00
Daniel Hensby
1d6d601050
Use chaining syntax for setting up middleware 2018-06-08 14:00:59 +01:00
Maxime Rainville
582c69d32f
BUG Fix issue with Disabled DateField always display (not set). 2018-06-08 13:51:22 +01:00
Daniel Hensby
e1450b5e82
Merge pull request #8147 from kinglozzer/mysql-pdo-attr
FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103)
2018-06-08 13:06:03 +01:00
Ingo Schommer
48304fd6f0
Merge pull request #8102 from creative-commoners/pulls/4.1/response-assertion
Add test assertion for response instance
2018-06-08 14:08:25 +12:00