Damian Mooyman 1e1a7a345c Merge remote-tracking branch 'origin/3' ... Conflicts: control/Director.php filesystem/File.php filesystem/GD.php filesystem/ImagickBackend.php forms/HtmlEditorField.php javascript/UploadField_uploadtemplate.js model/Image.php model/Image_Backend.php model/fieldtypes/Enum.php templates/AssetUploadField.ss tests/model/ImageTest.php tests/search/FulltextFilterTest.php		2015-11-03 14:23:16 +13:00
..
asset.yml	API Restore JS Minification	2015-10-23 14:14:38 +13: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
logging.yml	API CHANGE: Shift to Monolog for error reporting and logging	2015-08-28 16:06:41 +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	Update YAML component, load via composer	2015-10-19 17:06:25 +01:00
requestprocessors.yml	NEW Provide a consistent way of triggering flush	2014-08-22 09:24:27 +12:00
routes.yml	BUG Add missing CMSSecurity route	2015-10-30 15:31:54 +13:00