Commit Graph

19900 Commits

Author SHA1 Message Date
Damian Mooyman
b0b8a2f625
Merge remote-tracking branch 'origin/4.1' into 4 2018-03-14 11:26:26 +13:00
Damian Mooyman
caefab774e Added 4.1.0 changelog 2018-03-14 10:16:31 +13:00
Damian Mooyman
3700c0a33d Update translations 2018-03-14 09:45:54 +13:00
Daniel Hensby
33a17d8dd2
Merge pull request #7925 from open-sausages/pulls/4/youve-been-committed
Add Paul to core designers team
2018-03-13 11:36:15 +00:00
Christopher Joe
f437d52255 Add Paul to core designers team 2018-03-13 17:55:43 +13:00
Damian Mooyman
8b9c292509
Merge remote-tracking branch 'origin/4.1' into 4 2018-03-13 14:26:39 +13:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-03-13 14:26:18 +13:00
Robbie Averill
9fb1dcc356
Merge pull request #7924 from open-sausages/pulls/4/docs-remove-hamish-core
Remove Hamish, Stig, Sean, Jono from core committers :(
2018-03-13 14:07:09 +13:00
Ingo Schommer
9a85e4d6e8 Remove Jono from Core Committers :( 2018-03-13 10:25:02 +13:00
Ingo Schommer
e71a70217f Remove Stig/Sean from Core Committers :( 2018-03-13 10:23:55 +13:00
Ingo Schommer
c2ac52c271 Remove Hamish from core committers :( 2018-03-13 10:12:41 +13:00
Robbie Averill
2bef86833f
Merge pull request #7921 from DorsetDigital/patch-2
Add missing use statement in Session documentation
2018-03-10 11:50:49 +13:00
DorsetDigital
72c5d5244f
Update 02_Sessions.md
Add additional 'use' statement (for Injector) in example of getting a session outside a controller.
2018-03-09 20:03:46 +00:00
Daniel Hensby
da5e73c115
Merge pull request #7918 from silverstripe-terraformers/pulls/updated-docs
Updated docs for Rate Limiting.
2018-03-09 10:52:12 +00:00
Damian Mooyman
cb372f7a34
Merge pull request #7919 from christopherdarling/patch-10
DOCS add missing trailing ; in code block
2018-03-09 15:30:57 +13:00
Christopher Darling
278f19068e
DOCS add missing trailing ; in code block 2018-03-08 20:41:11 +00:00
cpenny
fdbf4c2134 Updated docs for Rate Limiting. 2018-03-09 08:15:11 +13:00
Loz Calver
ef63e42e35
Merge pull request #7917 from Quadra-Digital/bug-fix-change-password
Bug Fix - Change Password Page
2018-03-07 15:14:49 +00:00
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
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
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
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