Commit Graph

16527 Commits

Author SHA1 Message Date
Daniel Hensby
b49d1d7fbd
Merge branch '3.6' into 3 2017-09-28 17:17:19 +01:00
Daniel Hensby
e81b503441
Merge branch '3.5' into 3.6 2017-09-28 17:17:04 +01:00
Daniel Hensby
f95c818f3c
Merge tag '3.6.2' into 3.6
Release 3.6.2
2017-09-28 17:17:00 +01:00
Daniel Hensby
f745442a55
Merge tag '3.5.5' into 3.5
Release 3.5.5
2017-09-28 17:16:31 +01:00
Daniel Hensby
3f5ddc7d00
Added 3.6.2 changelog 2017-09-28 16:05:53 +00:00
Daniel Hensby
393d1a9be6
Added 3.5.5 changelog 2017-09-28 15:37:07 +00:00
Daniel Hensby
29300c2c2d
Merge remote-tracking branch 'security/3.5.5' into HEAD 2017-09-28 15:48:29 +01:00
Daniel Hensby
6e78b9f8d2
Merge pull request #7406 from NightJar/patch-2
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 4998b80#diff-6ba746c3d31fd6b4c4a99d7efe35eb21L442

To solve this issue we simply first assign the constant to a variable, so we can then pass that by reference. This has no functional impact, however fixes an issue for users locked in to old PHP versions which we still list as supported (https://docs.silverstripe.org/en/3/getting_started/server_requirements/#web-server-software-requirements).
2017-09-28 15:46:38 +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)

To solve this issue we simply first assign the constant to a variable, so we can then pass that by reference. This has no functional impact, however fixes an issue for users locked in to old PHP versions which we still list as supported (https://docs.silverstripe.org/en/3/getting_started/server_requirements/#web-server-software-requirements).
2017-09-28 15:29:54 +01:00
Daniel Hensby
4ed0857127 Merge pull request #7396 from danielmcclure/patch-1
Updated Minimum Default PHP Version
2017-09-22 09:36:44 +01:00
Daniel McClure
d1cd3b7d49 Updated Minimum Default PHP Version 2017-09-22 17:33:35 +12:00
Daniel Hensby
b4412cedf6
Added 3.6.2-beta2 changelog 2017-09-21 09:11:36 +00:00
Daniel Hensby
bd7abc73de
Merge branch '3.5.5' into 3.6.2 2017-09-20 16:26:30 +01:00
Daniel Hensby
1209b2ae13
Added 3.5.5-beta2 changelog 2017-09-20 13:41:04 +00:00
Daniel Hensby
72702dbd50 Merge pull request #43 from silverstripe-security/pulls/3.5/member-enumeration-timing-attack
[SS-2017-005] User enumeration via timing attack mitigated
2017-09-20 11:39:39 +01:00
Daniel Hensby
6b198336a8 Merge pull request #44 from silverstripe-security/patch/3.5/authenticator-fix
FIX Authenticators are more resilient to incomplete configuration
2017-09-20 11:38:38 +01:00
Daniel Hensby
f0262a8fd9
[SS-2017-005] User enumeration via timing attack mitigated 2017-09-20 11:33:22 +01:00
Daniel Hensby
fc79a76718
Added 3.6.2-beta1 changelog 2017-09-19 16:51:57 +00:00
Daniel Hensby
1f256cf2d2
Added 3.5.5-beta1 changelog 2017-09-19 15:25:41 +00:00
Daniel Hensby
091d99f599
FIX Authenticators are more resilient to incomplete configuration 2017-09-12 15:57:03 +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
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