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

..

_images

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

alpha

Standardise spelling of "customise"

2016-03-30 13:17:28 +13:00

beta

Merge 3.2 into 3.3

2016-04-26 00:17:09 +01:00

pr

Standardise spelling of "customise"

2016-03-30 13:17:28 +13:00

rc

Merge 3.2 into 3.3

2016-04-26 00:17:09 +01:00

2.0.1.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.0.2.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.1.0.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.1.1.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.2.0.md

DOCS Make links relative so they work nicely on github and docs site.

2014-12-18 12:11:57 +13:00

2.2.1.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.2.2.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.2.3.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.2.4.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.0.md

Standardise spelling of "customise"

2016-03-30 13:17:28 +13:00

2.3.1.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.2.md

DOCS 3.1 - fixes broken internal links

2016-01-14 23:59:53 +13:00

2.3.3.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.4.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.5.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.6.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.7.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.8.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.9.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.10.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.11.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.12.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.3.13.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.4.0.md

DOCS 3.1 - fixes broken internal links

2016-01-14 23:59:53 +13:00

2.4.1.md

Standardise spelling of "customise"

2016-03-30 13:17:28 +13:00

2.4.2.md

Standardise spelling of "customise"

2016-03-30 13:17:28 +13:00

2.4.3.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.4.4.md

DOCS 3.1 - fixes broken internal links

2016-01-14 23:59:53 +13:00

2.4.5.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.4.6.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.4.7.md

DOCS 3.1 - fixes broken internal links

2016-01-14 23:59:53 +13:00

2.4.8.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

2.4.10.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.0.0.md

Standardise spelling of "customise"

2016-03-30 13:17:28 +13:00

3.0.1.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.0.2.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.0.3.md

Making docs gender agnostic

2015-03-07 12:32:04 +00:00

3.0.4.md

DOCS 3.1 : typose and broken internal links

2016-01-15 16:39:23 +13:00

3.0.5.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.0.6.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.0.7.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.0.8.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.0.9.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.0.10.md

DOCS Fix missing changelogs

2015-01-22 08:40:33 +13:00

3.0.11.md

DOCS Fix missing changelogs

2015-01-22 08:40:33 +13:00

3.1.0.md

Standardise spelling of "customise"

2016-03-30 13:17:28 +13:00

3.1.1.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.1.2.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.1.3.md

DOCS Fix missing changelogs

2015-01-22 08:40:33 +13:00

3.1.4.md

DOCS Fix missing changelogs

2015-01-22 08:40:33 +13:00

3.1.5.md

DOCS Fix missing changelogs

2015-01-22 08:40:33 +13:00

3.1.6.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +13:00

3.1.7.md

DOCS 3.1 - fixes broken internal links

2016-01-14 23:59:53 +13:00

3.1.8.md

Rebased on 3.1 - moved new change logs into place.

2014-12-17 15:50:06 +13:00

3.1.9.md

Fix merge error

2015-01-15 18:56:09 +13:00

3.1.10.md

Reformat changelog

2015-02-19 13:16:40 +13:00

3.1.11.md

Added 3.1.11 changelog

2015-03-19 17:46:36 +13:00

3.1.12.md

Added 3.1.12 changelog

2015-03-20 19:29:20 +13:00

3.1.13.md

DOCS 3.1 - fixes broken internal links

2016-01-14 23:59:53 +13:00

3.1.14.md

Added 3.1.14 changelog

2015-09-15 10:58:15 +12:00

3.1.15.md

Add note to changelog

2015-09-18 14:51:04 +12:00

3.1.16.md

Added 3.1.16 changelog

2015-11-16 15:16:49 +13:00

3.1.17.md

Added 3.1.17 changelog

2016-02-24 15:31:12 +13:00

3.1.18.md

Added 3.1.18 changelog

2016-02-29 15:10:05 +13:00

3.2.0.md

Standardise spelling of "customise"

2016-03-30 13:17:28 +13:00

3.2.1.md

Added 3.2.1 changelog

2015-11-16 16:17:10 +13:00

3.2.2.md

Added 3.2.2 changelog

2016-02-24 15:33:02 +13:00

3.2.3.md

Added 3.2.3 changelog

2016-02-29 15:22:39 +13:00

3.3.0.md

Added 3.3.0 changelog

2016-02-24 16:30:34 +13:00

3.3.1.md

Added 3.3.1 changelog

2016-02-29 15:23:25 +13:00

3.4.0.md

FIX: Fixes needed to adapt to whitespace changes.

2016-01-07 14:17:57 +13:00

4.0.0.md

Docs and tests for exempt validation actions

2016-04-22 14:52:38 +12:00

index.md

Update index.md

2015-06-18 19:40:04 +12:00