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 |
|
Damian Mooyman
|
0a8f328947
|
Fix merge / test regressions
|
2015-05-28 16:59:05 +12:00 |
|
Damian Mooyman
|
a978b891e1
|
BUG Fix handling of empty parameter token
|
2015-05-28 10:13:10 +12:00 |
|
Damian Mooyman
|
eb069e605d
|
Remove all redundant whitespace
|
2014-08-19 09:17:15 +12:00 |
|
Damian Mooyman
|
d3c7e41419
|
BUG using isDev or isTest query string no longer triggers basic auth
|
2014-07-02 11:51:51 +12:00 |
|
Hamish Friedlander
|
4a7aef0e25
|
FIX Double slashes in ParameterConfirmationToken
|
2013-08-19 11:35:34 +12:00 |
|