Merge remote-tracking branch 'origin/3'

# Conflicts:
#	.travis.yml
#	.tx/config
#	_config/database.yml
#	admin/code/LeftAndMain.php
#	admin/code/ModelAdmin.php
#	admin/code/SecurityAdmin.php
#	admin/javascript/jquery-changetracker/lib/jquery.changetracker.js
#	admin/javascript/lang/cs.js
#	admin/javascript/lang/de.js
#	admin/javascript/lang/eo.js
#	admin/javascript/lang/es.js
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/fi.js
#	admin/javascript/lang/fr.js
#	admin/javascript/lang/hr.js
#	admin/javascript/lang/id.js
#	admin/javascript/lang/id_ID.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/ja.js
#	admin/javascript/lang/lt.js
#	admin/javascript/lang/mi.js
#	admin/javascript/lang/nb.js
#	admin/javascript/lang/nl.js
#	admin/javascript/lang/pl.js
#	admin/javascript/lang/ro.js
#	admin/javascript/lang/ru.js
#	admin/javascript/lang/sk.js
#	admin/javascript/lang/sl.js
#	admin/javascript/lang/sl_SI.js
#	admin/javascript/lang/sr.js
#	admin/javascript/lang/sr@latin.js
#	admin/javascript/lang/sr_RS.js
#	admin/javascript/lang/sr_RS@latin.js
#	admin/javascript/lang/src/cs.js
#	admin/javascript/lang/src/de.js
#	admin/javascript/lang/src/eo.js
#	admin/javascript/lang/src/es.js
#	admin/javascript/lang/src/fa_IR.js
#	admin/javascript/lang/src/fi.js
#	admin/javascript/lang/src/fr.js
#	admin/javascript/lang/src/hr.js
#	admin/javascript/lang/src/id.js
#	admin/javascript/lang/src/id_ID.js
#	admin/javascript/lang/src/it.js
#	admin/javascript/lang/src/ja.js
#	admin/javascript/lang/src/lt.js
#	admin/javascript/lang/src/mi.js
#	admin/javascript/lang/src/nb.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/src/pl.js
#	admin/javascript/lang/src/ro.js
#	admin/javascript/lang/src/ru.js
#	admin/javascript/lang/src/sk.js
#	admin/javascript/lang/src/sl.js
#	admin/javascript/lang/src/sl_SI.js
#	admin/javascript/lang/src/sr.js
#	admin/javascript/lang/src/sr@latin.js
#	admin/javascript/lang/src/sr_RS.js
#	admin/javascript/lang/src/sr_RS@latin.js
#	admin/javascript/lang/src/sv.js
#	admin/javascript/lang/src/zh.js
#	admin/javascript/lang/sv.js
#	admin/javascript/lang/zh.js
#	admin/templates/Includes/ModelAdmin_Content.ss
#	composer.json
#	control/HTTPRequest.php
#	core/Config.php
#	core/Core.php
#	core/Diff.php
#	core/Object.php
#	core/PaginatedList.php
#	core/TempPath.php
#	core/manifest/ConfigStaticManifest.php
#	dev/Profiler.php
#	docs/en/00_Getting_Started/00_Server_Requirements.md
#	docs/en/00_Getting_Started/03_Environment_Management.md
#	docs/en/02_Developer_Guides/01_Templates/03_Requirements.md
#	docs/en/02_Developer_Guides/07_Debugging/03_Template_debugging.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	filesystem/File.php
#	filesystem/GD.php
#	filesystem/ImagickBackend.php
#	filesystem/Upload.php
#	forms/DatetimeField.php
#	forms/FormField.php
#	forms/GroupedDropdownField.php
#	forms/TabSet.php
#	forms/gridfield/GridFieldFilterHeader.php
#	javascript/lang/es.js
#	javascript/lang/src/es.js
#	lang/af.yml
#	lang/ar.yml
#	lang/az.yml
#	lang/bg.yml
#	lang/bs.yml
#	lang/ca.yml
#	lang/cs.yml
#	lang/de.yml
#	lang/en.yml
#	lang/eo.yml
#	lang/es.yml
#	lang/es_AR.yml
#	lang/es_MX.yml
#	lang/et_EE.yml
#	lang/fa_IR.yml
#	lang/fi.yml
#	lang/fo.yml
#	lang/fr.yml
#	lang/gl_ES.yml
#	lang/he_IL.yml
#	lang/hr.yml
#	lang/hu.yml
#	lang/id.yml
#	lang/id_ID.yml
#	lang/is.yml
#	lang/it.yml
#	lang/ja.yml
#	lang/lt.yml
#	lang/lv.yml
#	lang/mi.yml
#	lang/ms.yml
#	lang/nb.yml
#	lang/ne.yml
#	lang/nl.yml
#	lang/pl.yml
#	lang/pt.yml
#	lang/pt_BR.yml
#	lang/ro.yml
#	lang/ru.yml
#	lang/si.yml
#	lang/sk.yml
#	lang/sl.yml
#	lang/sl_SI.yml
#	lang/sr.yml
#	lang/sr@latin.yml
#	lang/sr_RS.yml
#	lang/sr_RS@latin.yml
#	lang/sv.yml
#	lang/th.yml
#	lang/tr.yml
#	lang/uk.yml
#	lang/zh.yml
#	lang/zh_CN.yml
#	lang/zh_TW.yml
#	model/DataDifferencer.php
#	model/DataQuery.php
#	model/Image.php
#	model/ManyManyList.php
#	model/connect/DBSchemaManager.php
#	model/connect/PDOConnector.php
#	model/fieldtypes/Bigint.php
#	model/fieldtypes/DBFloat.php
#	model/fieldtypes/DBInt.php
#	model/fieldtypes/Double.php
#	model/fieldtypes/ForeignKey.php
#	model/fieldtypes/PrimaryKey.php
#	parsers/HTML/HTMLBBCodeParser.php
#	security/Member.php
#	security/MemberAuthenticator.php
#	security/RandomGenerator.php
#	security/Security.php
#	tests/control/CookieTest.php
#	tests/control/HTTPRequestTest.php
#	tests/core/CoreTest.php
#	tests/filesystem/UploadTest.php
#	tests/forms/FormFieldTest.php
#	tests/forms/FormTest.php
#	tests/forms/GroupedDropdownFieldTest.php
#	tests/forms/HtmlEditorFieldToolbarTest.php
#	tests/forms/RequirementsTest.php
#	tests/model/DBFieldTest.php
#	tests/model/DataObjectTest.php
#	tests/model/ManyManyListTest.php
#	tests/model/VersionableExtensionsTest.php
#	tests/model/VersionedTest.php
#	tests/parsers/ShortcodeParserTest.php
#	tests/security/MemberAuthenticatorTest.php
#	tests/security/MemberTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	thirdparty/simpletest/encoding.php
#	thirdparty/simpletest/page.php
#	thirdparty/simpletest/tag.php
#	thirdparty/spyc/spyc.php
#	thirdparty/tinymce-spellchecker/classes/SpellChecker.php
#	thirdparty/tinymce-spellchecker/classes/utils/JSON.php
#	thirdparty/tinymce-spellchecker/classes/utils/Logger.php
#	thirdparty/tinymce/tiny_mce.js
#	thirdparty/tinymce/tiny_mce_gzip.php
#	thirdparty/tinymce/tiny_mce_src.js
#	view/Requirements.php
#	view/SSViewer.php
#	view/ViewableData.php
This commit is contained in:
Damian Mooyman 2017-06-27 13:27:14 +12:00
commit 0ed1750106
10 changed files with 228 additions and 0 deletions

