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
..
How_Tos	DOCS 3.2 : fixing api: links now that api: tag parser working	2016-02-17 18:02:38 -07:00
01_Data_Model_and_ORM.md	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +13:00
02_Relations.md	DOCS 3.2 : fixing api: links now that api: tag parser working	2016-02-17 18:02:38 -07:00
03_Lists.md	developer guides / models	2014-12-15 09:12:47 +13:00
04_Data_Types_and_Casting.md	DOCS: Added default value examples	2015-05-29 14:27:22 -07:00
05_Extending_DataObjects.md	Standardise spelling of "customise"	2016-03-30 13:17:28 +13:00
06_SearchFilters.md	developer guides / models	2014-12-15 09:12:47 +13:00
07_Permissions.md	Model guide documentation	2014-12-15 09:12:47 +13:00
08_SQL_Select.md	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +13:00
09_Validation.md	DOCS 3.2 : fixing api: links now that api: tag parser working	2016-02-17 18:02:38 -07:00
10_Versioning.md	API Update Versioned methods	2016-04-04 14:50:16 +12:00
11_Scaffolding.md	DOCS 3.2 : fixing api: links now that api: tag parser working	2016-02-17 18:02:38 -07:00
12_Indexes.md	DOCS Update 12_Indexes.md	2015-03-23 10:15:33 +00:00
index.md	Model guide documentation	2014-12-15 09:12:47 +13:00