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
19,689 Commits 31 Branches 527 Tags 162 MiB
26c3e224db
Commit Graph

19689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Damian Mooyman
8418011456
Fix linting issues 2017-08-02 14:08:59 +12:00
Damian Mooyman
1867ee82c4
Sync with transifex 2017-08-02 13:16:53 +12:00
Robbie Averill
e307f067ed FIX Replace deprecated %s placeholders in translations with named placeholders 
* Remove the use of sprintf and %s placeholders in the i18n tests
 2017-08-02 13:03:55 +12:00
Chris Joe
73eb82f2b1 Merge pull request #7230 from open-sausages/pulls/4.0/fix-behat-wait 
BUG Fix ajax loading wait for behat tests
 2017-08-02 12:09:49 +12:00
Chris Joe
04c46aed6c Merge pull request #7227 from open-sausages/pulls/4.0/form-injector-state-awareness 
Documentation updates for new Injector / FormStateManager API
 2017-08-02 11:51:06 +12:00
Damian Mooyman
6853204504
BUG Fix ajax loading wait for behat tests 
Requires https://github.com/silverstripe/silverstripe-behat-extension/pull/169
 2017-08-02 10:53:57 +12:00
Chris Joe
f36f085d9f Merge pull request #7228 from open-sausages/pulls/4.0/tinymce-compressor 
API Replace legacy tiny_mce_gzip compressor with asset generator
 2017-08-01 16:52:29 +12:00
Damian Mooyman
ae97c15e42
ENHANCEMENT Soft-code CSS explicit height and compute against rows 2017-08-01 15:46:49 +12:00
Damian Mooyman
078a508d71 API Replace legacy tiny_mce_gzip compressor with asset generator 
Fixes https://github.com/silverstripe/silverstripe-admin/issues/74
 2017-08-01 13:43:30 +12:00
Chris Joe
f05d456b84 Merge pull request #7054 from ssmarco/bugfix/1831-TinyMCE-WYSIWYG-loses-height 
Initially set a default height for the html editor to 350px
 2017-07-31 21:33:00 +12:00
Aaron Carlino
dd189b917e Documentation updates for new Injector / FormStateManager API 2017-07-31 16:55:44 +12:00
vagrant
f02949fc09 Initially set a default height for the html editor to 350px 2017-07-31 16:49:48 +12:00
Damian Mooyman
9392380dd1 Merge pull request #7225 from silverstripe/pulls/4.0/injector-extension-setters 
Use ClassInfo::hasMethod instead of method_exists()
 2017-07-31 10:23:10 +12:00
Damian Mooyman
90f6710020 Merge pull request #7219 from silverstripe/pulls/4.0/dbcomposite-properties 
BUGFIX: DBComposite doesn't allow arbitrary property assignment
 2017-07-31 10:11:58 +12:00
Aaron Carlino
c9cf7b1d75 Use ClassInfo::hasMethod instead of method_exists() 
This allows for setters to exist in extension instances.
 2017-07-30 22:43:28 +12:00
Aaron Carlino
9903104fb8 Use parent::setField() 2017-07-30 22:39:42 +12:00
Daniel Hensby
6494bc820c
Move spyc dependency to composer 2017-07-28 13:35:30 +01:00
Daniel Hensby
1a4211f089 Merge pull request #7222 from kinglozzer/showqueries-pdo 
FIX: ?showqueries=inline failed on PDO databases (fixes #7199)
 2017-07-28 10:23:57 +01:00
Loz Calver
980d6b7ef7 FIX: ?showqueries=inline failed on PDO databases (fixes #7199) 2017-07-28 09:33:26 +01:00
Chris Joe
1cf644c00a Merge pull request #7221 from open-sausages/pulls/4.0/select-the-black-behat 
Fix add function for selecting a value in the new tree dropdown
 2017-07-28 14:27:19 +12:00
Damian Mooyman
a85bc86fd3
Fix behat tree dropdown trigger 2017-07-28 13:52:02 +12: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
Christopher Joe
4e222fc189 Fix add function for selecting a value in the new tree dropdown in behat using react 2017-07-28 11:59:53 +12:00
Damian Mooyman
28eeb6bd9d
Add missing $extraClass to FormField_holder_small.ss 
Fixes #3260
 2017-07-28 10:11:17 +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
Aaron Carlino
3ef9ca69d1 BUGFIX: DBComposite doesn't allow arbitrary property assignment 
To be more consistent with `ViewableData`, whose `setField()` method will fallback on [assigning properties arbitrarily](https://github.com/silverstripe/silverstripe-framework/blob/4/src/View/ViewableData.php#L213), `DBComposite` shouldn't bail out of `setField` when the field specified isn't in the record.

Arbitrary property assignment is particularly important in injection.

```yaml
SilverStripe\ORM\FieldType\DBComposite:
  dependencies:
    myService: %$Service
```

Right now, that fails, because `$obj->myService = Service` invokes `__set()` which calls `setField()` which refuses the assignment when `myService`is not in the record.
 2017-07-27 17:25:29 +12:00
Damian Mooyman
697798b464 Merge pull request #7206 from open-sausages/pulls/4.0/select-them-all-again 
Enhancement add support for TreeMultiselectField in react
 2017-07-27 13:41:18 +12:00
Damian Mooyman
7bcfde871b Merge pull request #7209 from open-sausages/pulls/4.0/model-admin-search-party 
FEATURE: New getSummary() API for SearchContext
 2017-07-27 12:51:50 +12:00
Damian Mooyman
7f6974e309
Update PHPDoc 2017-07-27 12:08:42 +12:00
Damian Mooyman
47f24ce05b
Fixup test linting 2017-07-27 12:05:27 +12:00
Aaron Carlino
74873096bd New getSummary() API for SearchContext 2017-07-27 11:56:37 +12:00
Damian Mooyman
18863f0916 Merge pull request #7171 from Martimiz/fixSearchEngine 
Fix SearchEngine to use quoted table names
 2017-07-27 10:38:41 +12:00
Damian Mooyman
834b25fe69 Merge pull request #7216 from dhensby/pulls/4/travis-cache 
Optimise travis composer installation
 2017-07-27 10:34:04 +12:00
Daniel Hensby
92bc069b58
only save composer cache 2017-07-26 17:36:39 +01:00