Damian Mooyman 3b0a9f4ba2 Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/javascript/LeftAndMain.Menu.js # control/HTTPRequest.php # css/GridField.css # css/GridField.css.map # docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/01_File_Management.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # filesystem/Upload.php # javascript/HtmlEditorField.js # model/Image.php # model/connect/MySQLDatabase.php # model/fieldtypes/Enum.php # model/versioning/Versioned.php # scss/GridField.scss		2016-02-25 14:51:59 +13:00
..
asset.yml	API Asset Access Control implementation	2016-01-13 18:18:22 +13:00
config.yml	UPDATE: Add support for user defined charset and collation	2016-02-23 15:40:30 +00:00
cookie.yml	Suggested improvements / test case fixes	2014-10-10 09:28:11 +13:00
database.yml	FIX: Don’t reuse DBConnector (fixes #4735)	2015-11-11 16:57:49 +13:00
dev.yml	API Removed custom dev/tests/ execution	2016-02-23 20:19:35 +13:00
encryptors.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
html.yml	API Update TinyMCE to 4.x	2016-02-23 10:10: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	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13: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
versioning.yml	API File has Versioned extension	2016-02-23 13:46:28 +13:00