silverstripe-framework/_config
Daniel Hensby ca8d0f2818 Merge branch '3.1' into 3.2
Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php
2015-07-20 10:48:01 +01:00
..
config.yml API: Allow HTTP Cache Headers to be customized 2015-06-13 12:16:56 +12: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 BUG Fix of multiple i18nTextCollector issues: #3797, #3798, #3417 2015-07-09 10:45:08 +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