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
Daniel Hensby
792925a3b9
Merge pull request #7320 from robbieaverill/pulls/3.7/data-query-docblocks
...
NEW Fix incorrect scalar types in doc blocks, add chainable returns in setters
2017-08-29 16:32:53 +01:00
Damian Mooyman
c0003bca3d
Merge pull request #7319 from open-sausages/pulls/3.5/no-combining-requirements
...
Fix add combinedFiles to clear logic - ss3
2017-08-29 13:47:52 +12:00
Christopher Joe
7b200a2a64
Fix add combinedFiles to clear logic
2017-08-29 12:57:41 +12: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
Damian Mooyman
52eb0bf214
Merge pull request #7306 from patricknelson/issue-7305-template-manifest-injector
...
NEW: Ability to override SS_TemplateManifest via Injector (fixes #7305 )
2017-08-24 13:41:08 +12:00
Patrick Nelson
fdd501182e
NEW: Ability to override SS_TemplateManifest via Injector ( fixes #7305 )
2017-08-23 17:34:07 -07: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
Damian Mooyman
7ad081a20b
Merge pull request #7288 from dhensby/pulls/3.5/write-no-change-edit
...
FIX Don't update LastEdited on skipped writes
2017-08-17 15:09:03 +12:00
Daniel Hensby
eb80a5f9e8
FIX LastEdited no longer updated on skipped writes
2017-08-16 23:39:22 +01:00
Daniel Hensby
1ae07ac2a3
TEST Prove LastEdited is updated when no changes are made
2017-08-16 22:26:47 +01:00
Daniel Hensby
23a726f385
Merge branch '3.6' into 3
2017-08-14 13:43:28 +01:00
Daniel Hensby
a3b72c500d
Merge branch '3.5' into 3.6
2017-08-14 12:55:09 +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
Damian Mooyman
9ea09376eb
Merge pull request #7250 from phptek/issue/7181
...
FIX: Fixes #7181 Use config system for userland config of node_threshold_total
2017-08-09 14:18:50 +12:00
Damian Mooyman
14d3567f90
Merge pull request #6871 from sminnee/better-sapphiretest-error
...
MINOR: Better error message in SapphireTest
2017-08-08 23:33:29 +12:00
Damian Mooyman
8df37e99d9
Merge pull request #7254 from johndalangin/7253-add-mysql-ssl-documentation
...
DOCS: Add SSL Documentation to docs (fixes #7253 )
2017-08-08 23:26:36 +12:00
Damian Mooyman
d07dc2b6f8
Merge pull request #7259 from johndalangin/origin/7258-fix-pdoconnector-bug
...
FIX: PDOConnector ssl_cipher bug fixes #7258
2017-08-08 23:25:47 +12:00
John
1a4a006d09
FIX: PDOConnector ssl_cipher bug fixes #7258
2017-08-08 18:00:06 +08:00
John
10bf2286a5
Add SSL Documentation to docs ( fixes #7253 )
2017-08-07 16:32:54 +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
Damian Mooyman
108080e320
Merge pull request #7243 from johndalangin/7242-add-mysqli-ssl-support
...
NEW Added SSL support for MySQLi Connector (fixes #7242 )
2017-08-04 09:44:32 +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
Daniel Hensby
723ae37b7d
Merge pull request #7233 from johndalangin/7077-add-mysql-pdo-ssl
...
NEW Added MySQL SSL PDO Support (fixes #7077 )
2017-08-03 12:20:51 +02: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
Damian Mooyman
69451790d6
Merge pull request #7224 from dhensby/pulls/3.5/spyc-composer
...
Move spyc dependency to composer
2017-08-02 16:19:00 +12:00
Daniel Hensby
6494bc820c
Move spyc dependency to composer
2017-07-28 13:35:30 +01:00
Damian Mooyman
9b378d8c08
Merge pull request #7213 from dhensby/pulls/3.5/fix-small-htmlfield
...
FIX Avoid JS errors for HTMLEditorFields in small holders
2017-07-28 13:25:31 +12:00
Daniel Hensby
d3f700e134
Merge pull request #6944 from Cheddam/fix/member-auth-edgecase
...
Fix Member Authentication Edgecase
2017-07-27 13:17:04 +01:00
Garion Herman
6ad19495a2
Add test coverage for auth failure after TempID expires.
2017-07-27 12:45:35 +01:00
Daniel Hensby
2e34730d3d
Merge pull request #7211 from kinglozzer/migrate-legacy-hashes-config
...
Fix: Use Config API for MemberAuthenticator::$migrate_legacy_hashes (fixes #7208 )
2017-07-26 11:21:51 +01:00
Daniel Hensby
31c5eebda0
FIX Avoid JS errors for HTMLEditorFields in small holders
2017-07-26 11:20:00 +01:00
Loz Calver
82c0632f46
Fix: Use Config API for MemberAuthenticator::$migrate_legacy_hashes ( fixes #7208 )
2017-07-26 09:54:29 +01:00
Daniel Hensby
4ca96eae48
Merge branch '3.6' into 3
2017-07-25 16:03:35 +01:00
Daniel Hensby
fc35eff13f
Merge branch '3.5' into 3.6
2017-07-25 16:02:56 +01:00
Daniel Hensby
ba8c149b78
Stay on travis precise dist for now
2017-07-25 16:02:02 +01:00
Chris Joe
3e8b636dc9
Merge pull request #6942 from open-sausages/pulls/3.4/fix-gridfield-state
...
BUG Ensure GridState_Component is added to GridField config
2017-07-21 10:54:07 +12:00
Klemen Dolinsek
3dd3036792
BUG Ensure GridState_Component is added to GridField config even if we set config with GridField::setConfig
...
Fixes #6886
2017-07-21 10:32:13 +12:00
Daniel Hensby
426f3a60c9
Merge pull request #7191 from matmunn/patch-1
...
Update 01_Linux_Unix.md
2017-07-20 09:48:44 +01:00
Mat Munn
7abc57d4c6
Update 01_Linux_Unix.md
...
Fixed a typo
2017-07-20 14:30:54 +10:00
Daniel Hensby
016e0e657a
Merge branch '3.6' into 3
2017-07-19 15:45:56 +01:00
Daniel Hensby
90be7e806d
Merge branch '3.5' into 3.6
2017-07-19 15:40:01 +01:00
Loz Calver
0c6851e597
Merge pull request #7190 from silverstripe/revert-7035-3.5
...
Revert "TreeDropDown performance boost."
2017-07-19 15:37:28 +01:00
Daniel Hensby
7b6aad8a65
Revert "TreeDropDown performance boost."
2017-07-19 12:44:43 +01:00
Daniel Hensby
292aaf6530
FIX Cache IDs grouped by site first
2017-07-19 11:29:01 +01:00
Damian Mooyman
d053c9aaac
Merge pull request #7186 from dhensby/pulls/3.5/cache-prefix
...
FIX Add unique prefix to cache stores to prevent cache leak
2017-07-19 11:54:49 +12:00
