Damian Mooyman
96ec6e9181
Merge remote-tracking branch 'origin/3.5' into 3.6
2018-02-05 15:07:21 +13:00
Damian Mooyman
fa44d22058
Merge pull request #6744 from d-rivera-c/dev/pharmac-fork
...
fixing val reference to url in https hotlink and allowes https hotlinking on TinyMCE
2018-02-05 14:22:08 +13:00
Damian Mooyman
d6a93f5215
Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6
...
# Conflicts:
# security/Member.php
2017-12-06 17:26:45 +13:00
Damian Mooyman
91cf85087b
Merge remote-tracking branch 'origin/3.5' into 3.6
2017-12-06 17:21:09 +13:00
Damian Mooyman
dd4c5417e7
Merge pull request #49 from silverstripe-security/pulls/3.5/ss-2017-007
...
[ss-2017-007] Ensure xls formulae are safely sanitised on output (3.5)
2017-12-06 16:25:58 +13:00
Daniel Hensby
8d1a5ed8b7
More code style fixes
2017-12-05 14:20:13 +00:00
Daniel Hensby
2aa1d8f2c4
remove create_function usage
2017-12-05 14:20:13 +00:00
Damian Mooyman
22ccf3e2f9
[ss-2017-007] Ensure xls formulae are safely sanitised on output
...
CSVParser now strips leading tabs on cells
2017-12-01 10:19:48 +13:00
Daniel Hensby
badeb0cc8c
Merge branch '3.5' into 3.6
2017-11-25 16:17:36 +00:00
Patrick Nelson
52f0eadd3b
FIX for #7606 : Ensure the object we're handling is actually an Image instance before calling methods specific to that class (e.g. in case of using SVG's in <img> tag which may be File instances).
2017-11-16 11:08:06 +00:00
Russell Michell
59b28f7d5b
FIX: Fixes #7181 to config system for userland config of node display limits.
2017-08-07 10:55:38 +12:00
Daniel Hensby
fc35eff13f
Merge branch '3.5' into 3.6
2017-07-25 16:02:56 +01:00
Klemen Dolinsek
3dd3036792
BUG Ensure GridState_Component is added to GridField config even if we set config with GridField::setConfig
...
Fixes #6886
2017-07-21 10:32:13 +12:00
Daniel Hensby
90be7e806d
Merge branch '3.5' into 3.6
2017-07-19 15:40:01 +01:00
Daniel Hensby
7b6aad8a65
Revert "TreeDropDown performance boost."
2017-07-19 12:44:43 +01:00
Daniel Hensby
d94182702c
Merge branch '3.5' into 3.6
2017-06-28 11:10:43 +01:00
Damian Mooyman
2b8eb202db
Merge pull request #6687 from hailwood/patch-6
...
Do not default to locale if hasEmptyDefault is true
2017-06-28 12:12:16 +12:00
Daniel Hensby
1e5592a3d9
Merge branch '3.5' into 3.6
2017-06-27 13:14:39 +01:00
Mojmir Fendek
5b6a39e71a
TreeDropDown performance boost.
2017-06-19 15:10:23 +12:00
Daniel Hensby
9f6e0cdc8f
Merge branch '3.5' into 3.6
2017-05-18 13:54:11 +01:00
Daniel Hensby
cc70d893bc
Merge branch '3.4' into 3.5
2017-05-18 13:53:49 +01:00
Thomas Portelange
efbf14be63
Allow filtering if a relation is defined or a formatting
2017-05-17 21:05:21 +01:00
Loz Calver
e22cd4db00
Fix: TabSet attempting to access undeclared property
2017-04-05 11:06:10 +10:00
Damian Mooyman
ae03d18d91
Merge pull request #6696 from robbieaverill/bugfix/datetime-field-has-template
...
FIX Give DatetimeField its own template (which is extensible)
2017-03-13 13:05:32 +13:00
Robbie Averill
cc749d3a19
FIX Give DatetimeField its own template (which is extensible)
2017-03-13 11:36:53 +13:00
Matthew Hailwood
445aba2a56
Do not default to locale if hasEmptyDefault is true
...
Currently there is no per-instance way to say "don't default to the current locale".
If you've explicitly said "This field right here, it has an empty default value" then we should probably respect that.
2017-03-09 12:35:37 +13:00
Damian Mooyman
f1b99b6fa7
API Enable theming of GroupedDropdownField
...
Based on partial back-port of 4.0 code
2017-03-06 11:44:42 +13:00
Daniel Hensby
0ddf3b4186
Merge branch '3.5' into 3
2017-02-20 21:33:31 +00:00
Daniel Hensby
5a6f784e42
Merge branch '3.4' into 3.5
2017-02-20 21:31:09 +00:00
Juan van den Anker
30725916db
FIX Array to string conversion message after CSV export ( #6622 )
...
* FIX Array to string conversion message after CSV export
* Removed invalid line endings
2017-02-15 22:20:00 +00:00
Damian Mooyman
3e32b18c6b
Merge pull request #6263 from dhensby/pulls/3/allow-unltd-grid-row-count
...
NEW Allow setting of unlimited row counts on GridFieldPaginator
2017-01-05 09:12:02 +13:00
Daniel Hensby
776d2fbc66
NEW Allow setting of unlimited row counts on GridFieldPaginator
2016-12-29 14:10:13 +00:00
Daniel Hensby
19dd8d6824
Merge branch '3.5' into 3
2016-12-19 11:18:00 +00:00
Damian Mooyman
c007e85d1b
BUG Suppress HtmlEditorField casting
...
Fixes #6396
2016-12-19 16:03:48 +13:00
Daniel Hensby
efd8114fd5
Merge branch '3.4' into 3.5
2016-12-16 15:52:53 +00:00
Daniel Hensby
5248be9226
FIX Handle fields with square brackets
2016-12-13 11:32:50 +00:00
Jonathon Menz
24dc3428d9
NEW HTMLEditorField default alignment setting
...
A config setting to control the default alignment of embedded media and images
2016-12-05 11:54:36 -08:00
Daniel Hensby
4bb6765392
Merge branch '3.4' into 3.5
2016-11-28 13:36:06 +00:00
Daniel Hensby
fc83321b6e
Merge tag '3.4.2' into 3.4
...
Release 3.4.2
2016-11-28 13:29:33 +00:00
Daniel Hensby
dd9ade4294
FIX UploadField incorrectly setting max upload size
2016-11-24 11:54:44 +00:00
Daniel Hensby
69974d940a
Merge branch '3.3' into 3.4
2016-11-18 11:33:39 +00:00
Daniel Hensby
0ae4b57754
Merge branch '3.2' into 3.3
2016-11-18 11:32:36 +00:00
Daniel Hensby
5df077f24d
Merge branch '3.1' into 3.2
2016-11-18 11:29:19 +00:00
Damian Mooyman
f43a91a4f8
API Add FormField::canSubmitValue()
...
API Add HTMLText::getProcessShortcodes() / setProcessShortcodes()
API Split TextareaField::Value() into ValueEntities() with shortcodes disabled
2016-11-17 09:55:03 +13:00
Daniel Hensby
8e5f786b8d
Merge branch '3.4' into 3.5.0
2016-11-15 11:43:16 +00:00
Daniel Hensby
3f4445641d
Merge branch '3.3' into 3.4
2016-11-15 11:35:38 +00:00
Daniel Hensby
c7778a1e9a
Merge branch '3.2' into 3.3
2016-11-15 11:19:27 +00:00
Daniel Hensby
06d0210233
Merge branch '3.1' into 3.2
2016-11-15 11:18:46 +00:00
Damian Mooyman
cc9d17063a
Add tests for FormField submission behaviour
...
Fix ReadonlyField casting with empty values
Restore Value() behaviour for TextareaField
2016-11-15 11:55:48 +13:00
Daniel Hensby
4440b88730
[SS-2016-010] FIX Form@httpSubmission will no longer load submitted data to disabled or readonly fields
2016-11-14 10:38:16 +00:00
