Damian Mooyman 0ed1750106 Merge remote-tracking branch 'origin/3' ... # Conflicts: # .travis.yml # .tx/config # _config/database.yml # admin/code/LeftAndMain.php # admin/code/ModelAdmin.php # admin/code/SecurityAdmin.php # admin/javascript/jquery-changetracker/lib/jquery.changetracker.js # admin/javascript/lang/cs.js # admin/javascript/lang/de.js # admin/javascript/lang/eo.js # admin/javascript/lang/es.js # admin/javascript/lang/fa_IR.js # admin/javascript/lang/fi.js # admin/javascript/lang/fr.js # admin/javascript/lang/hr.js # admin/javascript/lang/id.js # admin/javascript/lang/id_ID.js # admin/javascript/lang/it.js # admin/javascript/lang/ja.js # admin/javascript/lang/lt.js # admin/javascript/lang/mi.js # admin/javascript/lang/nb.js # admin/javascript/lang/nl.js # admin/javascript/lang/pl.js # admin/javascript/lang/ro.js # admin/javascript/lang/ru.js # admin/javascript/lang/sk.js # admin/javascript/lang/sl.js # admin/javascript/lang/sl_SI.js # admin/javascript/lang/sr.js # admin/javascript/lang/sr@latin.js # admin/javascript/lang/sr_RS.js # admin/javascript/lang/sr_RS@latin.js # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fa_IR.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/hr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sl_SI.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # admin/javascript/lang/sv.js # admin/javascript/lang/zh.js # admin/templates/Includes/ModelAdmin_Content.ss # composer.json # control/HTTPRequest.php # core/Config.php # core/Core.php # core/Diff.php # core/Object.php # core/PaginatedList.php # core/TempPath.php # core/manifest/ConfigStaticManifest.php # dev/Profiler.php # docs/en/00_Getting_Started/00_Server_Requirements.md # docs/en/00_Getting_Started/03_Environment_Management.md # docs/en/02_Developer_Guides/01_Templates/03_Requirements.md # docs/en/02_Developer_Guides/07_Debugging/03_Template_debugging.md # docs/en/02_Developer_Guides/13_i18n/index.md # filesystem/File.php # filesystem/GD.php # filesystem/ImagickBackend.php # filesystem/Upload.php # forms/DatetimeField.php # forms/FormField.php # forms/GroupedDropdownField.php # forms/TabSet.php # forms/gridfield/GridFieldFilterHeader.php # javascript/lang/es.js # javascript/lang/src/es.js # lang/af.yml # lang/ar.yml # lang/az.yml # lang/bg.yml # lang/bs.yml # lang/ca.yml # lang/cs.yml # lang/de.yml # lang/en.yml # lang/eo.yml # lang/es.yml # lang/es_AR.yml # lang/es_MX.yml # lang/et_EE.yml # lang/fa_IR.yml # lang/fi.yml # lang/fo.yml # lang/fr.yml # lang/gl_ES.yml # lang/he_IL.yml # lang/hr.yml # lang/hu.yml # lang/id.yml # lang/id_ID.yml # lang/is.yml # lang/it.yml # lang/ja.yml # lang/lt.yml # lang/lv.yml # lang/mi.yml # lang/ms.yml # lang/nb.yml # lang/ne.yml # lang/nl.yml # lang/pl.yml # lang/pt.yml # lang/pt_BR.yml # lang/ro.yml # lang/ru.yml # lang/si.yml # lang/sk.yml # lang/sl.yml # lang/sl_SI.yml # lang/sr.yml # lang/sr@latin.yml # lang/sr_RS.yml # lang/sr_RS@latin.yml # lang/sv.yml # lang/th.yml # lang/tr.yml # lang/uk.yml # lang/zh.yml # lang/zh_CN.yml # lang/zh_TW.yml # model/DataDifferencer.php # model/DataQuery.php # model/Image.php # model/ManyManyList.php # model/connect/DBSchemaManager.php # model/connect/PDOConnector.php # model/fieldtypes/Bigint.php # model/fieldtypes/DBFloat.php # model/fieldtypes/DBInt.php # model/fieldtypes/Double.php # model/fieldtypes/ForeignKey.php # model/fieldtypes/PrimaryKey.php # parsers/HTML/HTMLBBCodeParser.php # security/Member.php # security/MemberAuthenticator.php # security/RandomGenerator.php # security/Security.php # tests/control/CookieTest.php # tests/control/HTTPRequestTest.php # tests/core/CoreTest.php # tests/filesystem/UploadTest.php # tests/forms/FormFieldTest.php # tests/forms/FormTest.php # tests/forms/GroupedDropdownFieldTest.php # tests/forms/HtmlEditorFieldToolbarTest.php # tests/forms/RequirementsTest.php # tests/model/DBFieldTest.php # tests/model/DataObjectTest.php # tests/model/ManyManyListTest.php # tests/model/VersionableExtensionsTest.php # tests/model/VersionedTest.php # tests/parsers/ShortcodeParserTest.php # tests/security/MemberAuthenticatorTest.php # tests/security/MemberTest.php # tests/security/SecurityTest.php # tests/view/SSViewerTest.php # thirdparty/simpletest/encoding.php # thirdparty/simpletest/page.php # thirdparty/simpletest/tag.php # thirdparty/spyc/spyc.php # thirdparty/tinymce-spellchecker/classes/SpellChecker.php # thirdparty/tinymce-spellchecker/classes/utils/JSON.php # thirdparty/tinymce-spellchecker/classes/utils/Logger.php # thirdparty/tinymce/tiny_mce.js # thirdparty/tinymce/tiny_mce_gzip.php # thirdparty/tinymce/tiny_mce_src.js # view/Requirements.php # view/SSViewer.php # view/ViewableData.php		2017-06-27 13:27:14 +12:00
..
_images	Restructure of the docs markdown source files into more logical taxonomy	2014-12-17 15:48:35 +13:00
alpha	Added 4.0.0-alpha7 changelog	2017-05-02 13:16:17 +12:00
beta	Added 3.6.0-beta2 changelog	2017-05-10 21:55:25 +01:00
pr	Standardise spelling of "customise"	2016-03-30 13:17:28 +13:00
rc	Added 3.6.0-rc1 changelog	2017-05-29 00:36:04 +00: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-16 11:01:12 +13:00
3.0.9.md	Restructure of the docs markdown source files into more logical taxonomy	2014-12-16 11:01:12 +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.1.19.md	Added 3.1.19 changelog	2016-05-11 11:09:20 +12:00
3.1.20.md	Added 3.1.20 changelog	2016-08-15 16:44:36 +12:00
3.1.21.md	Added 3.1.21 changelog	2016-11-18 12:17:03 +00: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.2.4.md	Remove stale commits from release notes	2016-05-11 15:34:32 +12:00
3.2.5.md	Added 3.2.5 changelog	2016-08-15 17:22:23 +12:00
3.2.6.md	Added 3.2.6 changelog	2016-11-18 15:14:42 +00: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.3.2.md	Remove stale commits from release notes	2016-05-11 15:37:31 +12:00
3.3.3.md	Added 3.3.3 changelog	2016-08-15 18:05:32 +12:00
3.3.4.md	Added 3.3.4 changelog	2016-11-21 12:37:09 +00:00
3.4.0.md	Update changelog	2016-06-03 10:59:29 +12:00
3.4.1.md	DOCS add missing commit af3412a to 3.4.1 changelog	2016-08-18 16:27:36 +01:00
3.4.2.md	Added 3.4.2 changelog	2016-11-21 13:28:00 +00:00
3.4.3.md	Added 3.4.3 changelog	2016-12-22 12:02:45 +13:00
3.4.4.md	Added 3.4.4 changelog	2017-01-31 11:39:09 +00:00
3.4.5.md	Added 3.4.5 changelog	2017-02-20 16:41:59 +00:00
3.4.6.md	Added 3.4.6 changelog	2017-05-30 21:58:52 +00:00
3.5.0.md	Add missing changelog content	2016-11-29 16:21:14 +13:00
3.5.1.md	Added 3.5.1 changelog	2016-12-22 10:43:34 +13:00
3.5.2.md	Added 3.5.2 changelog	2017-01-31 12:07:13 +00:00
3.5.3.md	Added 3.5.3 changelog	2017-02-20 17:01:16 +00:00
3.5.4.md	Added 3.5.4 changelog	2017-05-30 22:03:17 +00:00
3.6.0.md	Add in missing changelog notes	2017-06-06 11:08:05 +12:00
4.0.0.md	DOCS Update Image docs to reflect intervention/image changes	2017-06-23 11:18:21 +01:00
index.md	Update index.md	2015-06-18 19:40:04 +12:00