Damian Mooyman 1e1a7a345c Merge remote-tracking branch 'origin/3' ...

Conflicts:
	control/Director.php
	filesystem/File.php
	filesystem/GD.php
	filesystem/ImagickBackend.php
	forms/HtmlEditorField.php
	javascript/UploadField_uploadtemplate.js
	model/Image.php
	model/Image_Backend.php
	model/fieldtypes/Enum.php
	templates/AssetUploadField.ss
	tests/model/ImageTest.php
	tests/search/FulltextFilterTest.php

2015-11-03 14:23:16 +13:00

..

_images

Restructure of the docs markdown source files into more logical taxonomy

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

alpha

Restructure of the docs markdown source files into more logical taxonomy

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

beta

DOCS fix to ensure 3.2.0 beta 1 content links work correctly

2015-09-06 19:29:33 +12:00

pr

Restructure of the docs markdown source files into more logical taxonomy

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

rc

Update changelog

2015-10-07 09:51:24 +13: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

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +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

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +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

Restructure of the docs markdown source files into more logical taxonomy

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

2.4.1.md

Restructure of the docs markdown source files into more logical taxonomy

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

2.4.2.md

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +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

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +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

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +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

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

2014-12-18 12:11:57 +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

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +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

Restructure of the docs markdown source files into more logical taxonomy

2014-12-17 15:48:35 +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

Rebased additional documentation since May 2014.

2014-12-17 15:48:58 +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

Added 3.1.13 changelog

2015-05-28 18:59:11 +12: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.2.0.md

Merge remote-tracking branch 'origin/3.2.0' into 3.2

2015-10-12 09:18:01 +13:00

4.0.0.md

API Implement AssetField to edit DBFile fields

2015-10-23 16:57:44 +13:00

index.md

Update index.md

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