silverstripe-framework/_config
Damian Mooyman 8331171f2c Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
..
config.yml API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
cookie.yml Suggested improvements / test case fixes 2014-10-10 09:28:11 +13:00
database.yml NEW: Allow 'null' limit for database queries (closes #3487) 2015-05-04 22:50:33 +01:00
dev.yml ENH making /dev extendable 2014-08-06 16:29:52 +12:00
encryptors.yml MINOR: Rename & tweak some existing config files to better reflect meaning of various names 2012-05-19 14:37:32 +12:00
html.yml API Make HTMLValue replace-able via DI 2013-03-14 12:49:02 +13:00
i18n.yml NEW Allow specifying priority for translations 2013-05-06 12:51:46 +12:00
mimetypes.yml MINOR: Rename & tweak some existing config files to better reflect meaning of various names 2012-05-19 14:37:32 +12:00
Oembed.yml NEW Added Youtube's short URL. 2015-04-24 17:05:15 +12:00
requestprocessors.yml NEW Provide a consistent way of triggering flush 2014-08-22 09:24:27 +12:00
routes.yml Merge remote-tracking branch 'origin/3.1' 2014-02-04 08:19:04 +13:00
uploadfield.yml API UploadField functions on new records 2013-05-27 15:22:59 +12:00