Damian Mooyman d52db0ba34 Merge 3 into master ... # Conflicts: # .travis.yml # admin/css/ie7.css # admin/css/ie7.css.map # admin/css/ie8.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.js # admin/scss/_style.scss # admin/scss/_uitheme.scss # control/HTTPRequest.php # core/Object.php # css/AssetUploadField.css # css/AssetUploadField.css.map # css/ConfirmedPasswordField.css.map # css/Form.css.map # css/GridField.css.map # css/TreeDropdownField.css.map # css/UploadField.css # css/UploadField.css.map # css/debug.css.map # dev/Debug.php # docs/en/00_Getting_Started/00_Server_Requirements.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/02_Images.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md # filesystem/File.php # filesystem/Folder.php # filesystem/GD.php # filesystem/Upload.php # forms/ToggleField.php # forms/Validator.php # javascript/lang/en_GB.js # javascript/lang/fr.js # javascript/lang/src/en.js # javascript/lang/src/fr.js # model/Image.php # model/UnsavedRelationList.php # model/Versioned.php # model/connect/MySQLDatabase.php # model/fieldtypes/DBField.php # model/fieldtypes/Enum.php # scss/AssetUploadField.scss # scss/UploadField.scss # templates/email/ChangePasswordEmail.ss # templates/forms/DropdownField.ss # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php # tests/forms/EnumFieldTest.php # tests/security/MemberTest.php # tests/security/MemberTest.yml # tests/security/SecurityTest.php		2016-04-29 17:50:55 +12:00
..
Database.php	API Add SS_Database::withTransaction for nice enclosed transactions	2016-03-24 09:57:07 +13:00
DatabaseException.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
DBConnector.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
DBQueryBuilder.php	API Allow parameterised joins / subselects	2014-09-16 17:54:30 +12:00
DBSchemaManager.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
MySQLDatabase.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
MySQLiConnector.php	UPDATE: Add support for user defined charset and collation	2016-02-23 15:40:30 +00:00
MySQLQuery.php	API Use mysql buffered statements	2015-05-08 13:23:53 +12:00
MySQLQueryBuilder.php	NEW: Allow 'null' limit for database queries (closes #3487)	2015-05-04 22:50:33 +01:00
MySQLSchemaManager.php	Merge 3.3 into 3	2016-04-26 00:24:59 +01:00
MySQLStatement.php	Add missing packages	2015-08-24 16:15:38 +12:00
PDOConnector.php	UPDATE: Add support for user defined charset and collation	2016-02-23 15:40:30 +00:00
PDOQuery.php	BUG Fix PDOConnector issues	2014-08-01 18:17:51 +12:00
Query.php	BUG Fix major segfault on PDOConnector after any DDL	2015-06-17 13:34:21 +12:00