tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
16,775 Commits 31 Branches 527 Tags 162 MiB
b6374506ea
Commit Graph

1134 Commits

Author SHA1 Message Date
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
John
2f9bfae1f9 NEW Added MySQL SSL PDO Support 
Modified ConfigureFromEnv.php to parse SS_DATABASE_SSL variables (also added a bit of documentation)
Modified PDOConnector.php to implement variables set in ConfigureFromEnv if exists
Modified install files MySQLDatabaseConfigurationHelper and install.php5 to accept and implement SS_DATABASE_SSL variables set in _ss_environment.php

TODO: Add documentation
 2017-08-02 20:45:41 +08:00
Daniel Hensby
90be7e806d
Merge branch '3.5' into 3.6 2017-07-19 15:40:01 +01:00
Daniel Hensby
7b6aad8a65 Revert "TreeDropDown performance boost." 2017-07-19 12:44:43 +01:00
Daniel Hensby
7e732da709
Merge branch '3.5' into 3.6 2017-07-18 12:00:04 +01:00
Roman Schmid
a6db16b229 Fix OS X issue with Convert::html2raw, HTMLText::FirstSentence, HTMLText::Summary and Text::FirstSentence. 
Use unicode modifier for regular expressions that deal with whitespace.
Added unit-tests to ensure no invalud utf-8 gets generated by these methods.
 2017-07-10 09:49:55 +02:00
Daniel Hensby
1e5592a3d9
Merge branch '3.5' into 3.6 2017-06-27 13:14:39 +01:00
Mojmir Fendek
5b6a39e71a TreeDropDown performance boost. 2017-06-19 15:10:23 +12:00
Loz Calver
2afe018dc7
FIX: Ensure HasManyList foreign ID filter includes table name (fixes #7023) 2017-06-15 12:06:30 +01:00
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
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
Jason
8e5bb6fbdc BUG Fix : relObject() should return null if one of the node is null 2016-10-21 11:36:16 +11: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