Commit Graph

18956 Commits

Author SHA1 Message Date
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
Daniel Hensby
ecca05cc7f
Add caching to travis 2017-07-26 17:16:21 +01:00
Daniel Hensby
1046065625
Only install deps once we have a final set of requirements 2017-07-26 17:16:20 +01:00
martimiz
b726d64d1d
Fix SearchEngine to use quoted table names
If quotes are omitted, SQLExpression::sql() cannot replace table names
with the proper table for the current Stage.
2017-07-26 13:42:41 +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
Damian Mooyman
9bff74bd61
Clean up all fluent property accessors 2017-07-26 18:14:27 +12:00
Christopher Joe
78d4d0d5dd Enhancement add support for TreeMultiselectField in react 2017-07-26 18:14:08 +12:00
Daniel Hensby
884f53e0f2
Merge branch '3' into 4 2017-07-25 16:17:44 +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
Damian Mooyman
a8187a3203 Merge pull request #7196 from open-sausages/pulls/4.0/search-default-listview
Add step definition for cms list
2017-07-25 12:08:06 +12:00
Damian Mooyman
f6a5133c2f
Consolidate behat context code 2017-07-25 11:46:40 +12:00
Damian Mooyman
2c500c79c3 Merge pull request #7201 from kinglozzer/build-perf
Ensure ClassManifest isn't flushed twice on build
2017-07-25 09:51:00 +12:00
Daniel Hensby
6aeab571db Merge pull request #7195 from open-sausages/pulls/4.0/missing-unnested-from
BUG Fix unassigned nestedFrom
2017-07-24 17:07:07 +01:00
Loz Calver
ad2e1cf552 Ensure ClassManifest isn't flushed twice on build 2017-07-24 09:36:03 +01:00
Damian Mooyman
4a4d4d079f Merge pull request #7203 from dhensby/pulls/4/rename-test-helper
Rename badly named test helper
2017-07-24 10:27:56 +12:00
Damian Mooyman
40d7fae629 Merge pull request #7200 from dhensby/pulls/4/yml-syntax
FIX Deprecated yml syntax
2017-07-24 10:23:12 +12:00
Damian Mooyman
43f5a1fd7e Merge pull request #7197 from robbieaverill/pulls/4.0/add-updaterules-extension
NEW Add updateRules extension point to Director::handleRequest
2017-07-24 10:18:48 +12:00
Robbie Averill
392cda15f6 NEW Add updateRules extension point to Director::handleRequest 2017-07-23 22:10:46 +12:00
Daniel Hensby
4a1fb37d0f
Rename badly named test helper 2017-07-21 15:59:14 +01:00
Daniel Hensby
5bf9ccc235
FIX Deprecated yml syntax 2017-07-21 15:41:44 +01:00
Daniel Hensby
43620129c0 Merge pull request #7198 from open-sausages/pulls/4.0/fix-config-rules
BUG fix config rules to match updated `Except`
2017-07-21 15:23:33 +01:00
Damian Mooyman
d5ab45990d Lock travis to precise 2017-07-21 22:21:14 +12:00
Damian Mooyman
2385b73855
BUG fix config rules to match updated Except 2017-07-21 15:02:27 +12:00
Chris Joe
6a3c51e072 Merge pull request #7036 from fullscreeninteractive/wilr-patch-1
Fix ImportButton not opening the modal
2017-07-21 14:10:31 +12:00
Saophalkun Ponlu
98e77ec1c4 Add step definition for cms list 2017-07-21 12:20:54 +12:00
Damian Mooyman
4af84a2f61 Merge pull request #7192 from dhensby/pulls/4/bootstrap-simplified
Remove EnvironmentType Env var setting for test bootstrap
2017-07-21 11:21:55 +12: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
Damian Mooyman
6fd6a38949
BUG Fix unassigned nestedFrom
Fixes #7194
2017-07-21 08:58:19 +12:00