tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.2' into 4

This commit is contained in:
Daniel Hensby 2018-07-30 17:11:42 +01:00
parent d0598c02c5 17dbb86257
commit 4d83330981
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
docs/en/04_Changelogs/4.2.1.md
View File

@ -10,3 +10,44 @@ behaviour to that of SilverStripe 3 where `Extension` instances are of lowest im
default value. If you rely on your `Extension` or module providing an overriding config value, please move this to yaml.
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### API Changes
* 2018-06-20 [9237636](https://github.com/silverstripe/silverstripe-asset-admin/commit/9237636bb8f07ee85e4afc8aecab5864dfbccd43) Deprecate Embeddable and EmbedResource, shift into silverstripe/framework (#795) (Robbie Averill)
### Features and Enhancements
* 2018-07-10 [158262c](https://github.com/silverstripe/silverstripe-admin/commit/158262caf25e97269590909e3934ff9054c24f35) Update PopoverField styles to match DSM designs (Robbie Averill)
* 2018-07-09 [ca7d48f](https://github.com/silverstripe/silverstripe-admin/commit/ca7d48f4ca6660e1318485bf3d1998e0c62122b2) Add button class names and toggle callback to PopoverField component (Robbie Averill)
* 2018-06-19 [7d90a14](https://github.com/silverstripe/silverstripe-framework/commit/7d90a14f3766a0be12af30a53d464979b75ea50d) Shift Embeddable and EmbedResource from asset-admin, lazy load Embed to allow injected dependencies (#8194) (Robbie Averill)
* 2018-06-18 [fbfd454](https://github.com/silverstripe/silverstripe-framework/commit/fbfd454d6557038ed9e152946ecfd55277ddd70c) Ensure test DB is flushed on either DDL or transaction-disabled tests (Damian Mooyman)
* 2018-06-15 [8181dc4](https://github.com/silverstripe/silverstripe-framework/commit/8181dc4fd285563cee92c879ad39ae0d3b64b838) Ensure extensions are told the internal item request class for gridfield detail form (#8164) (Damian Mooyman)
* 2018-04-18 [3561466](https://github.com/silverstripe/recipe-core/commit/3561466e5ea479ee5602451d9fe2240a952ed56a) Provide default IIS rewriting rules with recipe (Damian Mooyman)
### Bugfixes
* 2018-07-18 [e415bcb](https://github.com/silverstripe/silverstripe-framework/commit/e415bcb44a32e0f64f6c0a18b0afc97f0eb9edde) tests on unset session data (Ingo Schommer)
* 2018-07-18 [93b0884](https://github.com/silverstripe/silverstripe-framework/commit/93b0884e196fefe79ef7fdee9b9e3e6cfdf46cd4) Lazy session state (fixes #8267) (Ingo Schommer)
* 2018-07-14 [a0e0bed](https://github.com/silverstripe/recipe-core/commit/a0e0bed7e7fe83b98264563efdeffa82d0d01d04) Use Injector to create PasswordValidators (Daniel Hensby)
* 2018-07-14 [8703839](https://github.com/silverstripe/silverstripe-framework/commit/8703839eb142ba0414f4d84f885ff898c39d6786) updateValidatePassword calls need to be masked from backtraces (Daniel Hensby)
* 2018-07-12 [e80c7e7](https://github.com/silverstripe/silverstripe-cms/commit/e80c7e712b916712d4ec7b6b8359ccf71dc9da04) Restore button now has warning colour and correct icon (Robbie Averill)
* 2018-07-12 [d122995](https://github.com/silverstripe/silverstripe-framework/commit/d1229956523d69f63c9e725b261c0142d5ee1de3) Duplicate config values for cascade_duplicates no longer duplicate their duplicates (Robbie Averill)
* 2018-07-10 [45e1f5e](https://github.com/silverstripe/silverstripe-asset-admin/commit/45e1f5e17746386d66b068ab0965252e3006baa3) Making subsite extension illegal to ensure tests pass with Subsites (Guy Marriott)
* 2018-07-05 [399ebd0](https://github.com/silverstripe/silverstripe-framework/commit/399ebd003112c850c44e15d7d6ac5ec973eae226) If theres a max-age set remove no-cache and no-store (Daniel Hensby)
* 2018-07-05 [92f5ef3](https://github.com/silverstripe/silverstripe-framework/commit/92f5ef31d89b792ab29d84371a6be47869ccab73) Allow setNoCache(false) to remove no-cache directive (Daniel Hensby)
* 2018-07-05 [18b7dc2](https://github.com/silverstripe/silverstripe-framework/commit/18b7dc235a8dfbf03fa450ef444bd520f0e05e51) Add must-revalidate to default state so its common on all our core states (Daniel Hensby)
* 2018-07-05 [9e829c1](https://github.com/silverstripe/silverstripe-framework/commit/9e829c1607b72efd75f2f942631c8a48c324ee7f) Allow cache control changes to affect default state (Daniel Hensby)
* 2018-06-26 [560fe98](https://github.com/silverstripe/silverstripe-framework/commit/560fe9820a51eb3001dafdc1e34806434392a3e3) remove personal information from password reset confirmation screen (Daniel Hensby)
* 2018-06-24 [b93e94c](https://github.com/silverstripe/silverstripe-framework/commit/b93e94c0c38b954e16cf775f7f1d1cd60cbfd703) FormField::Link now throws a LogicException if no form is set yet (Robbie Averill)
* 2018-06-21 [27b60ae](https://github.com/silverstripe/silverstripe-framework/commit/27b60ae989e7c288dc332a583f70c25bb528543f) Transaction depth should error if not implemented by child classes (Daniel Hensby)
* 2018-06-19 [725212a](https://github.com/silverstripe/silverstripe-framework/commit/725212a707f6b724aff6548c3680b2cd66e9a6bb) Allow dispatcher in Embed to be configured with injector (#8192) (Robbie Averill)
* 2018-06-18 [3f80e2d](https://github.com/silverstripe/silverstripe-framework/commit/3f80e2dc6789251a61b0867291c103d3b1f5c517) Don't reload form session data using FormField::setSubmittedValue… (#8184) (Maxime Rainville)
* 2018-06-18 [e4ef83b](https://github.com/silverstripe/silverstripe-framework/commit/e4ef83bd2a7599c408ba77b3665f522f84ff8063) Default cache state should be `no-cache` (Daniel Hensby)
* 2018-06-18 [a116b5d](https://github.com/silverstripe/silverstripe-framework/commit/a116b5dad805ed8deec6e86aec2618b89c8e0ca4) FIx manual resetDBSchema() calls breaking the database (Damian Mooyman)
* 2018-06-18 [f2c2ded](https://github.com/silverstripe/silverstripe-framework/commit/f2c2ded27f8ea931c913174a040242169bdd4b52) Ensure that build includes extra classes (Damian Mooyman)
* 2018-06-13 [932eb2b](https://github.com/silverstripe/silverstripe-cms/commit/932eb2b22dfe6c30473b1cf973661c28c5b9c635) Fix CMS components failing to register on other CMS sections (#2182) (Damian Mooyman)
* 2018-06-11 [555b168](https://github.com/silverstripe/silverstripe-versioned/commit/555b1687571b76f4f022e3a3f4475eb1f2b9a23b) Prevent custom item handler from being overridden (Damian Mooyman)
* 2018-05-21 [bf5b578](https://github.com/silverstripe/silverstripe-admin/commit/bf5b5787685765c35c175c303f3f7ee719ac9453) Adding a min-width to flexbox-area-grow that allows flex blocks to shrink below their content width (Guy)
* 2018-03-29 [4acec33](https://github.com/silverstripe/silverstripe-framework/commit/4acec33562e4e1230092eee7d76c2b8061ffc914) Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important (Daniel Hensby)

5
lang/en.yml
View File

@ -84,7 +84,6 @@ en:
RelationSearch: 'Relation search'
ResetFilter: Reset
SilverStripe\Forms\GridField\GridFieldDeleteAction:
DELETE_DESCRIPTION: Delete
Delete: Delete
DeletePermissionsFailure: 'No delete permissions'
EditPermissionsFailure: 'No permission to unlink record'
@ -96,7 +95,7 @@ en:
DeletePermissionsFailure: 'No delete permissions'
Deleted: 'Deleted {type} {name}'
Save: Save
SilverStripe\Forms\GridField\GridFieldEditButton_ss:
SilverStripe\Forms\GridField\GridFieldEditButton:
EDIT: Edit
SilverStripe\Forms\GridField\GridFieldViewButton:
VIEW: View
@ -152,6 +151,8 @@ en:
other: '{count} years'
SilverStripe\ORM\FieldType\DBEnum:
ANY: Any
SilverStripe\ORM\FieldType\DBForeignKey:
DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Too many related objects; fallback field in use'
SilverStripe\ORM\Hierarchy:
LIMITED_TITLE: 'Too many children ({count})'
SilverStripe\ORM\Hierarchy\Hierarchy:

2
src/Forms/GridField/GridFieldConfig_RecordEditor.php
View File

@ -22,7 +22,7 @@ class GridFieldConfig_RecordEditor extends GridFieldConfig
$this->addComponent($filter = new GridFieldFilterHeader());
$this->addComponent(new GridFieldDataColumns());
$this->addComponent(new GridFieldEditButton());
$this->addComponent(new GridFieldDeleteAction(true));
$this->addComponent(new GridFieldDeleteAction());
$this->addComponent(new GridField_ActionMenu());
$this->addComponent(new GridFieldPageCount('toolbar-header-right'));
$this->addComponent($pagination = new GridFieldPaginator($itemsPerPage));