Daniel Hensby
2c6f588785
Merge branch '3.6' into 3
2018-03-14 13:53:37 +00:00
Daniel Hensby
35f28a824a
Merge pull request #7922 from mooror/3.6
2018-03-12 13:18:23 +00:00
Benjamin Blake
6fb8d27ac5
Updated the DocBlock for ManyManyList's add() method
2018-03-11 14:49:17 -06:00
Daniel Hensby
dc8c05519a
Merge pull request #7893 from open-sausages/pulls/3/the-summary-of-all-parts
2018-02-27 11:49:07 +00:00
Aaron Carlino
38a7e1c2d2
Remove short array syntax
2018-02-27 22:36:31 +13:00
Aaron Carlino
c755f77288
Fix indentation
2018-02-27 22:34:16 +13:00
Aaron Carlino
e107512063
Back port 4.0 implementation of numeric/assoc key merging for summary_fields
2018-02-27 16:42:44 +13:00
Daniel Hensby
4ca385e033
Partial revert of #7665 - overzealous string renames
2018-02-09 19:27:45 +00:00
Daniel Hensby
85e97d204b
Partial revert of #7665 - bad docblock changes
2018-02-09 19:27:11 +00:00
Damian Mooyman
f4b13fb2c4
Merge remote-tracking branch 'origin/3.6' into 3
...
# Conflicts:
# model/DataQuery.php
2018-02-05 16:53:15 +13:00
Damian Mooyman
96ec6e9181
Merge remote-tracking branch 'origin/3.5' into 3.6
2018-02-05 15:07:21 +13:00
Damian Mooyman
aca1e16b8e
Merge pull request #6211 from jason-zz/patch-3
...
BUG Fix : relObject() should return null if one of the node is null
2018-02-05 14:18:44 +13:00
Damian Mooyman
4da99efd5d
Merge remote-tracking branch 'origin/3.5' into 3.6
2018-01-31 16:03:42 +13:00
Daniel Hensby
74a3ba54ae
FIX count size of $relations
2018-01-30 16:50:33 +00:00
Daniel Hensby
9103816333
NEW Add php 7.2 support
2018-01-30 16:50:32 +00:00
Dominik Beerbohm
416915b082
BUG tableName is blank in CompositeDBField->addToQuery
...
Added call to setTable() to ensure tableName is provided inside addToQuery method.
2018-01-26 14:58:46 +01:00
Damian Mooyman
50aa1f22a6
Merge branch '3.6' into 3
2017-12-07 13:20:58 +13:00
Daniel Hensby
89166a2ff2
Try using parseSortColumn from ArrayList
2017-12-06 13:38:58 +00:00
Daniel Hensby
2e43780a8a
NEW Add sort columns to DB index automatically
2017-12-06 13:38:25 +00:00
Damian Mooyman
e281c64fca
Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6
2017-12-06 17:32:56 +13:00
Damian Mooyman
a8465900bd
Merge pull request #47 from silverstripe-security/patch/3.5/SS-2017-008
...
[SS-2017-008] FIX Make sure int params are successfull cast to int
2017-12-06 17:30:51 +13:00
Damian Mooyman
91cf85087b
Merge remote-tracking branch 'origin/3.5' into 3.6
2017-12-06 17:21:09 +13:00
Damian Mooyman
77b46672e2
Merge branch '3.5' into pulls/3.5/versioned-base-class
2017-12-06 11:37:46 +13:00
Daniel Hensby
2aa1d8f2c4
remove create_function usage
2017-12-05 14:20:13 +00:00
Daniel Hensby
84d7afb347
FIX Use baseDataClass for allVersions as with other methods
2017-12-05 13:02:20 +00:00
Daniel Hensby
fd201bc71b
Merge branch '3.6' into 3
2017-11-25 16:18:46 +00:00
Daniel Hensby
badeb0cc8c
Merge branch '3.5' into 3.6
2017-11-25 16:17:36 +00:00
Daniel Hensby
0f2049d4d4
[SS-2017-008] Fix SQL injection in search engine
2017-11-21 14:45:36 +00:00
Ingo Schommer
d39e9b0bb0
Make DataDifferencer injectable
...
Requested by Steve Boyd
2017-11-20 15:47:35 +13:00
Daniel Hensby
ce3fd370fb
FIX ManyMany link table joined with LEFT JOIN
2017-11-16 12:11:16 +00:00
Daniel Hensby
0baa996cc0
Merge branch '3.6' into 3
2017-11-14 12:13:08 +00:00
Daniel Hensby
4731d3c671
Merge branch '3.5' into 3.6
2017-11-14 12:00:53 +00:00
Daniel Hensby
264cec1239
FIX Dont use var_export for cache key generation as it fails on circular references
2017-10-09 10:13:39 +01:00
Robbie Averill
2f0a0cb63f
NEW Add (alt text) to title field for clarity
2017-09-29 09:33:55 +13:00
Daniel Hensby
b49d1d7fbd
Merge branch '3.6' into 3
2017-09-28 17:17:19 +01:00
Daniel Hensby
29300c2c2d
Merge remote-tracking branch 'security/3.5.5' into HEAD
2017-09-28 15:48:29 +01:00
Dylan Wagstaff
ebe1de8d8b
Fix ArrayList sort error with old (supported) PHP
...
PHP 5.3 at least (the reported and tested against version) requires arguments to `call_user_func_array` to be passed by reference. There exists a note as a comment in the code, but was unfortunately overlooked in a previous commit to fix case sensitive sorting 4998b80445 (diff-6ba746c3d31fd6b4c4a99d7efe35eb21L442)https://docs.silverstripe.org/en/3/getting_started/server_requirements/#web-server-software-requirements ).
2017-09-28 15:29:54 +01:00
Daniel Hensby
f8c5ff2f15
Merge branch '3.6' into 3
2017-08-29 16:54:09 +01:00
Daniel Hensby
7d90df38e5
Merge branch '3.5' into 3.6
2017-08-29 16:46:58 +01:00
Robbie Averill
0b34066f0c
NEW Fix incorrect scalar types in doc blocks, add chainable returns in setters
2017-08-29 11:40:20 +12:00
Daniel Hensby
9d2503c3da
Merge pull request #7274 from PapaBearNZ/patch-1
...
Fix Truncate Error Issue when using views in a Unittest.
2017-08-25 11:51:36 +01:00
Daniel Hensby
c09305be9e
Merge branch '3.6' into 3
2017-08-17 14:31:57 +01:00
Daniel Hensby
921f615e19
Merge branch '3.5' into 3.6
2017-08-17 14:14:31 +01:00
Daniel Hensby
eb80a5f9e8
FIX LastEdited no longer updated on skipped writes
2017-08-16 23:39:22 +01:00
Daniel Hensby
23a726f385
Merge branch '3.6' into 3
2017-08-14 13:43:28 +01:00
James Pluck
b04a1ab41c
Fix Truncate Error Issue when using views in a Unittest.
...
When using a view in a SilverStripe project, whenever the tear down scripts for the Unittests are run the following error occurs:
Couldn't run query:
TRUNCATE "ActivityPoints_view"
Table 'ss_tmpdb2391727.ActivityPoints_view' doesn't exist
This was due to the MySQLSchemaManager::tableList() function assuming that all records in the TABLES were actual tables containing data.
This small tweak fixes the issue by modifying the SQL to filter out views from the list before truncating.
2017-08-14 15:22:19 +12:00
John
1a4a006d09
FIX: PDOConnector ssl_cipher bug fixes #7258
2017-08-08 18:00:06 +08:00
Russell Michell
59b28f7d5b
FIX: Fixes #7181 to config system for userland config of node display limits.
2017-08-07 10:55:38 +12:00
John
8577ad1280
NEW Added SSL support for MySQLi Connector ( fixes #7242 )
...
Modified MySQLiConnector.php to parse SSL environment variables
Modifed MySQLDatabaseConfigurationHelper.php to check SSL variables when testing initial connection
Minor: Modified PDOConnector.php to change typo
TODO: Add Documentation
2017-08-03 22:36:11 +08:00
John
a3678c73b9
Refactor code to decouple SSL feature from MySQL PDO
2017-08-03 13:22:58 +08:00
