Damian Mooyman
|
cb39f2ef27
|
Merge 3.1 into 3.2
# Conflicts:
# 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/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/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/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/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
# javascript/lang/fa_IR.js
# javascript/lang/src/fa_IR.js
|
2016-08-05 11:41:04 +12:00 |
|
Damian Mooyman
|
9805544cee
|
Update translations
|
2016-08-05 11:06:51 +12:00 |
|
Damian Mooyman
|
c27cb2dae7
|
Update translations
|
2016-05-11 11:05:37 +12:00 |
|
Damian Mooyman
|
60644a5be8
|
Update translations
|
2016-05-11 10:58:25 +12:00 |
|
Daniel Hensby
|
2edef65d7a
|
Update translations
|
2016-05-05 11:18:02 +01:00 |
|
Daniel Hensby
|
cf29b2c146
|
Merge remote-tracking branch '3.1.19' into 3.2.4
|
2016-05-05 11:17:45 +01:00 |
|
Daniel Hensby
|
686db04a0a
|
Update translations
|
2016-05-05 02:05:54 +01:00 |
|
Damian Mooyman
|
f7d49df258
|
Merge tag '3.2.3' into 3.2
Release 3.2.3
# Conflicts:
# lang/cs.yml
|
2016-02-29 17:27:00 +13:00 |
|
Damian Mooyman
|
2c1f837442
|
Merge branch '3.1' into 3.2
# Conflicts:
# docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
# docs/en/01_Tutorials/03_Forms.md
# docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
# docs/en/02_Developer_Guides/00_Model/10_Versioning.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
# docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
# docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
# docs/en/02_Developer_Guides/14_Files/01_Image.md
# docs/en/02_Developer_Guides/14_Files/index.md
# lang/cs.yml
# lang/fi.yml
# lang/sk.yml
|
2016-02-29 16:59:20 +13:00 |
|
Damian Mooyman
|
3f18b2f8cd
|
Update translations
|
2016-02-29 15:01:10 +13:00 |
|
Damian Mooyman
|
31e04862a8
|
Update translations
|
2016-02-29 14:57:30 +13:00 |
|
Damian Mooyman
|
6bbd50c917
|
Update translations
|
2016-02-27 21:00:46 +13:00 |
|
Damian Mooyman
|
387264fbbb
|
Update translations
|
2016-02-27 20:53:15 +13:00 |
|
Damian Mooyman
|
01c13bf6b3
|
Update translations
|
2016-02-24 15:20:40 +13:00 |
|
Damian Mooyman
|
50aab6d8d4
|
Update translations
|
2016-02-24 15:14:58 +13:00 |
|
Damian Mooyman
|
3738436d0e
|
Update translations
|
2016-02-19 10:54:36 +13:00 |
|
Damian Mooyman
|
cfd1a5d696
|
Update translations
|
2016-02-19 10:21:03 +13:00 |
|
Damian Mooyman
|
3fe8b7479c
|
Update translations
|
2015-11-16 16:01:52 +13:00 |
|
Damian Mooyman
|
8eb583cda0
|
Update translations
|
2015-11-16 15:08:39 +13:00 |
|
Damian Mooyman
|
e68eb7e45d
|
Update translations
|
2015-11-11 17:06:45 +13:00 |
|
Damian Mooyman
|
b338efe5a7
|
Update translations
|
2015-11-11 16:07:20 +13:00 |
|
Damian Mooyman
|
e07f80014c
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
lang/cs.yml
lang/sk.yml
|
2015-11-03 11:10:46 +13:00 |
|
Damian Mooyman
|
0cd3569fb9
|
Update translations
|
2015-10-06 18:33:16 +13:00 |
|
Damian Mooyman
|
7f71a2ccfe
|
Update translations
|
2015-09-18 14:21:20 +12:00 |
|
Damian Mooyman
|
c4710b2272
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
admin/code/GroupImportForm.php
admin/code/MemberImportForm.php
tests/model/DataListTest.php
|
2015-09-15 13:18:47 +12:00 |
|
Damian Mooyman
|
00caeb700d
|
Added 3.1.14 changelog
Update translations
|
2015-09-15 10:58:15 +12:00 |
|
Damian Mooyman
|
92f9af1984
|
Update translations
|
2015-09-02 11:15:53 +12:00 |
|
Damian Mooyman
|
840c1b1615
|
Update translations
|
2015-08-26 13:56:19 +12:00 |
|
Damian Mooyman
|
f220adc3e0
|
Update translations
|
2015-08-24 16:52:39 +12:00 |
|
Damian Mooyman
|
102892e247
|
Update translations
|
2015-08-04 13:02:20 +12:00 |
|
Damian Mooyman
|
bc8bc7d0c5
|
Update translations
|
2015-06-19 18:18:00 +12:00 |
|
Damian Mooyman
|
0abacaead6
|
Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
admin/code/LeftAndMain.php
forms/EmailField.php
forms/Form.php
forms/HeaderField.php
forms/LiteralField.php
forms/PasswordField.php
forms/TextareaField.php
forms/TreeDropdownField.php
model/DataObject.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/DataObjectTest.php
|
2015-06-17 11:24:25 +12:00 |
|
Damian Mooyman
|
5a1e53818d
|
Update lithuanian translations
|
2015-06-15 10:59:49 +12:00 |
|
Damian Mooyman
|
a569bc9825
|
Update translations
|
2015-06-15 10:47:30 +12:00 |
|
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 |
|
Kamran Vighio
|
20c9d6f02e
|
Implement validate() method for TextField to validate max length (closes #4073)
|
2015-05-19 09:36:51 +01:00 |
|
Damian Mooyman
|
69a244e03f
|
Update translations
|
2015-05-14 13:45:03 +12:00 |
|
Damian Mooyman
|
319b96b48b
|
Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/05_Contributing/01_Code.md
forms/TreeDropdownField.php
model/DataObject.php
security/Member.php
tests/model/DataObjectTest.php
|
2015-03-11 11:40:06 +13:00 |
|
Damian Mooyman
|
a7bd6de2ec
|
Update translations
|
2015-03-09 17:11:10 +13:00 |
|
Damian Mooyman
|
dff65867cc
|
Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
control/HTTP.php
control/HTTPResponse.php
docs/en/05_Contributing/01_Code.md
forms/CompositeField.php
forms/FormAction.php
forms/FormField.php
forms/InlineFormAction.php
forms/NumericField.php
forms/TreeDropdownField.php
forms/TreeMultiselectField.php
templates/forms/TreeDropdownField.ss
tests/core/CoreTest.php
tests/forms/NumericFieldTest.php
tests/model/DataDifferencerTest.php
|
2015-02-20 10:17:19 +13:00 |
|
Damian Mooyman
|
bf0104644b
|
Update translations
|
2015-02-16 11:55:17 +13:00 |
|
Damian Mooyman
|
88fdc75456
|
Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
|
2015-01-15 18:52:46 +13:00 |
|
Damian Mooyman
|
c2af23033f
|
Update translations
|
2015-01-12 17:54:49 +13:00 |
|
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 |
|
Stevie Mayhew
|
41ea83b337
|
FEATURE: add validation to form field subclasses
|
2014-11-17 08:17:38 +13:00 |
|
Damian Mooyman
|
864f070a6c
|
Update translations
|
2014-11-08 17:07:40 +13:00 |
|
Damian Mooyman
|
53c40a94fa
|
API Enable re-authentication within the CMS if a user session is lost
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
|
2014-10-14 15:19:48 +13:00 |
|
Mateusz Uzdowski
|
8bf3853887
|
Merge remote-tracking branch 'origin/3.1'
Conflicts:
docs/en/misc/contributing/issues.md
docs/en/reference/uploadfield.md
forms/HtmlEditorField.php
i18n/i18n.php
javascript/HtmlEditorField.js
model/DB.php
model/Image.php
model/SQLQuery.php
|
2014-08-14 09:08:26 +12:00 |
|
Damian Mooyman
|
e3d4e79bba
|
Update translations
|
2014-08-05 15:02:18 +12:00 |
|
Ingo Schommer
|
bb03f6ba2f
|
Merge remote-tracking branch 'origin/3.1'
Conflicts:
forms/HtmlEditorField.php
|
2014-06-15 22:50:20 +12:00 |
|