Damian Mooyman 8331171f2c Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php

2015-06-02 19:13:38 +12:00

..

_manifest_exclude

#1476 Patch for ticket #128 and a few other changes

2007-10-22 01:51:02 +00:00

af.yml

Update translation masters

2014-05-13 10:54:33 +12:00

ar.yml

Update translation masters

2014-05-13 10:54:33 +12:00

ast.yml

Updated translations

2013-11-08 00:58:24 +01:00

az.yml

Updated translations

2013-11-08 00:58:24 +01:00

bg.yml

Update translation masters

2014-05-13 10:54:33 +12:00

bs.yml

Update translation masters

2014-05-13 10:54:33 +12:00

ca.yml

Update translation masters

2014-05-13 10:54:33 +12:00

cs.yml

Update translations

2015-05-14 13:45:03 +12:00

da.yml

Update translation masters

2014-05-13 10:54:33 +12:00

de.yml

Update translations

2015-05-14 13:45:03 +12:00

el.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

en_GB.yml

Update translation masters

2014-05-06 17:38:58 +12:00

en.yml

Implement validate() method for TextField to validate max length (closes #4073)

2015-05-19 09:36:51 +01:00

eo.yml

Update translations

2015-05-14 13:45:03 +12:00

es_AR.yml

Update translation masters

2014-05-13 10:54:33 +12:00

es_MX.yml

Update translation masters

2014-05-13 10:54:33 +12:00

es.yml

Merge remote-tracking branch 'origin/3.1'

2014-05-12 11:32:22 +12:00

et_EE.yml

Merge remote-tracking branch 'origin/3.1'

2014-06-15 22:50:20 +12:00

fa_IR.yml

Update translation masters

2014-05-13 10:54:33 +12:00

fi.yml

Update translations

2015-05-14 13:45:03 +12:00

fo.yml

Update translation masters

2014-05-13 10:54:33 +12:00

fr.yml

Update translation masters

2014-05-13 10:54:33 +12:00

gl_ES.yml

Update translation masters

2014-05-13 10:54:33 +12:00

he_IL.yml

Update translation masters

2014-05-13 10:54:33 +12:00

hi.yml

Updated translations

2013-11-08 00:58:24 +01:00

hr.yml

Update translations

2014-11-08 17:07:40 +13:00

hu.yml

Update translation masters

2014-05-13 10:54:33 +12:00

hy_AM.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

id_ID.yml

Update translations

2015-05-14 13:45:03 +12:00

id.yml

Update translations

2015-05-14 13:45:03 +12:00

is.yml

Updated translations

2013-11-08 00:58:24 +01:00

it.yml

Update translation masters

2014-05-13 10:54:33 +12:00

ja.yml

Update translation masters

2014-05-13 10:54:33 +12:00

km.yml

Updated translations

2013-11-08 00:58:24 +01:00

lt.yml

Update translations

2015-05-14 13:45:03 +12:00

lv.yml

Updated translations

2013-11-08 00:58:24 +01:00

mi.yml

Update translation masters

2014-05-13 10:54:33 +12:00

ms.yml

Updated translations

2013-11-08 00:58:24 +01:00

nb.yml

Update translation masters

2014-05-13 10:54:33 +12:00

ne.yml

Updated translations

2013-11-08 00:58:24 +01:00

nl.yml

Update translations

2014-08-05 15:02:18 +12:00

pa.yml

Updated translations

2013-11-08 00:58:24 +01:00

pl.yml

Update translation masters

2014-05-13 10:54:33 +12:00

pt_BR.yml

Update translation masters

2014-05-13 10:54:33 +12:00

pt.yml

Update translation masters

2014-05-13 10:54:33 +12:00

ro.yml

Updated translations

2014-02-18 11:49:55 +13:00

ru.yml

Update translation masters

2014-05-13 10:54:33 +12:00

si.yml

Update translation masters

2014-05-13 10:54:33 +12:00

sk.yml

Update translations

2015-05-14 13:45:03 +12:00

sl.yml

Update translations

2014-08-05 15:02:18 +12:00

sr_RS.yml

Update translation masters

2014-05-13 10:54:33 +12:00

sr.yml

Update translation masters

2014-05-13 10:54:33 +12:00

sr@latin.yml

Update translations

2015-05-14 13:45:03 +12:00

sv.yml

Update translations

2015-05-14 13:45:03 +12:00

th.yml

Update translation masters

2014-05-13 10:54:33 +12:00

tr.yml

Update translations

2014-11-08 17:07:40 +13:00

uk.yml

Update translation masters

2014-05-13 10:54:33 +12:00

uz.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

vi_VN.yml

Updated translations

2013-11-08 00:58:24 +01:00

vi.yml

Updated translations

2014-02-18 11:49:55 +13:00

zh_CN.yml

Update translation masters

2014-05-13 10:54:33 +12:00

zh_TW.yml

Update translation masters

2014-05-13 10:54:33 +12:00

zh.yml

Update translation masters

2014-05-13 10:54:33 +12:00