Marcz Hermo
1073eca2fa
Bugfix: Complex (curly) syntax
2017-06-15 00:03:55 +12:00
Daniel Hensby
cda7e8dc39
Merge remote-tracking branch 'security/3.5.4' into 3.6.0
2017-05-29 01:29:05 +01:00
Daniel Hensby
24166700e8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4
2017-05-29 01:02:35 +01:00
Daniel Hensby
16a74bc8a9
FIX DataDifferencer needs to expliclty cast HTMLText values
2017-05-29 00:10:32 +01:00
Robbie Averill
197bc53c49
FIX Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad
2017-05-16 21:20:21 +12:00
Daniel Hensby
793a020ce9
Merge branch '3.4' into 3.5
2017-05-08 11:31:33 +01:00
Gregory Smirnov
1d36f354e8
FIX Create Image_Cached with Injector.
2017-04-26 10:40:10 +02:00
Daniel Hensby
8e600bfb37
Merge branch '3.5' into 3
2017-04-18 16:45:20 +01:00
Loz Calver
40bf945322
NEW: PHP 7 compatibility
...
This patch introduces PHP 7 compatability without breaking semver by adding DBInt
and DBFloat classes, with Int/Float classes that are only loaded into PHP 5 environments
2017-04-05 11:00:04 +10:00
Daniel Hensby
51f98c973f
Merge branch '3.5' into 3
2017-04-03 22:57:58 +01:00
Loz Calver
b3d37880e9
FIX: many_many_extraFields breaks _SortColumn0 ordering ( fixes #6730 )
2017-03-27 09:16:13 +01:00
Damian Mooyman
66a9694011
Merge branch '3.5' into dblib-pdo
2017-03-20 11:49:02 +13: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
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
Andrew O'Neil
9492a8b92f
Error should be checked on the db connection, not on the result
2017-03-01 10:41:06 +11:00
Gregory Smirnov
837ca480e4
Added Greek transliteration
2017-02-14 17:50:24 +01:00
Taras Yemtsov
da7465d96a
Cyrillic Transliteration
2017-02-13 14:19:12 +00:00
Andrew O'Neil
6af3289f43
Remove negation of condition to make the code easier to read.
2017-02-10 10:54:15 +11:00
Andrew O'Neil
6e2797ffc0
Fixes for using dblib PDO driver.
...
These fixes allow *nix environments to connect to SQL Server using
the dblib PDO driver and the silverstripe mssql module.
- Only set MYSQL_ATTR_INIT_COMMAND when using the mysql driver, this
constant isn't defined if the mysql pdo driver isn't installed
- Supress warnings on getting the server version, attributes aren't
supported by the dblib driver
- Explicitly check for errors on sql exec, checking the return
value isn't reliable for statements with no return value (e.g.
USE database)
2017-02-10 10:20:16 +11:00
Damian Mooyman
971fd5fcbb
Merge branch '3.5' into 3
2017-02-08 10:15:09 +13:00
Damian Mooyman
89a927d152
Merge 3.4 into 3.5
2017-02-08 10:01:14 +13:00
Daniel Hensby
0fe4ec4537
Partial revert of c6c6c13fc2
2017-02-07 15:33:20 +00:00
Daniel Hensby
669f6a3d41
Merge branch '3.5' into 3
2017-01-31 13:33:26 +00:00
Daniel Hensby
3a6d41042f
Merge branch '3.4' into 3.5
2017-01-26 21:25:14 +00:00
Nicolaas
f027b5eaf5
MINOR: stop Aggregate clear cache on DataObject::write()
...
see: https://github.com/silverstripe/silverstripe-framework/issues/6383 for details
2017-01-27 07:51:42 +13:00
Daniel Hensby
c6c6c13fc2
[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::forTemplate
2017-01-26 12:56:31 +00:00
Jake Bentvelzen
c7586c68b7
feat(ListDecorator): Add setList() function. Useful for keeping a decorator/paginated list configuration intact while modifying the underlying list.
2017-01-13 15:03:47 +11:00
Daniel Hensby
733511565e
Merge branch '3.5' into 3
2017-01-10 12:52:06 +00:00
Ingo Schommer
e55554d087
Clarify DataObject::__construct()
...
The $record argument should NOT be used for object construction, since it bypasses setters.
While the original PHPDoc hints at this (“internal systems”), it doesn’t make it clear enough.
2017-01-09 17:02:41 +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
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
