silverstripe-framework/lang
Damian Mooyman 0b1f297873 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13: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 translation masters 2014-05-06 17:38:58 +12:00
da.yml Update translation masters 2014-05-13 10:54:33 +12:00
de.yml Merge remote-tracking branch 'origin/3.1' 2014-06-15 22:50:20 +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 Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
eo.yml Update translations 2014-08-05 15:02:18 +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 Merge remote-tracking branch 'origin/3.1' 2014-06-15 22:50:20 +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.yml Updated translations 2013-11-08 00:58:24 +01: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 Updated translations 2013-11-08 00:58:24 +01: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 translation masters 2014-05-13 10:54:33 +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
sv.yml Update translations 2014-11-08 17:07:40 +13: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