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
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
0fe4ec4537
Partial revert of c6c6c13fc2
2017-02-07 15:33:20 +00:00
Daniel Hensby
c6c6c13fc2
[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::forTemplate
2017-01-26 12:56:31 +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
Andrew Aitken-Fincham
eecdf56b36
remove Created field on duplicate
2016-12-19 13:50:48 +00:00
Steve
c034838c71
Update Versioned.php
...
Change isset() to array_key_exists(). In the CMS, if you have a FormField such as 'My value', then you change it to '' (blank), isset() will return false because even though the key exists, the value === null by the time it reaches this point in the code, and isset() return false on null values. array_key_exists will return true with a null value
2016-11-30 14:49:03 +13:00
Daniel Hensby
3e36f5691b
Merge branch '3.4' into 3.5.0
2016-11-22 11:31:39 +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
Jonathon Menz
bec5adf09b
FIX Versioned sort by ID
...
Prevent SQL error from a Versioned DataObject with e.g. $default_sort = 'ID DESC'
2016-11-16 12:16:33 -08: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
955e02ab90
Merge branch '3.4' into 3
2016-11-08 17:03:10 +00:00
Daniel Hensby
0a835c6fe7
Merge branch '3.4' into 3
2016-11-03 13:27:31 +00:00
Daniel Hensby
567b125fbc
DOCS Fix up some PHPDoc on Versioned
2016-11-02 14:08:35 +00:00
Daniel Hensby
c61d61d003
FIX default_records are no longer inherited to child classes
2016-11-01 20:58:03 +00:00
Damian Mooyman
2a9138aa14
Merge pull request #6264 from dhensby/pulls/3.4/validation-docblock-fix
...
DOCS Docblock fixes for ValidationResult
2016-11-01 10:38:33 +13:00
Daniel Hensby
0b850e0819
DOCS Docblock fixes for ValidationResult
2016-10-31 13:33:59 +00:00
Daniel Hensby
747bd4cac0
FIX filterAny error message now refers to correct method name
2016-10-30 12:04:07 +00:00
Daniel Hensby
3859a1d7e7
Merge branch '3.4' into 3
2016-10-27 16:16:04 +01:00
Daniel Hensby
2a3768266e
Merge branch '3.3' into 3.4
2016-10-27 16:15:43 +01:00
Daniel Hensby
a97ebf93de
Merge branch '3.2' into 3.3
2016-10-27 16:15:10 +01:00
Daniel Hensby
5f4f07a256
Merge branch '3.1' into 3.2
2016-10-27 16:14:01 +01:00
Nick
d1c29d6595
Remove double quotes so example is not parsed.
...
[Notice] Undefined variable: map
Since it's using double quotes it tries to process $map, $key and $value
2016-10-27 09:06:11 +13: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
Damian Mooyman
b87c668bf4
API support dblib ( #5996 )
2016-09-16 11:39:29 +12:00
Daniel Hensby
f25b88b146
showqueries debugging tool now inserts parameters in place ( #5885 )
2016-09-15 09:15:19 +12:00
Daniel Hensby
3fd9fe3aa0
Merge branch '3.4' into 3
2016-09-07 09:22:06 +01:00
Rob Ingram
0c7264eca6
DOCS Update PHP doc on latestPublished method ( #5905 )
...
* Update doc comment on method to be more accurate
2016-08-31 21:37:50 +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
Loz Calver
0f3eabcf03
Merge pull request #5902 from dhensby/pulls/relation-list-cleanup
...
Cleanup of RelationList, HasManyList and ManyManyList
2016-08-22 14:27:29 +01:00
Daniel Hensby
4998b80445
FIX ArrayList sorting now caseinsensitive
2016-08-22 11:21:50 +01:00
Daniel Hensby
8737ddefba
Cleanup of RelationList, HasManyList and ManyManyList
2016-08-19 10:37:58 +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
Damian Mooyman
e810a9928c
API Add optimistic_connect to SS_Database
...
Fixes #4765
2016-07-12 10:19:03 +12:00