View File

@ -194,6 +194,22 @@ Sample implementation of a custom loader. Assumes a CSV-file in a certain format
}
}
?>
Building off of the ModelAdmin example up top, use a custom loader instead of the default loader by adding it to `$model_importers`. In this example, `CsvBulkLoader` is replaced with `PlayerCsvBulkLoader`.
:::php
<?php
class PlayerAdmin extends ModelAdmin {
private static $managed_models = array(
'Player'
);
private static $model_importers = array(
'Player' => 'PlayerCsvBulkLoader',
);
private static $url_segment = 'players';
}
?>
## Related

View File

@ -0,0 +1,19 @@
# 3.4.6
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### Security
* 2017-05-24 [41270fc](https://github.com/silverstripe/silverstripe-cms/commit/41270fcf9980c4be2529d2750c717675548eb617) Only allow HTTP(S) links for external redirector pages (Daniel Hensby) - See [ss-2017-003](http://www.silverstripe.org/download/security-releases/ss-2017-003)
* 2017-05-09 [447ce0f](https://github.com/silverstripe/silverstripe-framework/commit/447ce0f84f880c2bc969a89e4be528c53caeabe0) Lock out users who dont exist in the DB (Daniel Hensby) - See [ss-2017-002](http://www.silverstripe.org/download/security-releases/ss-2017-002)
* 2017-05-09 [61cf72c](https://github.com/silverstripe/silverstripe-cms/commit/61cf72c08dafddef416d73f943ccd45e70c5d43d) Unescaped fields in CMSPageHistroyController::compare() (Daniel Hensby) - See [ss-2017-004](http://www.silverstripe.org/download/security-releases/ss-2017-004)
### Bugfixes
* 2017-05-28 [16a74bc](https://github.com/silverstripe/silverstripe-framework/commit/16a74bc8a9fdee7cfb4f6f24493c271f90a76341) DataDifferencer needs to expliclty cast HTMLText values (Daniel Hensby)
* 2017-05-03 [2d138b0](https://github.com/silverstripe/silverstripe-framework/commit/2d138b0ef06bd93958cc0678a0afa95560648fb9) class name reference consistency (Gregory Smirnov)
* 2017-04-24 [1d36f35](https://github.com/silverstripe/silverstripe-framework/commit/1d36f354e8349616c7b39fcade859fbcf0f9c362) Create Image_Cached with Injector. (Gregory Smirnov)
* 2017-02-15 [3072591](https://github.com/silverstripe/silverstripe-framework/commit/30725916dbb0ffc66b77f26c069a86581636ae55) Array to string conversion message after CSV export (#6622) (Juan van den Anker)
* 2017-02-14 [7122e1f](https://github.com/silverstripe/silverstripe-framework/commit/7122e1fde79bdb9aad3c8714a6ce02b7ecedd735) Comments ignored by classmanifest (#6619) (Daniel Hensby)

View File

@ -0,0 +1,28 @@
# 3.5.4
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### Security
* 2017-05-24 [41270fc](https://github.com/silverstripe/silverstripe-cms/commit/41270fcf9980c4be2529d2750c717675548eb617) Only allow HTTP(S) links for external redirector pages (Daniel Hensby) - See [ss-2017-003](http://www.silverstripe.org/download/security-releases/ss-2017-003)
* 2017-05-09 [447ce0f](https://github.com/silverstripe/silverstripe-framework/commit/447ce0f84f880c2bc969a89e4be528c53caeabe0) Lock out users who dont exist in the DB (Daniel Hensby) - See [ss-2017-002](http://www.silverstripe.org/download/security-releases/ss-2017-002)
* 2017-05-09 [61cf72c](https://github.com/silverstripe/silverstripe-cms/commit/61cf72c08dafddef416d73f943ccd45e70c5d43d) Unescaped fields in CMSPageHistroyController::compare() (Daniel Hensby) - See [ss-2017-004](http://www.silverstripe.org/download/security-releases/ss-2017-004)
### Bugfixes
* 2017-05-28 [16a74bc](https://github.com/silverstripe/silverstripe-framework/commit/16a74bc8a9fdee7cfb4f6f24493c271f90a76341) DataDifferencer needs to expliclty cast HTMLText values (Daniel Hensby)
* 2017-05-08 [1454072](https://github.com/silverstripe/silverstripe-cms/commit/14540729caa30dd2e782e4fd52afe518dc156ed8) Use framework 3.5 to test cms 3.5 (Sam Minnee)
* 2017-05-03 [2d138b0](https://github.com/silverstripe/silverstripe-framework/commit/2d138b0ef06bd93958cc0678a0afa95560648fb9) class name reference consistency (Gregory Smirnov)
* 2017-05-02 [2187c16](https://github.com/silverstripe/silverstripe-framework/commit/2187c160b936620621fe746a1ffe36af568b21ff) ing pagination api doc typo (3Dgoo)
* 2017-04-28 [a511e35](https://github.com/silverstripe/silverstripe-framework/commit/a511e3511cace405dab7589a3406a0858cb6edf2) #6855: Mangled JS in Requirements, escaping replacement values prior to passing to preg_replace(). (Patrick Nelson)
* 2017-04-24 [1d36f35](https://github.com/silverstripe/silverstripe-framework/commit/1d36f354e8349616c7b39fcade859fbcf0f9c362) Create Image_Cached with Injector. (Gregory Smirnov)
* 2017-04-07 [55eb7eb](https://github.com/silverstripe/silverstripe-framework/commit/55eb7ebdcc9ba767f978dff510614bbd2e0c309d) Do not insert requirements more than once in includeInHTML (Robbie Averill)
* 2017-04-05 [a7920b1](https://github.com/silverstripe/silverstripe-framework/commit/a7920b1f9866b6eb5f4bad9de84eef84b88673ad) regression from #6668 - ModelAdmin form widths (Loz Calver)
* 2017-04-05 [197bc53](https://github.com/silverstripe/silverstripe-framework/commit/197bc53c4963898d2c10621ca6d6031fdb14fe85) Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad (Robbie Averill)
* 2017-02-15 [3072591](https://github.com/silverstripe/silverstripe-framework/commit/30725916dbb0ffc66b77f26c069a86581636ae55) Array to string conversion message after CSV export (#6622) (Juan van den Anker)
* 2017-02-14 [7122e1f](https://github.com/silverstripe/silverstripe-framework/commit/7122e1fde79bdb9aad3c8714a6ce02b7ecedd735) Comments ignored by classmanifest (#6619) (Daniel Hensby)
* 2017-02-09 [6e2797f](https://github.com/silverstripe/silverstripe-framework/commit/6e2797ffc0e9632b60acc5a66e52aeb44f0e2b78) es for using dblib PDO driver. (Andrew O'Neil)
* 2017-02-08 [c25c443](https://github.com/silverstripe/silverstripe-framework/commit/c25c443d95fc305fb3545b1393b7da85923dcf8b) Fix minor mysql 5.7 warning in SQLQueryTest (#6608) (Damian Mooyman)
* 2017-01-18 [72b6fb4](https://github.com/silverstripe/silverstripe-framework/commit/72b6fb49b698bc3a51c8f6b32d2bf08213729493) bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns (Shawn)

View File

@ -0,0 +1,49 @@
# 3.6.0
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### Security
* 2017-05-24 [41270fc](https://github.com/silverstripe/silverstripe-cms/commit/41270fcf9980c4be2529d2750c717675548eb617) Only allow HTTP(S) links for external redirector pages (Daniel Hensby) - See [ss-2017-003](http://www.silverstripe.org/download/security-releases/ss-2017-003)
* 2017-05-09 [447ce0f](https://github.com/silverstripe/silverstripe-framework/commit/447ce0f84f880c2bc969a89e4be528c53caeabe0) Lock out users who dont exist in the DB (Daniel Hensby) - See [ss-2017-002](http://www.silverstripe.org/download/security-releases/ss-2017-002)
* 2017-05-09 [61cf72c](https://github.com/silverstripe/silverstripe-cms/commit/61cf72c08dafddef416d73f943ccd45e70c5d43d) Unescaped fields in CMSPageHistroyController::compare() (Daniel Hensby) - See [ss-2017-004](http://www.silverstripe.org/download/security-releases/ss-2017-004)
### API Changes
* 2017-03-05 [f1b99b6](https://github.com/silverstripe/silverstripe-framework/commit/f1b99b6fa78f209ac493047f3ece55f7c9231efa) Enable theming of GroupedDropdownField (Damian Mooyman)
* 2017-01-23 [3583f1f](https://github.com/silverstripe/silverstripe-framework/commit/3583f1f79ecff159d5586feb8ea4bd940126c132) Convert::raw2json can be passed an optional bitmask of JSON constants as options (Robbie Averill)
### Features and Enhancements
* 2017-04-12 [1a65188](https://github.com/silverstripe/silverstripe-cms/commit/1a6518803b6907ccf22922bca9ff4040200623ec) Make page urls bookmarkable (Damian Mooyman)
* 2017-04-03 [40bf945](https://github.com/silverstripe/silverstripe-framework/commit/40bf94532278d29bd58ebe161870cfe0784d8a7e) PHP 7 compatibility (Loz Calver)
* 2017-01-13 [88f90bf](https://github.com/silverstripe/silverstripe-framework/commit/88f90bfc796755a6243dc99b780a922984065644) Merge pull request #6499 from SilbinaryWolf/feat-decoratorsetlist (Damian Mooyman)
* 2016-12-13 [52cad6c](https://github.com/silverstripe/silverstripe-framework/commit/52cad6ce992378297fa49998d87a9de76bec8ecb) Added ImagickBackend::crop() for compatibility with GDBackend (UndefinedOffset)
* 2016-12-05 [b4ba606](https://github.com/silverstripe/silverstripe-framework/commit/b4ba606ff2c8e77f484acc023fd324a2bcae6a8a) HTMLEditorField default alignment setting (Damian Mooyman)
* 2016-12-02 [24dc342](https://github.com/silverstripe/silverstripe-framework/commit/24dc3428d9aa0830a1ab8a606ba67817e89a6263) HTMLEditorField default alignment setting (Jonathon Menz)
* 2016-10-31 [776d2fb](https://github.com/silverstripe/silverstripe-framework/commit/776d2fbc66e2356fdf938fd9d4f8f01fd894dd7e) Allow setting of unlimited row counts on GridFieldPaginator (Daniel Hensby)
### Bugfixes
* 2017-05-30 [5116476](https://github.com/silverstripe/silverstripe-cms/commit/51164768751de4e2c7c931d21f5635714df7bf34) Issue where CMS SiteTree can result in infinite recursion if parent and child relation is swapped (Daniel Hensby)
* 2017-04-26 [1ff6f3f](https://github.com/silverstripe/silverstripe-cms/commit/1ff6f3f1b047a1d27b3d60217dc262e8a1c9f54c) ing doArchive (John Milmine)
* 2017-04-26 [000a5f7](https://github.com/silverstripe/silverstripe-cms/commit/000a5f7209065aceae14801244a08d3ed186e752) Fix page history / settings forms (Damian Mooyman)
* 2017-04-21 [7e77753](https://github.com/silverstripe/silverstripe-cms/commit/7e77753274421c79bac85c5b0c9a35728ce3e3aa) intl test (Daniel Hensby)
* 2017-04-07 [41eddfc](https://github.com/silverstripe/silverstripe-cms/commit/41eddfcc8efad2ef90c2f8063a32e4fd0d1656be) ing cms page history controller to use new page id param (Tim Kung)
* 2017-04-05 [80e8967](https://github.com/silverstripe/silverstripe-cms/commit/80e89673082cd32dfb5937a4364c646792bef61c) Fix VirtualPage::init() content-modification check. (Sam Minnee)
* 2017-04-04 [2ddb616](https://github.com/silverstripe/silverstripe-cms/commit/2ddb616829d497a464ca78e6e61a2ec07450530b) Correct case of CopyContentFrom method (Daniel Hensby)
* 2017-04-04 [ec15c71](https://github.com/silverstripe/silverstripe-cms/commit/ec15c713420dd2ee5d5c9792af489a74db9653f6) Add __isset to VirtualPage for PHP7 support. (Daniel Hensby)
* 2017-04-04 [ae0fe75](https://github.com/silverstripe/silverstripe-framework/commit/ae0fe75fba35918735656ea82cab2e7584b27f07) non-numeric warnings in GDBackend/ImagickBackend (Loz Calver)
* 2017-04-04 [f101697](https://github.com/silverstripe/silverstripe-framework/commit/f101697f8ef5dac427c7c3b65c457f5c6c1ab090) File::ini2bytes() in PHP 7 (Loz Calver)
* 2017-04-04 [e22cd4d](https://github.com/silverstripe/silverstripe-framework/commit/e22cd4db00f2afb69b7c7f6572c109e627776dbe) TabSet attempting to access undeclared property (Loz Calver)
* 2017-04-04 [f083a06](https://github.com/silverstripe/silverstripe-framework/commit/f083a06f3f97c34079a7d37692f2968df24fe8ff) Fix ViewableData::__isset() for getXXX() getters. (Sam Minnee)
* 2017-04-03 [e5f51b1](https://github.com/silverstripe/silverstripe-reports/commit/e5f51b14a347099ae5a67110e56179b0140e871c) Relax PHP version requirement. (Sam Minnee)
* 2017-04-03 [454646c](https://github.com/silverstripe/silverstripe-framework/commit/454646c4dfda323a66e42ed46797fdad4a12d176) invalid closure param in ShortcodeParserTest (Loz Calver)
* 2017-04-03 [82f62c8](https://github.com/silverstripe/silverstripe-framework/commit/82f62c818430314f3607c2ad87776740ccfccefb) illegal string offset in spyc component (Loz Calver)
* 2017-03-23 [b3d3788](https://github.com/silverstripe/silverstripe-framework/commit/b3d37880e910ff925323ea039dff0235ad3aa3f2) many_many_extraFields breaks _SortColumn0 ordering (fixes #6730) (Loz Calver)
* 2017-03-12 [cc749d3](https://github.com/silverstripe/silverstripe-framework/commit/cc749d3a19d36fbc44ec668aab66252333e4bcf5) Give DatetimeField its own template (which is extensible) (Robbie Averill)
* 2016-10-26 [22ad39e](https://github.com/silverstripe/silverstripe-framework/commit/22ad39e5aea301fa932894d444191dd6ef6389af) Fix SSViewerTest in PHP7 (Sam Minnee)
* 2015-08-28 [f224849](https://github.com/silverstripe/silverstripe-framework/commit/f224849cc6c93024ed305a6ca82df8fd08c8df80) Dont use SplFixedArray in PHP 7. (Sam Minnee)
* 2015-08-27 [cca7e96](https://github.com/silverstripe/silverstripe-framework/commit/cca7e9697cd8b8523d52492cd686e06995d94f91) Correct PHP4-style constructors in SimpleTest. (Sam Minnee)

View File

@ -0,0 +1,46 @@
# 3.6.0-beta1
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### API Changes
* 2017-03-05 [f1b99b6](https://github.com/silverstripe/silverstripe-framework/commit/f1b99b6fa78f209ac493047f3ece55f7c9231efa) Enable theming of GroupedDropdownField (Damian Mooyman)
* 2017-01-23 [3583f1f](https://github.com/silverstripe/silverstripe-framework/commit/3583f1f79ecff159d5586feb8ea4bd940126c132) Convert::raw2json can be passed an optional bitmask of JSON constants as options (Robbie Averill)
### Features and Enhancements
* 2017-04-12 [1a65188](https://github.com/silverstripe/silverstripe-cms/commit/1a6518803b6907ccf22922bca9ff4040200623ec) Make page urls bookmarkable (Damian Mooyman)
* 2017-04-03 [40bf945](https://github.com/silverstripe/silverstripe-framework/commit/40bf94532278d29bd58ebe161870cfe0784d8a7e) PHP 7 compatibility (Loz Calver)
* 2017-01-13 [88f90bf](https://github.com/silverstripe/silverstripe-framework/commit/88f90bfc796755a6243dc99b780a922984065644) Merge pull request #6499 from SilbinaryWolf/feat-decoratorsetlist (Damian Mooyman)
* 2016-12-13 [52cad6c](https://github.com/silverstripe/silverstripe-framework/commit/52cad6ce992378297fa49998d87a9de76bec8ecb) Added ImagickBackend::crop() for compatibility with GDBackend (UndefinedOffset)
* 2016-12-05 [b4ba606](https://github.com/silverstripe/silverstripe-framework/commit/b4ba606ff2c8e77f484acc023fd324a2bcae6a8a) HTMLEditorField default alignment setting (Damian Mooyman)
* 2016-12-02 [24dc342](https://github.com/silverstripe/silverstripe-framework/commit/24dc3428d9aa0830a1ab8a606ba67817e89a6263) HTMLEditorField default alignment setting (Jonathon Menz)
* 2016-10-31 [776d2fb](https://github.com/silverstripe/silverstripe-framework/commit/776d2fbc66e2356fdf938fd9d4f8f01fd894dd7e) Allow setting of unlimited row counts on GridFieldPaginator (Daniel Hensby)
### Bugfixes
* 2017-04-07 [41eddfc](https://github.com/silverstripe/silverstripe-cms/commit/41eddfcc8efad2ef90c2f8063a32e4fd0d1656be) ing cms page history controller to use new page id param (Tim Kung)
* 2017-04-07 [55eb7eb](https://github.com/silverstripe/silverstripe-framework/commit/55eb7ebdcc9ba767f978dff510614bbd2e0c309d) Do not insert requirements more than once in includeInHTML (Robbie Averill)
* 2017-04-05 [a7920b1](https://github.com/silverstripe/silverstripe-framework/commit/a7920b1f9866b6eb5f4bad9de84eef84b88673ad) regression from #6668 - ModelAdmin form widths (Loz Calver)
* 2017-04-05 [80e8967](https://github.com/silverstripe/silverstripe-cms/commit/80e89673082cd32dfb5937a4364c646792bef61c) Fix VirtualPage::init() content-modification check. (Sam Minnee)
* 2017-04-04 [2ddb616](https://github.com/silverstripe/silverstripe-cms/commit/2ddb616829d497a464ca78e6e61a2ec07450530b) Correct case of CopyContentFrom method (Daniel Hensby)
* 2017-04-04 [ec15c71](https://github.com/silverstripe/silverstripe-cms/commit/ec15c713420dd2ee5d5c9792af489a74db9653f6) Add __isset to VirtualPage for PHP7 support. (Daniel Hensby)
* 2017-04-04 [ae0fe75](https://github.com/silverstripe/silverstripe-framework/commit/ae0fe75fba35918735656ea82cab2e7584b27f07) non-numeric warnings in GDBackend/ImagickBackend (Loz Calver)
* 2017-04-04 [f101697](https://github.com/silverstripe/silverstripe-framework/commit/f101697f8ef5dac427c7c3b65c457f5c6c1ab090) File::ini2bytes() in PHP 7 (Loz Calver)
* 2017-04-04 [e22cd4d](https://github.com/silverstripe/silverstripe-framework/commit/e22cd4db00f2afb69b7c7f6572c109e627776dbe) TabSet attempting to access undeclared property (Loz Calver)
* 2017-04-04 [f083a06](https://github.com/silverstripe/silverstripe-framework/commit/f083a06f3f97c34079a7d37692f2968df24fe8ff) Fix ViewableData::__isset() for getXXX() getters. (Sam Minnee)
* 2017-04-03 [e5f51b1](https://github.com/silverstripe/silverstripe-reports/commit/e5f51b14a347099ae5a67110e56179b0140e871c) Relax PHP version requirement. (Sam Minnee)
* 2017-04-03 [454646c](https://github.com/silverstripe/silverstripe-framework/commit/454646c4dfda323a66e42ed46797fdad4a12d176) invalid closure param in ShortcodeParserTest (Loz Calver)
* 2017-04-03 [82f62c8](https://github.com/silverstripe/silverstripe-framework/commit/82f62c818430314f3607c2ad87776740ccfccefb) illegal string offset in spyc component (Loz Calver)
* 2017-03-23 [b3d3788](https://github.com/silverstripe/silverstripe-framework/commit/b3d37880e910ff925323ea039dff0235ad3aa3f2) many_many_extraFields breaks _SortColumn0 ordering (fixes #6730) (Loz Calver)
* 2017-03-12 [cc749d3](https://github.com/silverstripe/silverstripe-framework/commit/cc749d3a19d36fbc44ec668aab66252333e4bcf5) Give DatetimeField its own template (which is extensible) (Robbie Averill)
* 2017-02-15 [3072591](https://github.com/silverstripe/silverstripe-framework/commit/30725916dbb0ffc66b77f26c069a86581636ae55) Array to string conversion message after CSV export (#6622) (Juan van den Anker)
* 2017-02-14 [7122e1f](https://github.com/silverstripe/silverstripe-framework/commit/7122e1fde79bdb9aad3c8714a6ce02b7ecedd735) Comments ignored by classmanifest (#6619) (Daniel Hensby)
* 2017-02-09 [6e2797f](https://github.com/silverstripe/silverstripe-framework/commit/6e2797ffc0e9632b60acc5a66e52aeb44f0e2b78) es for using dblib PDO driver. (Andrew O'Neil)
* 2017-02-08 [c25c443](https://github.com/silverstripe/silverstripe-framework/commit/c25c443d95fc305fb3545b1393b7da85923dcf8b) Fix minor mysql 5.7 warning in SQLQueryTest (#6608) (Damian Mooyman)
* 2017-01-18 [72b6fb4](https://github.com/silverstripe/silverstripe-framework/commit/72b6fb49b698bc3a51c8f6b32d2bf08213729493) bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns (Shawn)
* 2016-10-26 [22ad39e](https://github.com/silverstripe/silverstripe-framework/commit/22ad39e5aea301fa932894d444191dd6ef6389af) Fix SSViewerTest in PHP7 (Sam Minnee)
* 2015-08-28 [f224849](https://github.com/silverstripe/silverstripe-framework/commit/f224849cc6c93024ed305a6ca82df8fd08c8df80) Dont use SplFixedArray in PHP 7. (Sam Minnee)
* 2015-08-27 [cca7e96](https://github.com/silverstripe/silverstripe-framework/commit/cca7e9697cd8b8523d52492cd686e06995d94f91) Correct PHP4-style constructors in SimpleTest. (Sam Minnee)

View File

@ -0,0 +1,10 @@
# 3.6.0-beta2
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### Bugfixes
* 2017-04-26 [000a5f7](https://github.com/silverstripe/silverstripe-cms/commit/000a5f7209065aceae14801244a08d3ed186e752) Fix page history / settings forms (Damian Mooyman)
* 2017-04-21 [7e77753](https://github.com/silverstripe/silverstripe-cms/commit/7e77753274421c79bac85c5b0c9a35728ce3e3aa) intl test (Daniel Hensby)

View File

@ -0,0 +1,18 @@
# 3.4.6-rc1
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### Security
* 2017-05-24 [41270fc](https://github.com/silverstripe/silverstripe-cms/commit/41270fcf9980c4be2529d2750c717675548eb617) Only allow HTTP(S) links for external redirector pages (Daniel Hensby) - See [ss-2017-003](http://www.silverstripe.org/download/security-releases/ss-2017-003)
* 2017-05-09 [447ce0f](https://github.com/silverstripe/silverstripe-framework/commit/447ce0f84f880c2bc969a89e4be528c53caeabe0) Lock out users who dont exist in the DB (Daniel Hensby) - See [ss-2017-002](http://www.silverstripe.org/download/security-releases/ss-2017-002)
* 2017-05-09 [61cf72c](https://github.com/silverstripe/silverstripe-cms/commit/61cf72c08dafddef416d73f943ccd45e70c5d43d) Unescaped fields in CMSPageHistroyController::compare() (Daniel Hensby) - See [ss-2017-004](http://www.silverstripe.org/download/security-releases/ss-2017-004)
### Bugfixes
* 2017-05-03 [2d138b0](https://github.com/silverstripe/silverstripe-framework/commit/2d138b0ef06bd93958cc0678a0afa95560648fb9) class name reference consistency (Gregory Smirnov)
* 2017-04-24 [1d36f35](https://github.com/silverstripe/silverstripe-framework/commit/1d36f354e8349616c7b39fcade859fbcf0f9c362) Create Image_Cached with Injector. (Gregory Smirnov)
* 2017-02-15 [3072591](https://github.com/silverstripe/silverstripe-framework/commit/30725916dbb0ffc66b77f26c069a86581636ae55) Array to string conversion message after CSV export (#6622) (Juan van den Anker)
* 2017-02-14 [7122e1f](https://github.com/silverstripe/silverstripe-framework/commit/7122e1fde79bdb9aad3c8714a6ce02b7ecedd735) Comments ignored by classmanifest (#6619) (Daniel Hensby)

View File

@ -0,0 +1,9 @@
# 3.4.6-rc2
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### Bugfixes
* 2017-05-28 [16a74bc](https://github.com/silverstripe/silverstripe-framework/commit/16a74bc8a9fdee7cfb4f6f24493c271f90a76341) DataDifferencer needs to expliclty cast HTMLText values (Daniel Hensby)

View File

@ -0,0 +1,28 @@
# 3.5.4-rc1
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### Security
* 2017-05-24 [41270fc](https://github.com/silverstripe/silverstripe-cms/commit/41270fcf9980c4be2529d2750c717675548eb617) Only allow HTTP(S) links for external redirector pages (Daniel Hensby) - See [ss-2017-003](http://www.silverstripe.org/download/security-releases/ss-2017-003)
* 2017-05-09 [447ce0f](https://github.com/silverstripe/silverstripe-framework/commit/447ce0f84f880c2bc969a89e4be528c53caeabe0) Lock out users who dont exist in the DB (Daniel Hensby) - See [ss-2017-002](http://www.silverstripe.org/download/security-releases/ss-2017-002)
* 2017-05-09 [61cf72c](https://github.com/silverstripe/silverstripe-cms/commit/61cf72c08dafddef416d73f943ccd45e70c5d43d) Unescaped fields in CMSPageHistroyController::compare() (Daniel Hensby) - See [ss-2017-004](http://www.silverstripe.org/download/security-releases/ss-2017-004)
### Bugfixes
* 2017-05-28 [16a74bc](https://github.com/silverstripe/silverstripe-framework/commit/16a74bc8a9fdee7cfb4f6f24493c271f90a76341) DataDifferencer needs to expliclty cast HTMLText values (Daniel Hensby)
* 2017-05-08 [1454072](https://github.com/silverstripe/silverstripe-cms/commit/14540729caa30dd2e782e4fd52afe518dc156ed8) Use framework 3.5 to test cms 3.5 (Sam Minnee)
* 2017-05-03 [2d138b0](https://github.com/silverstripe/silverstripe-framework/commit/2d138b0ef06bd93958cc0678a0afa95560648fb9) class name reference consistency (Gregory Smirnov)
* 2017-05-02 [2187c16](https://github.com/silverstripe/silverstripe-framework/commit/2187c160b936620621fe746a1ffe36af568b21ff) ing pagination api doc typo (3Dgoo)
* 2017-04-28 [a511e35](https://github.com/silverstripe/silverstripe-framework/commit/a511e3511cace405dab7589a3406a0858cb6edf2) #6855: Mangled JS in Requirements, escaping replacement values prior to passing to preg_replace(). (Patrick Nelson)
* 2017-04-24 [1d36f35](https://github.com/silverstripe/silverstripe-framework/commit/1d36f354e8349616c7b39fcade859fbcf0f9c362) Create Image_Cached with Injector. (Gregory Smirnov)
* 2017-04-07 [55eb7eb](https://github.com/silverstripe/silverstripe-framework/commit/55eb7ebdcc9ba767f978dff510614bbd2e0c309d) Do not insert requirements more than once in includeInHTML (Robbie Averill)
* 2017-04-05 [a7920b1](https://github.com/silverstripe/silverstripe-framework/commit/a7920b1f9866b6eb5f4bad9de84eef84b88673ad) regression from #6668 - ModelAdmin form widths (Loz Calver)
* 2017-04-05 [197bc53](https://github.com/silverstripe/silverstripe-framework/commit/197bc53c4963898d2c10621ca6d6031fdb14fe85) Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad (Robbie Averill)
* 2017-02-15 [3072591](https://github.com/silverstripe/silverstripe-framework/commit/30725916dbb0ffc66b77f26c069a86581636ae55) Array to string conversion message after CSV export (#6622) (Juan van den Anker)
* 2017-02-14 [7122e1f](https://github.com/silverstripe/silverstripe-framework/commit/7122e1fde79bdb9aad3c8714a6ce02b7ecedd735) Comments ignored by classmanifest (#6619) (Daniel Hensby)
* 2017-02-09 [6e2797f](https://github.com/silverstripe/silverstripe-framework/commit/6e2797ffc0e9632b60acc5a66e52aeb44f0e2b78) es for using dblib PDO driver. (Andrew O'Neil)
* 2017-02-08 [c25c443](https://github.com/silverstripe/silverstripe-framework/commit/c25c443d95fc305fb3545b1393b7da85923dcf8b) Fix minor mysql 5.7 warning in SQLQueryTest (#6608) (Damian Mooyman)
* 2017-01-18 [72b6fb4](https://github.com/silverstripe/silverstripe-framework/commit/72b6fb49b698bc3a51c8f6b32d2bf08213729493) bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns (Shawn)

View File

@ -0,0 +1,5 @@
# 3.6.0-rc1
<!--- Changes below this line will be automatically regenerated -->
## Change Log