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 |
|
Daniel Hensby
|
8a21d53a07
|
Merge branch '3.4' into 3
|
2016-07-07 10:28:49 +01:00 |
|
assertchris
|
8b4311f020
|
Checking for resource before closing MySQL connection
|
2016-07-07 10:01:33 +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 |
|