3Dgoo
61ce4771f9
Fixing HTMLEditorField API documentation
...
The SS3 API documentation for HTMLEditorField was broken before change #7904 :
http://api.silverstripe.org/3/HtmlEditorField.html
This was because there was an unescaped textarea tag in the class description. In #7904 we escaped the tag.
However in a similar pull request #7927 it was suggested we should use backticks instead.
This changes the documentation to use backticks around the textarea tag.
2018-03-15 21:27:45 +10:30
3Dgoo
05b2979458
Update FormAction.php
2018-03-15 13:38:15 +10:30
3Dgoo
1d74b3a22d
Update FormAction.php
2018-03-14 13:34:12 +10:30
3Dgoo
97f22cbaa5
Fixing FormAction API documentation
...
The API documentation for FormAction is currently broken:
http://api.silverstripe.org/3/FormAction.html
This is because there are unescaped tags in the class description.
This fix changes the tag in the description to be escaped.
2018-03-14 11:27:15 +10:30
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
Daniel Hensby
85e97d204b
Partial revert of #7665 - bad docblock changes
2018-02-09 19:27:11 +00:00
Daniel Hensby
747a98a07f
Merge branch '3.6' into 3
2018-02-09 13:21:15 +00:00
Daniel Hensby
48a8a82326
Merge branch '3.5' into 3.6
2018-02-09 13:20:38 +00:00
JorisDebonnet
5df1ec7eee
Use fputcsv in GridFieldExportButton
2018-02-08 12:26:29 +00:00
Damian Mooyman
f4b13fb2c4
Merge remote-tracking branch 'origin/3.6' into 3
...
# Conflicts:
# model/DataQuery.php
2018-02-05 16:53:15 +13:00
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
Daniel Hensby
9103816333
NEW Add php 7.2 support
2018-01-30 16:50:32 +00:00
Damian Mooyman
50aa1f22a6
Merge branch '3.6' into 3
2017-12-07 13:20:58 +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
fd201bc71b
Merge branch '3.6' into 3
2017-11-25 16:18:46 +00: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
Andrew Aitken-Fincham
40628ac04a
sanitise more docblocks
2017-11-14 10:05:47 +00:00
Andrew Aitken-Fincham
4d1440f13a
sanitise FormField docblock
2017-11-14 09:53:41 +00:00
Andrew Aitken-Fincham
9d4263c51f
sanitise ListboxField docblock
2017-11-14 09:46:02 +00:00
Andrew Aitken-Fincham
36d542ef7b
sanitise select tag in DropdownField Docblock
2017-11-14 08:21:26 +00:00
Daniel Hensby
23a726f385
Merge branch '3.6' into 3
2017-08-14 13:43:28 +01: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
4ca96eae48
Merge branch '3.6' into 3
2017-07-25 16:03:35 +01: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
eec8dfa7ad
Merge branch '3.6' into 3
2017-06-28 11:12:03 +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
399c46579a
Merge branch '3.6' into 3
2017-06-27 13:15:14 +01: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
Florian Thoma
7648428fdb
add extension hoot to FormField::extraClass()
2017-06-10 09:52:22 +10: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