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
Daniel Hensby
c04ff8c55a
Merge branch '4.0' into 4.1
2018-02-21 13:40:30 +00:00
Robbie Averill
7fe8da3222
Merge pull request #7881 from oddnoc/shortcode-docs
...
DOCS: remove backticks from Markdown link
2018-02-21 15:30:56 +13:00
Fred Condo
2f2390be59
DOCS: remove backticks from Markdown link
...
Markdown does not render links within backticks.
2018-02-20 16:54:18 -08:00
Daniel Hensby
2074f8fc69
Merge pull request #7878 from open-sausages/pulls/4.0/fix-unstaged-versioned
...
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 11:44:05 +00:00
Damian Mooyman
0e26c06644
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 12:20:18 +13:00
Daniel Hensby
4f354ff89b
Merge branch '3' into 4
2018-02-19 14:12:49 +00:00
Robbie Averill
2eb5843c27
Merge pull request #7876 from Juanitou/patch-1
...
Remove broken link in 05_Common_Problems.md
2018-02-18 14:28:17 +13:00
Juan Molina
d4f413d4db
Remove broken link in 05_Common_Problems.md
...
Remove broken (and outdated) link to leftandmain.com article.
2018-02-17 23:58:42 +01:00
Sam Minnee
a2143680e8
NEW: Add record count to dev/build output.
...
This small piece of metadata is intended to expose record counts to
developers as an information radiator: from time to time, SilverStripe
tables can get very large, and this exposes this information without
the developer seeking it out.
It’s reasonable to expect that count(*) calls aren’t too time consuming,
even on large tables.
On a small test run, dev/build execution went from 3.85s to 3.98s (a 3%
or 130ms increase). Given the small relative impact it should be okay.
Where this is inappropriate, it can be disabled with a config setting.
2018-02-17 19:02:50 +13:00
Christopher Joe
86addea1d2
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
2018-02-16 23:34:05 +13:00
Andrew Aitken-Fincham
de0b76dff6
ENHANCEMENT Fall back to SSViewer::get_themes when using themeResourceLoaders
2018-02-16 09:09:35 +13:00
Damian Mooyman
20c8058700
Merge remote-tracking branch 'origin/4.1' into 4
2018-02-15 12:24:34 +13:00
Damian Mooyman
b0c742b0a9
Added 4.1.0-rc2 changelog
2018-02-15 11:29:30 +13:00
Damian Mooyman
12e701c8ed
Merge remote-tracking branch 'origin/4.1' into 4
2018-02-15 09:28:14 +13:00
Damian Mooyman
e809c0fd62
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-02-15 09:27:51 +13:00
Loz Calver
d33fbc6add
Merge pull request #7867 from simonwinter/patch-2
...
Update validation in Developer guides
2018-02-14 09:18:26 +00:00
