Joe Harvey
bf2cee3989
Bugfix - Correct duplicate nesting of 'Content' to be returned to template
...
In scenarios where:
- No member is logged in
- An 'AutoLoginHash' is provided via the 't' (token) query param
- The token isn't valid (determined by Member::validateAutoLoginToken())
The message which is intended to be returned to the end-user via $Content
in the template, is mistakenly double nested in ['Content' => ['Content' => 'Message']]
this leads to "The method forTemplate() doesn't exist on ArrayData" errors.
See - https://github.com/silverstripe/silverstripe-framework/issues/7866
2018-03-07 14:14:05 +00:00
Daniel Hensby
fc457caa6e
Merge pull request #7912 from creative-commoners/pulls/4/versioning-api-references
...
DOCS Fix API references for classes in versioning docs
2018-03-07 13:40:45 +00:00
Chris Joe
f4caa5101f
Merge pull request #7914 from open-sausages/pulls/4.0/fix-deleted-files
...
BUG Files dataobjects with missing asset shouldn't un-attach themselves on save
2018-03-07 15:10:22 +13:00
Damian Mooyman
5fee4a81aa
BUG Files dataobjects with missing asset shouldn't un-attach themselves from parent object on save
2018-03-07 11:17:17 +13:00
Ingo Schommer
13c9372a1d
Clarify docs around security releases on supported modules
2018-03-07 11:07:17 +13:00
Chris Joe
6ae07d100c
Merge pull request #7603 from open-sausages/pulls/4.0/error-trace-included
...
ENHANCEMENT Don't infer trace if explicitly provided
2018-03-07 10:10:40 +13:00
Robbie Averill
048caf16cf
DOCS Fix API references for classes in versioning docs
2018-03-07 09:33:37 +13:00
Daniel Hensby
e0b94e6971
Merge pull request #7910 from open-sausages/pulls/4/api-tinymce-content-css
...
API Add getContentCSS() / setContentCSS() to allow per-config customisation of content_css
2018-03-05 16:12:54 +00:00
Daniel Hensby
7412010a6c
Merge pull request #7908 from open-sausages/pulls/4/doc-force-resample
...
DOCS Fix reference to force_resample
2018-03-05 15:55:55 +00:00
Damian Mooyman
3a1c813b28
API Add getContentCSS() / setContentCSS() to allow per-config customisation of content_css
...
Fixes #7873
2018-03-05 16:10:44 +13:00
Damian Mooyman
32637413de
ENHANCEMENT Improve upgrade rules to support advanced upgrader rewrites ( #7903 )
...
* ENHANCEMENT Improve upgrade rules to support advanced upgrader rewrites
* Minor: Grammar fixes.
2018-03-05 15:47:06 +13:00
Damian Mooyman
d86fbdea58
DOCS Fix reference to force_resample
...
Fixes https://github.com/silverstripe/silverstripe-assets/issues/21
2018-03-05 13:00:23 +13:00
Daniel Hensby
15410cb67a
Merge pull request #7894 from JorisDebonnet/get_by_id
...
get_by_id: alternate signature to allow MyDataObject::get_by_id($id)
2018-03-01 16:37:41 +00:00
Damian Mooyman
4d424dd340
ENHANCEMENT get_by_id: alternate signature to allow MyDataObject::get_by_id($id)
2018-03-01 14:02:40 +00:00
Daniel Hensby
cf35aadfe5
Merge pull request #7904 from 3Dgoo/patch-2
...
Fixing HTMLEditorField API documentation
2018-03-01 13:03:08 +00:00
Daniel Hensby
3cd8c2a985
Merge pull request #7905 from bummzack/pulls/fix-empty-delimiter
...
Fix regression in ContextSummary
2018-03-01 13:02:30 +00:00
Roman Schmid
40c2e299a0
Fix "mb_stripos(): Empty delimiter" warning when no search-keywords are given for DBText::ContextSummary.
...
Add unit-test to cover that case.
2018-03-01 11:39:30 +01:00
3Dgoo
6523d7a6eb
Fixing HTMLEditorField API documentation
...
The API documentation for HTMLEditorField is currently broken:
http://api.silverstripe.org/3/HtmlEditorField.html
This is because there is unescaped start textarea tag in the class description.
This fix changes the tag in the description to be escaped.
2018-03-01 16:31:46 +10:30
Damian Mooyman
68f5d8b37e
Merge pull request #7896 from JorisDebonnet/patch-1
...
Delete orphaned Group_Members records after deleting a Member
2018-03-01 12:37:16 +13:00
Daniel Hensby
9006daf20b
Cleaning up PR and adding tests
2018-02-28 13:31:56 +00:00
Joris Debonnet
559254407f
get_by_id: alternate signature to allow MyDataObject::get_by_id($id)
2018-02-28 13:09:12 +00:00
Loz Calver
535d02ffeb
Merge pull request #7874 from flamerohr/pulls/3.6/to-match-thy-father
...
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
2018-02-28 10:06:36 +00:00
Damian Mooyman
2943158351
Merge pull request #7898 from worikgh/patch-3
...
Remove deprecated @package and @subpackage
2018-02-28 13:11:27 +13:00
worikgh
1fe1d9a822
Remove deprecated @package and @subpackage
...
On Slack #General at 11:17 nightjarnz maintains that @package is deprecated.
2018-02-28 11:45:44 +13:00
JorisDebonnet
3e0984db49
Delete orphaned Group_Members records after deleting a Member
2018-02-27 19:47:26 +01:00
Daniel Hensby
32da1f5758
Merge pull request #7895 from andrewandante/patch-6
...
Update 02_Routing.md
2018-02-27 17:42:20 +00:00
Andrew Aitken-Fincham
70c28b0475
Update 02_Routing.md
...
To something that works
2018-02-27 16:42:20 +00:00
Daniel Hensby
68216896e6
Merge branch '3' into 4
2018-02-27 12:12:15 +00:00
Daniel Hensby
dc8c05519a
Merge pull request #7893 from open-sausages/pulls/3/the-summary-of-all-parts
2018-02-27 11:49:07 +00:00
Aaron Carlino
38a7e1c2d2
Remove short array syntax
2018-02-27 22:36:31 +13:00
Aaron Carlino
c755f77288
Fix indentation
2018-02-27 22:34:16 +13:00
Aaron Carlino
e107512063
Back port 4.0 implementation of numeric/assoc key merging for summary_fields
2018-02-27 16:42:44 +13:00
Chris Joe
1973f87c4b
Merge pull request #7892 from open-sausages/pulls/4.0/dont-log-me-out-bro
...
BUG Fix environment variable assignment
2018-02-27 13:38:26 +13:00
Christopher Joe
1cdbab45c9
Added comment about array_merge() not working
2018-02-27 09:52:42 +13:00
Aaron Carlino
0863bac29a
Update getVariables to return a copy of globals rather than including the reference in an array merge
2018-02-27 09:52:36 +13:00
Robbie Averill
833e6eb138
Merge pull request #7891 from DorsetDigital/patch-1
...
Update 01_Error_Handling.md
2018-02-27 09:30:35 +13:00
DorsetDigital
4974996cbe
Update 01_Error_Handling.md
...
Add use statements in initial code sample for completeness and hopefully avoid errors when code is copy & pasted
Add a 'be' to dependency injection paragraph so it reads properly
2018-02-26 19:31:44 +00:00
Loz Calver
e23353fe99
Merge pull request #7885 from dhensby/pulls/4.0/email-docs-config
...
DOCS update email docs to use correct config syntax
2018-02-26 12:32:13 +00:00
Daniel Hensby
722f2d178a
Merge branch '4.1' into 4
2018-02-26 10:57:52 +00: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
Daniel Hensby
ade88ef0ea
DOCS update email docs to use correct config syntax
2018-02-23 11:49:13 +00: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
606f26d068
Merge pull request #7884 from JorisDebonnet/patch-1
...
Update 4.0.0.md
2018-02-22 11:55:45 +00:00
JorisDebonnet
26280f8ab9
Update 4.0.0.md
...
Fixed several small issues
2018-02-22 03:22:13 +01:00
Daniel Hensby
ced2ba1f64
API Move CSV writing/reading to league/csv library
2018-02-22 09:22:37 +13:00
Daniel Hensby
dace2f179d
Merge branch '4.1' into 4
2018-02-21 13:58:45 +00:00
