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 |
|
Myles Beardsmore
|
06730bc1b3
|
updated field name for caption text field.
|
2015-05-28 13:34:59 +01:00 |
|
Marijn Kampf
|
18fb548fd2
|
Fix link
|
2015-05-05 12:13:08 +01:00 |
|
Antony Thorpe
|
c010cb4cec
|
Update 04_GridField.md docs for typo
Variable name should be $grid, as defined when creating the GridField just above. Thanks.
|
2015-04-25 18:04:40 +12:00 |
|
Turnerj
|
ae8dbe309b
|
FEATURE - Added maximum upload file size by type
This support is on both an instance level and a global default level.
|
2015-03-31 21:57:32 +10:30 |
|
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 |
|
Michael Strong
|
4c5a07ecec
|
FIX Updated docs
The docs as they were would break websites and no warning was given regarding the security around doing this.
|
2015-02-27 17:00:46 +13:00 |
|
Cam Findlay
|
8146943a00
|
DOCS Reinstate a missing upload field doc and give a review.
|
2015-02-26 15:17:05 +13:00 |
|
Cam Findlay
|
bdb3b7f085
|
FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about.
|
2014-12-17 15:50:06 +13:00 |
|
Cam Findlay
|
3ac705f4b3
|
FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about.
|
2014-12-15 09:12:48 +13:00 |
|