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
..
BackLink_Button.ss	Merge remote-tracking branch 'origin/3.3' into 3	2016-02-09 18:25:47 +13:00
CampaignAdmin_Content.ss	Simplified form schema structure and mocks	2016-04-06 08:35:53 +12:00
CMSLoadingScreen.ss	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
CMSProfileController_EditForm.ss	admin/myprofile layout after validation (fixes #2644)	2013-11-07 16:19:40 +01:00
CMSSectionIcon.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
CMSSettingsController_SilverStripeNavigator.ss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
Editor_toolbar.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
LeftAndMain_Content.ss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
LeftAndMain_EditForm.ss	Merge remote-tracking branch 'origin/3.3' into 3	2016-02-09 18:25:47 +13:00
LeftAndMain_Menu.ss	API refactor LeftAndMain_Menu.ss into individually overridable components	2016-03-15 09:34:39 -07:00
LeftAndMain_MenuList.ss	API refactor LeftAndMain_Menu.ss into individually overridable components	2016-03-15 09:34:39 -07:00
LeftAndMain_MenuLogo.ss	API refactor LeftAndMain_Menu.ss into individually overridable components	2016-03-15 09:34:39 -07:00
LeftAndMain_MenuStatus.ss	API refactor LeftAndMain_Menu.ss into individually overridable components	2016-03-15 09:34:39 -07:00
LeftAndMain_MenuToggle.ss	API refactor LeftAndMain_Menu.ss into individually overridable components	2016-03-15 09:34:39 -07:00
LeftAndMain_SilverStripeNavigator.ss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
ModelAdmin_Content.ss	Merge remote-tracking branch 'origin/3.3' into 3	2016-02-09 18:25:47 +13:00
ModelAdmin_EditForm.ss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
ModelAdmin_ImportSpec.ss	Merge remote-tracking branch '3.2' into 3	2015-08-17 11:59:24 +00:00
ModelAdmin_Tools.ss	Upgrade template translation syntax	2015-07-22 14:17:03 +01:00