Daniel Hensby
|
7f194a917d
|
Merge pull request #6351 from steve-silverstripe/patch-2
|
2017-03-03 14:05:53 +00:00 |
|
Daniel Hensby
|
62e301bdba
|
Merge pull request #6529 from timezoneone/3.5
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
|
2017-03-03 12:45:05 +00:00 |
|
Shawn
|
72b6fb49b6
|
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
|
2017-03-03 14:11:53 +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 |
|
Daniel Hensby
|
7122e1fde7
|
FIX Comments ignored by classmanifest (#6619)
|
2017-02-15 10:46:04 +13:00 |
|
Daniel Hensby
|
4d3cd9d9a2
|
Merge branch '3.5' into 3
|
2017-02-08 10:40:40 +00:00 |
|
Damian Mooyman
|
c25c443d95
|
BUG Fix minor mysql 5.7 warning in SQLQueryTest (#6608)
Fixes #5451
|
2017-02-08 15:44:55 +13:00 |
|
Daniel Hensby
|
669f6a3d41
|
Merge branch '3.5' into 3
|
2017-01-31 13:33:26 +00:00 |
|
Daniel Hensby
|
56b887f578
|
Merge branch '3.4' into 3.5
|
2017-01-31 13:33:00 +00:00 |
|
Damian Mooyman
|
609b0a612c
|
Merge pull request #6512 from silverstripe/pulls/3.4/ensure-string-return
Test fixes - reorder assertions and ensure string returned
|
2017-01-31 17:25:34 +13:00 |
|
Robbie Averill
|
3583f1f79e
|
API Convert::raw2json can be passed an optional bitmask of JSON constants as options
|
2017-01-24 13:27:16 +13:00 |
|
Daniel Hensby
|
2ce80e448d
|
Merge branch '3.5' into 3
|
2017-01-16 21:00:14 +00:00 |
|
Stephan Bauer
|
17d123a3be
|
BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing
|
2017-01-16 21:24:34 +01:00 |
|
Daniel Hensby
|
de7372ad3b
|
Test fixes - reorder assertions and ensure string returned
|
2017-01-16 14:46:22 +00:00 |
|
Stephan Bauer
|
1f1fffe734
|
BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing (fixes #6467)
|
2017-01-14 23:13:47 +01:00 |
|
Daniel Hensby
|
f2470cc98d
|
Merge pull request #6459 from robbieaverill/feature/nofollow-robots-in-security
Add X-Robots-Tag noindex,nofollow header from Security controller to prevent indexing
|
2017-01-13 12:38:04 +00:00 |
|
Robbie Averill
|
2f6f5b5eff
|
Do not send the header if it is not defined
|
2017-01-11 08:26:04 +13:00 |
|
Daniel Hensby
|
733511565e
|
Merge branch '3.5' into 3
|
2017-01-10 12:52:06 +00:00 |
|
Robbie Averill
|
cb2dcc75f1
|
Add X-Robots-Tag noindex,nofollow header from Security controller to prevent indexing
|
2017-01-09 16:13:39 +13: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
|
c8a40605ec
|
Merge pull request #6413 from volkerloew/1400-text-contextsummary
search term highlighting without altering case (fixes #1400)
|
2016-12-28 13:36:08 +00:00 |
|
Volker Löw
|
5e581eace7
|
search term highlighting without altering case (fixes #1400)
|
2016-12-28 13:03:35 +00:00 |
|
Damian Mooyman
|
b1b3a6ee13
|
Merge 3.4 into 3.5
|
2016-12-22 13:18:37 +13:00 |
|
Damian Mooyman
|
94c3bc9fa1
|
Merge 3.4.3 into 3.4
|
2016-12-22 13:16:12 +13:00 |
|
Damian Mooyman
|
f314b86ad8
|
BUG Temp disable shortcode SPLIT behaviour due to crash (#6436)
Fixes #5987
|
2016-12-22 10:08:46 +13:00 |
|
Damian Mooyman
|
ffdb99e78d
|
BUG Temp disable shortcode SPLIT behaviour due to crash (#6436)
Fixes #5987
|
2016-12-21 18:55:00 +13:00 |
|
Daniel Hensby
|
273a06d47d
|
TEST Duplicated DataObjects dont keep Created date value
|
2016-12-19 14:23:39 +00:00 |
|
Daniel Hensby
|
78ed003977
|
Merge branch '3.4' into 3.5
|
2016-12-19 10:48:10 +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
|
f8132b39af
|
Assertions should be $this->assert($expected, $actual)
|
2016-12-13 11:32:52 +00:00 |
|
Daniel Hensby
|
2e538ca9ab
|
Merge tag '3.4.2' into 3.4
Release 3.4.2
|
2016-11-29 17:17:00 +00:00 |
|
Daniel Hensby
|
fb39022ef3
|
Merge branch '3.4' into 3.5
|
2016-11-29 11:40:37 +00:00 |
|
Daniel Hensby
|
3a009a5849
|
Merge branch '3.3' into 3.4
|
2016-11-29 11:39:58 +00:00 |
|
Damian Mooyman
|
9ec1d35f2b
|
BUG Fix behat tests unable to capture HTML editor fields
|
2016-11-29 14:49:39 +13:00 |
|
Daniel Hensby
|
3e36f5691b
|
Merge branch '3.4' into 3.5.0
|
2016-11-22 11:31:39 +00:00 |
|
Daniel Hensby
|
f57244d526
|
Merge branch '3.3' into 3.4
|
2016-11-22 11:29:32 +00:00 |
|
Daniel Hensby
|
f17e21c4a3
|
Merge branch '3.2' into 3.3
|
2016-11-22 11:26:41 +00:00 |
|
Daniel Hensby
|
d2633be56d
|
Merge branch '3.1' into 3.2
|
2016-11-22 11:21:08 +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
|
61e4055bdb
|
[SS-2016-010] FIX Cast FormField values as Text to prevent readonly fields embeding rogue HTML
|
2016-11-14 10:38:15 +00:00 |
|
Daniel Hensby
|
17108ff50c
|
Merge branch '3.4' into 3.5.0
|
2016-11-10 14:23:38 +00:00 |
|
Damian Mooyman
|
ebae480c66
|
BUG Fix regression in aggregate column lookup from #6199
|
2016-11-10 11:13:02 +13:00 |
|
Daniel Hensby
|
5a7cde0e10
|
Merge branch '3.4' into 3.5.0
|
2016-11-09 16:14:40 +00:00 |
|
Loz Calver
|
6bf36fbd30
|
FIX: Correct return type for Member::currentUser()
|
2016-11-09 14:20:44 +00:00 |
|
Daniel Hensby
|
3859a1d7e7
|
Merge branch '3.4' into 3
|
2016-10-27 16:16:04 +01:00 |
|
Jonathon Menz
|
b0445f72e4
|
FIX Ambiguous column SQL error
Specify the table for the field we’re fetching, in case a joined table has a field with the same name
|
2016-10-18 21:35:37 -07:00 |
|
Daniel Hensby
|
9a6121c867
|
Merge branch '3.4' into 3
|
2016-10-16 22:56:37 +01:00 |
|
Daniel Hensby
|
4c7ba731be
|
Merge branch 'open-sausages/pulls/3.4/fix-checkbox-datalist' into 3.4
|
2016-10-11 20:16:33 +01:00 |
|
Damian Mooyman
|
7368deca8f
|
BUG Fix issue with SS_List as datasource for dropdown field
BUG Fix validation issue with CheckboxSetField
Fixes #6166
|
2016-10-11 14:58:48 +13:00 |
|
Jonathon Menz
|
797be6ac82
|
FIX Revert natural sort
More backwards compatible and more consistent with ORM sorting (fixes #6124)
|
2016-10-04 13:56:12 -07:00 |
|
Stephan van Diepen
|
95b66d19b2
|
Added MySQL support for Bigint.
Conflicts:
model/MySQLDatabase.php
|
2016-09-30 16:38:25 +01:00 |
|
Andrew Aitken-Fincham
|
ad0d68d133
|
add IPUtils.php to control and implement symfony IpUtils (#6062)
|
2016-09-26 12:44:55 +13:00 |
|
Daniel Hensby
|
a9df28c791
|
Merge branch '3.4' into 3
|
2016-09-14 11:40:15 +01:00 |
|
Damian Mooyman
|
c6457c50e9
|
API Allow has_many fixtures to be declared with array format as well as many_many (#5944)
BUG Fix issue with parsing of extrafields in fixtures
BUG Fix issue in duplicate relation name, and ensure FixtureBlueprint fails on these
|
2016-09-12 14:01:08 +01:00 |
|
Daniel Hensby
|
3fd9fe3aa0
|
Merge branch '3.4' into 3
|
2016-09-07 09:22:06 +01:00 |
|
Daniel Hensby
|
f2ed59e185
|
FIX Empty dmyfields on DateField now validate as true
|
2016-09-01 11:55:17 +01:00 |
|
Daniel Hensby
|
060bf6b327
|
Merge branch '3.3' into 3.4
|
2016-08-22 16:22:37 +01:00 |
|
Daniel Hensby
|
088d88e978
|
Merge branch '3.2' into 3.3
|
2016-08-22 16:22:02 +01:00 |
|
Daniel Hensby
|
4998b80445
|
FIX ArrayList sorting now caseinsensitive
|
2016-08-22 11:21:50 +01:00 |
|
Damian Mooyman
|
d88516203c
|
Merge 3.4 into 3
|
2016-08-15 19:05:20 +12:00 |
|
Damian Mooyman
|
bbc865ff67
|
Merge 3.4.1 into 3.4
|
2016-08-15 18:37:55 +12:00 |
|
Damian Mooyman
|
b0ba2015d9
|
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
|
2016-08-15 15:53:21 +12:00 |
|
Damian Mooyman
|
049cdefacf
|
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
|
2016-08-15 15:02:58 +12:00 |
|
Damian Mooyman
|
12a6b357e7
|
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
|
2016-08-15 14:14:42 +12:00 |
|
Damian Mooyman
|
62a242154e
|
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
|
2016-08-15 13:24:06 +12:00 |
|
Jonathon Menz
|
d4114b3dce
|
FIX include related fields on canFilter() check
closes #5576
|
2016-08-11 10:26:18 -07:00 |
|
Damian Mooyman
|
7de5b998e1
|
Merge 3.4 into 3
|
2016-08-05 19:12:25 +12:00 |
|
Damian Mooyman
|
ca754eb887
|
Merge 3.3 into 3.4
# Conflicts:
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/it.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/it.js
# lang/cs.yml
# lang/eo.yml
# lang/fa_IR.yml
# lang/fi.yml
# lang/it.yml
# lang/sk.yml
|
2016-08-05 16:48:26 +12:00 |
|
Daniel Hensby
|
e7c6509196
|
Merge remote-tracking branch 'cow/pulls/3.3/check-isset-config' into 3.3
|
2016-08-02 12:00:04 +01:00 |
|
Damian Mooyman
|
cd80d501f9
|
BUG Fix unset config options returning isset() = true
Fixes #4791
|
2016-08-02 18:07:55 +12:00 |
|
Damian Mooyman
|
7d0b8e6520
|
BUG Fix permission checking code not correctly handling escaped SQL identifiers
Fixes https://github.com/silverstripe/silverstripe-installer/issues/96
|
2016-08-01 18:15:30 +12:00 |
|
Daniel Hensby
|
340a48306b
|
Merge branch '3.4' into 3
|
2016-07-20 19:48:17 +01:00 |
|
Daniel Hensby
|
cf247534d5
|
Merge branch '3.3' into 3.4
|
2016-07-20 19:43:41 +01:00 |
|
Daniel Hensby
|
96b061ffff
|
Merge branch '3.2' into 3.3
|
2016-07-20 19:41:46 +01:00 |
|
madmatt
|
43dcde5197
|
FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded
|
2016-07-19 11:22:36 +12:00 |
|
Loz Calver
|
391161208e
|
Merge branch '3.4' into 3
|
2016-07-15 14:34:50 +01:00 |
|
Loz Calver
|
44d7919496
|
Merge branch '3.3' into 3.4
|
2016-07-15 14:34:18 +01:00 |
|
Loz Calver
|
b3fea3723f
|
FIX: Fixes support for "inline" form actions (fixes #2534)
|
2016-07-15 10:11:47 +01:00 |
|
Daniel Hensby
|
a64a066bbf
|
Merge pull request #5665 from tractorcow/pulls/3.3/fix-button-clicked
BUG Fix buttonClicked() error
|
2016-07-15 00:30:25 +01:00 |
|
Daniel Hensby
|
b7fc0a2752
|
Merge pull request #5790 from patricknelson/issue-5784-email-reply-to
FIX for #5784: Email API improvements, documentation cleanup.
|
2016-07-15 00:23:25 +01:00 |
|
Patrick Nelson
|
74c555e004
|
FIX for #5784: Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards.
|
2016-07-14 10:25:40 -07:00 |
|
Daniel Hensby
|
4c40cf8dbb
|
Merge branch '3.4' into 3
|
2016-07-14 12:01:19 +01:00 |
|
Daniel Hensby
|
d766c8559b
|
Merge branch '3.3' into 3.4
|
2016-07-14 11:57:15 +01:00 |
|
Damian Mooyman
|
24efc7edf8
|
BUG Fix sorting ArrayList with sql-like syntax
Replaces #5726
|
2016-07-12 17:00:17 +12:00 |
|
Daniel Hensby
|
8a21d53a07
|
Merge branch '3.4' into 3
|
2016-07-07 10:28:49 +01:00 |
|
Daniel Hensby
|
55e1fd8782
|
Merge branch '3.3' into 3.4
|
2016-07-07 10:28:17 +01:00 |
|
Daniel Hensby
|
ce47f8112b
|
Merge branch '3.2' into 3.3
|
2016-07-07 10:27:25 +01:00 |
|
Loz Calver
|
27cea80b15
|
FIX: SS_ConfigStaticManifest_Parser failed to handle ::class syntax (fixes #5701) (#5781)
|
2016-07-07 10:23:38 +01:00 |
|
Daniel Hensby
|
a449045b09
|
Merge branch '3.4' into 3
|
2016-07-04 23:54:27 +01:00 |
|