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 |
|
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
|
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 |
|
Daniel Hensby
|
273a06d47d
|
TEST Duplicated DataObjects dont keep Created date value
|
2016-12-19 14:23:39 +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
|
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 |
|
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 |
|
Daniel Hensby
|
3fd9fe3aa0
|
Merge branch '3.4' into 3
|
2016-09-07 09:22:06 +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 |
|
Jonathon Menz
|
d4114b3dce
|
FIX include related fields on canFilter() check
closes #5576
|
2016-08-11 10:26:18 -07: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 |
|
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
|
a449045b09
|
Merge branch '3.4' into 3
|
2016-07-04 23:54:27 +01:00 |
|
Daniel Hensby
|
c35dc508cb
|
Merge branch '3.3' into 3.4
|
2016-07-04 23:53:55 +01:00 |
|
Daniel Hensby
|
dfc557afd4
|
Merge branch '3.2' into 3.3
|
2016-07-04 23:43:44 +01:00 |
|
Daniel Hensby
|
2cdfe6cc21
|
FIX Use RAW for DBField template helpers
|
2016-07-04 14:39:56 +01:00 |
|
Daniel Hensby
|
b0f237bb3a
|
FIX Use RAW instead of Value for parsing shortcodes
|
2016-07-04 13:53:56 +01:00 |
|
Damian Mooyman
|
4dadc276b5
|
Merge pull request #3916 from dhensby/nfauchelle-gd-padding-improvementt
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
|
2016-07-04 17:35:47 +12:00 |
|
Daniel Hensby
|
0d36899afa
|
Merge branch '3.4' into 3
|
2016-06-13 12:30:33 +01:00 |
|
Daniel Hensby
|
4e392a4d43
|
Merge branch '3.3' into 3.4
|
2016-06-13 12:30:16 +01:00 |
|
Nick
|
dae2295e16
|
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
|
2016-06-05 00:05:37 +01:00 |
|
Damian Mooyman
|
decd7e5c57
|
BUG Fix getFinalisedQuery not including all queried columns
Fixes #1669
|
2016-05-23 08:41:58 +12:00 |
|
Daniel Hensby
|
be7e0db26e
|
Merge pull request #3835 from dnadesign/hideFromHierachy3
|
2016-05-19 11:52:47 +01:00 |
|
Damian Mooyman
|
b634b1a67d
|
Merge pull request #5537 from IgorNadj/patch-niceformats
ENH: moving hardcoded nice date/time formats to config
|
2016-05-19 14:12:22 +12:00 |
|
Damian Mooyman
|
6035be7e57
|
Merge pull request #5548 from kinglozzer/4661-extrafields-casting
FIX: castingHelper failed to find many_many_extraFields data (fixes #4661)
|
2016-05-19 14:10:37 +12:00 |
|
Damian Mooyman
|
8ed25ae482
|
BUG Fix DataObject::isChanged() detecting non saveable changes (#5545)
|
2016-05-18 09:00:04 +10:00 |
|
Loz Calver
|
7a81372294
|
FIX: castingHelper failed to find many_many_extraFields data (fixes #4661)
|
2016-05-17 16:04:28 +01:00 |
|
Damian Mooyman
|
8947bb0245
|
BUG Fix filtersOnId ignoring WHERE "ID" IN () (#5546)
|
2016-05-17 18:30:33 +12:00 |
|
John Milmine
|
c401d9daff
|
new added hide_from_cms_tree and hide_from_hierarchy
|
2016-05-16 16:20:14 +12:00 |
|
Igor Nadj
|
c8eda9fd5c
|
ENH: moving hardcoded nice date/time formats to config
Old PR: #4449
|
2016-05-15 21:25:57 +12:00 |
|
Daniel Hensby
|
19a4a40d8b
|
Merge branch '3.3' into 3
|
2016-05-12 16:25:22 +01:00 |
|
Daniel Hensby
|
264d7e8ffe
|
Merge branch '3.2' into 3.3
|
2016-05-12 16:23:57 +01:00 |
|
Daniel Hensby
|
e8962b95d0
|
Merge branch '3.1' into 3.2
|
2016-05-12 16:05:54 +01:00 |
|