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
..
install	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
Backtrace.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
BehatFixtureFactory.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
BuildTask.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
BulkLoader.php	Splitting BulkLoader imports to reduce memory consumption	2015-09-15 10:06:06 +12:00
Cli.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
CliDebugView.php	NEW: Replace DebugView’s writeX() functions with renderX() functions.	2015-08-28 16:06:37 +12:00
CliTestReporter.php	API Removed custom dev/tests/ execution	2016-02-23 20:19:35 +13:00
CSSContentParser.php	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
CsvBulkLoader.php	Merge remote-tracking branch 'origin/3.2' into 3	2015-11-03 13:06:39 +13:00
CSVParser.php	Merge 3.1 into 3.2	2016-04-26 00:09:33 +01:00
Debug.php	FIX Dont allow plain text friendly errors	2016-03-28 01:20:18 +01:00
DebugView.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
Deprecation.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
DevBuildController.php	Fixed permission checks for /dev/build action	2016-01-13 14:05:14 +01:00
DevelopmentAdmin.php	API Massive refactor of Versioned	2016-03-17 13:43:53 +13:00
FixtureBlueprint.php	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13:00
FixtureFactory.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
FunctionalTest.php	Removed obsolete TestRunner->$skipTests flag	2016-02-23 22:29:58 +13:00
InstallerTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
MigrationTask.php	Unable to migrate down	2015-06-20 00:38:59 +12:00
SapphireInfo.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
SapphireREPL.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
SapphireTest.php	Merge 3.3 into 3	2016-04-26 00:24:59 +01:00
SapphireTestReporter.php	Update PHPUnit from 3.7 to 4.8	2016-02-24 21:42:20 +13:00
SilverStripeListener.php	Support PHPUnit 3.8+ compatibility	2014-08-22 13:43:23 +12:00
TaskRunner.php	Allow abstract BuildTask subclasses (closes #4538)	2015-08-25 10:14:15 +01:00
TeamCityListener.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-09-09 14:35:29 +12:00
TestListener.php	Merge remote-tracking branch 'origin/3.0' into 3.1	2014-08-22 17:50:36 +12:00
TestMailer.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
TestOnly.php	MINOR Update @package values to match renaming sapphire	2012-04-15 10:50:19 +12:00
TestSession.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
YamlFixture.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00