Daniel Hensby
|
e932b22388
|
Merge branch '3.5' into 3
|
2017-03-03 14:54:43 +00:00 |
|
Daniel Hensby
|
8aaa3e3a86
|
Merge branch '3.4' into 3.5
|
2017-03-03 14:54:29 +00:00 |
|
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 |
|