Commit Graph

19223 Commits

Author SHA1 Message Date
Daniel Hensby
a3b72c500d
Merge branch '3.5' into 3.6 2017-08-14 12:55:09 +01:00
Chris Joe
388ff1df74 Merge pull request #7273 from open-sausages/pulls/4.0/recipe-info
Provide information related to recipe
2017-08-14 23:06:40 +12: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
Saophalkun Ponlu
29cb4f2f07 Provide information related to recipe 2017-08-14 10:24:48 +12:00
Chris Joe
b0af45231a Merge pull request #7257 from open-sausages/pulls/4.0/cascade-deletes
API Implement cascade_deletes
2017-08-09 16:07:02 +12:00
Damian Mooyman
323644c7bb
API Implement cascade_deletes 2017-08-09 15:14:00 +12:00
Damian Mooyman
4572b01068 Merge pull request #7255 from robbieaverill/pulls/4.0/index-columns-docs-and-exception
FIX Throw exception when "value" is used to define indexes. Update docs.
2017-08-09 14:24:29 +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
Robbie Averill
5d5fac7450 FIX Throw exception when "value" is used to define indexes. Update docs. 2017-08-09 09:17:28 +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
Damian Mooyman
364a14da1d Merge pull request #7248 from open-sausages/pulls/4.0/remove-3.0-api-docs
MINOR: Clean up code references in docs
2017-08-08 09:41:29 +12:00
Damian Mooyman
b26f1b0cc8 Merge pull request #7252 from open-sausages/pull/4.0/no-in-ten-tion
Fix reference to IE10 when it should be IE11
2017-08-08 09:27:34 +12:00
John
10bf2286a5 Add SSL Documentation to docs (fixes #7253) 2017-08-07 16:32:54 +08:00
Christopher Joe
c164fcfe54 Fix reference to IE10 when it should be IE11 2017-08-07 15:39:08 +12:00
Aaron Carlino
50c8a02bff remove tabs 2017-08-07 15:11:17 +12:00
Damian Mooyman
73e1919b8f Added 4.0.0-beta2 changelog 2017-08-07 15:08:32 +12:00
Aaron Carlino
5d6b7c85d7 Deprecate SS_TemplateManifest 2017-08-07 14:51:27 +12:00
Damian Mooyman
d0814c0766 Added 4.0.0-beta2 changelog 2017-08-07 14:50:49 +12:00
Damian Mooyman
e61163ce7f Update translations 2017-08-07 14:34:14 +12:00
Aaron Carlino
e4935123d8 Remove a few more references 2017-08-07 14:01:38 +12:00
Aaron Carlino
6c0629f025 Remove more deprecated APIs 2017-08-07 14:01:38 +12:00
Aaron Carlino
e4fba5a7b1 add use statements 2017-08-07 14:01:38 +12:00
Aaron Carlino
84feab5a68 Yeah psr2 functions 2017-08-07 14:01:38 +12:00
Aaron Carlino
4c7a068b28 classes psr2 2017-08-07 14:01:38 +12:00
Aaron Carlino
2414eaeafd Yay, clean arrays 2017-08-07 14:01:38 +12:00
Aaron Carlino
eb1695c03d Replace all legacy ::: syntax with GFMD tags 2017-08-07 14:01:38 +12:00
Aaron Carlino
16407b9185 first pass 2017-08-07 14:01:38 +12:00
Damian Mooyman
0681567102 BUG Fix flushing on live mode (#7241)
* BUG Fix flushing on live mode
Fixes #7217

* Clarify injector service documentation
2017-08-07 13:53:23 +12: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
Chris Joe
4dbc2a99e5 Merge pull request #7246 from open-sausages/pulls/4.0/fix-iis
BUG Fix install issue with IIS
2017-08-07 10:44:17 +12:00
Damian Mooyman
f7bebdd8f8
BUG Fix install issue with IIS
Fixes #7218
2017-08-07 10:15:40 +12:00
Chris Joe
f754efd21d Merge pull request #7220 from open-sausages/pulls/4.0/field-small-classes
Add missing $extraClass to FormField_holder_small.ss
2017-08-04 10:02:50 +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
Chris Joe
6ebc333e00 Merge pull request #7238 from open-sausages/pulls/4.0/flush-tinymce-cache
ENHANCEMENT Ensure flush destroys temp tinymce files
2017-08-03 19:13:54 +12:00
Chris Joe
479102bb30 Merge pull request #7240 from open-sausages/pulls/4.0/fix-security-missing-request
BUG Ensure mocked controller has request assigned
2017-08-03 19:07:58 +12:00
John
a3678c73b9 Refactor code to decouple SSL feature from MySQL PDO 2017-08-03 13:22:58 +08:00
Damian Mooyman
b6a8e45888
BUG Ensure mocked controller has request assigned
Fixes #7237
2017-08-03 15:52:31 +12:00
Damian Mooyman
06efd2ac12
ENHANCEMENT Ensure flush destroys temp tinymce files 2017-08-03 13:21:48 +12:00
Chris Joe
34ca944bd6 Merge pull request #7235 from open-sausages/pulls/4.0/update-installer
Update installer path to match recipe
2017-08-03 10:58:58 +12:00
Chris Joe
42d01a9275 Merge pull request #7236 from open-sausages/pulls/4.0/fix-i18n-loginattempt
BUG Fix invalid i18n yaml
2017-08-03 10:58:45 +12:00
Damian Mooyman
e64acef53a BUG Fix invalid i18n yaml 2017-08-03 10:13:09 +12:00
Damian Mooyman
24ab3abbea
Update installer path to match recipe 2017-08-03 10:02:55 +12: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
Damian Mooyman
772cd4a578 Merge pull request #6598 from robbieaverill/bugfix/remove-sprintf-in-translations
FIX Replace deprecated %s placeholders in translations with named placeholders
2017-08-02 14:39:58 +12:00