Daniel Hensby
ca8d0f2818
Merge branch '3.1' into 3.2
...
Conflicts:
dev/Debug.php
docs/en/05_Contributing/01_Code.md
forms/FormField.php
i18n/i18nTextCollector.php
model/DataQuery.php
2015-07-20 10:48:01 +01:00
Christopher Pitt
4ba051409d
Cleaned up FormField
2015-06-20 13:55:58 +01:00
Damian Mooyman
e32b06846b
Revert "GridFieldDeleteAction missing button text without icons"
...
This reverts commit 265a34141e
2015-06-19 17:43:05 +12:00
Damian Mooyman
e14f743bf0
Set deprecation level for all changes in 3.x to 4.0
2015-06-19 13:07:41 +12:00
Damian Mooyman
1d122803cc
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
dev/SapphireTest.php
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
forms/DatetimeField.php
forms/NullableField.php
forms/NumericField.php
forms/gridfield/GridField.php
tests/control/DirectorTest.php
tests/model/DataObjectSchemaGenerationTest.php
tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
Gregory Smirnov
66b1dd9154
Issue 4305: fixed DatetimeField::setName()
2015-06-18 18:36:02 +02:00
Damian Mooyman
5d9fa3d7fe
Merge pull request #4253 from swilsonalfa/fixcheckbox
...
Issue with empty CheckboxSetField value
2015-06-18 11:05:36 +12:00
Damian Mooyman
9852676696
Merge pull request #4180 from assertchris/clean-up-grid-field
...
Clean up GridField
2015-06-18 10:47:36 +12:00
Damian Mooyman
438ee49cda
Merge pull request #4114 from assertchris/clean-up-nullable-field
...
Clean up NullableField
2015-06-18 10:28:57 +12:00
Christopher Pitt
4ddc2d231c
Clean up GridField
2015-06-18 00:51:20 +12:00
Christopher Pitt
efcd64a314
Clean up NullableField
2015-06-18 00:44:04 +12:00
Christopher Pitt
47ae8ac7e9
Clean up NumericField
2015-06-18 00:42:24 +12:00
Ingo Schommer
b95fdc7ba0
Merge pull request #4286 from tractorcow/pulls/3.2/fix-public-validate
...
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-17 15:36:03 +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
58cc3da8d8
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-16 11:59:21 +12:00
Ingo Schommer
d4de0f0eac
Merge pull request #4281 from dhensby/pulls/form-docs
...
Fixing doc block issues
2015-06-15 12:09:43 +12:00
Damian Mooyman
6facb1bf5d
Merge pull request #4272 from dhensby/pulls/tree-dropdown-fix
...
FIX TreeDropdownField doesnt change label on unselect
2015-06-15 11:36:45 +12:00
Daniel Hensby
5c8925f92e
Merge pull request #4256 from tractorcow/pulls/3/fix-manymany-falsey-values
...
BUG Fix false values for many_many_ExtraFields not being saved
2015-06-14 23:32:02 +01:00
Daniel Hensby
2b9ccda06b
Fixing doc block issues
2015-06-14 12:49:37 +01:00
Jonathon Menz
838926085c
API New and renamed image functions
...
Renamed image functions with more expressive names. Added CropWidth & CropHeight functions. Added no-upsampling capabilities. Cleaned up Image docs. Closes #4211
2015-06-12 17:02:55 -07:00
Damian Mooyman
f2edf34297
Merge pull request #4274 from stojg/form-docblock
...
Update and fix PHP docblocks, document spelling mistakes and strip trailing whitespace on Form.php
2015-06-12 15:24:41 +12:00
Damian Mooyman
f6fc1e8977
Merge pull request #4126 from assertchris/clean-up-header-field
...
Clean up HeaderField
2015-06-12 13:48:38 +12:00
Damian Mooyman
b692514523
Merge pull request #4118 from assertchris/clean-up-literal-field
...
Clean up LiteralField
2015-06-12 13:15:32 +12:00
Damian Mooyman
57e39cec7b
Merge pull request #4117 from assertchris/clean-up-email-field
...
Clean up EmailField
2015-06-12 13:11:57 +12:00
Damian Mooyman
52fca99acf
Merge pull request #4116 from assertchris/clean-up-textarea-field
...
Clean up TextareaField
2015-06-12 13:10:37 +12:00
Damian Mooyman
07c166f7af
Merge pull request #4115 from assertchris/clean-up-toggle-composite-field
...
Clean Up ToggleCompositeField
2015-06-12 13:09:44 +12:00
Damian Mooyman
880d167673
Merge pull request #4111 from assertchris/clean-up-password-field
...
Clean up PasswordField
2015-06-12 12:56:54 +12:00
Daniel Hensby
ad04eeb5c4
Merge pull request #4259 from tractorcow/pulls/3/multi-htmleditor-config
...
API Support for multiple HTMLEditorConfig per page
2015-06-12 00:53:44 +01:00
Stig Lindqvist
95860e9229
Update and fix PHP docblocks, document spelling mistakes and strip trailing whitespace on Form.php
2015-06-12 10:28:32 +12:00
Daniel Hensby
6be0488731
FIX TreeDropdownField doesnt change label on unselect
2015-06-11 16:14:08 +01:00
Damian Mooyman
b42ddd107c
Merge pull request #3499 from colymba/ie-multi-file-upload-fix
...
FIX #3458 iframe transport multi file upload FIX #3343 , FIX #3148
2015-06-09 13:22:10 +12:00
Damian Mooyman
a8ace75341
API Support for multiple HTMLEditorConfig per page
2015-06-09 12:17:55 +12:00
Damian Mooyman
acf19b72e2
BUG Fix false values for many_many_ExtraFields not being saved
...
Fixes #4067
2015-06-09 12:05:25 +12:00
Stewart Wilson
9421374f91
check to ensure $values is not null or empty before exploding. Otherwise, return an empty array
2015-06-05 21:21:37 +10:00
scott1702
a9d22f1fbf
NEW: Files can be uploaded directly in the 'Insert Link' form
2015-06-03 11:20:29 +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
Damian Mooyman
25f2689833
Merge pull request #4202 from jonom/fix-treedropdown-folders
...
FIX: TreeDropdownField Folder expansion
2015-05-29 10:14:46 +12:00
Damian Mooyman
e733efa195
Merge pull request #4206 from gregsmirnov/pulls/localised-moneyfield-fix
...
BUG Fixed handling of numbers in certain locales
2015-05-29 09:21:43 +12:00
Damian Mooyman
50e33b8e5e
Merge remote-tracking branch 'origin/3.1.13' into 3.1
2015-05-28 19:08:12 +12:00
Damian Mooyman
0a8f328947
Fix merge / test regressions
2015-05-28 16:59:05 +12:00
Damian Mooyman
22a35e48a9
BUG Fix malformed urls redirecting to external sites
2015-05-28 10:12:18 +12:00
Jonathon Menz
a56d08b1ae
FIX: TreeDropdownField Folder expansion
...
When viewing a Folder tree, an expansion icon was shown if the Folder had *any* children, but it should be restricted to children that are Folders.
2015-05-27 09:22:42 -07:00
3Dgoo
23c098cd20
Fixed typo in GridField API doc
2015-05-27 10:04:16 +09:30
Loz Calver
68d8df4e04
FIX: DropdownField didn't consider disabled items
2015-05-22 21:14:11 +01:00
Loz Calver
dfb9b76b95
Add validation for GroupedDropdownField ( closes #3923 )
2015-05-22 20:55:54 +01:00
Gregory Smirnov
f9bdf61b6f
BUG Fixed handling of numbers in certain locales
2015-05-20 12:18:34 +01:00
Kamran Vighio
20c9d6f02e
Implement validate() method for TextField to validate max length ( closes #4073 )
2015-05-19 09:36:51 +01:00
Jonathon Menz
c6bcfea3e3
BUG: FieldList::changeFieldOrder() leftovers discarded
...
Logical error. Use of + operator means items from second array are only merged if the key does not already appear in the first array. The first array has numeric keys 0,1,2 etc. The second array is keyed by field name, but array_values() resets the keys to be numberic starting at 0. This means that some or all leftovers are discarded instead of appended.
2015-05-17 09:09:35 -07:00
Stevie Mayhew
9e8a5c9ba5
FIX: remove validation type constraint from form fields for 3.2 release
2015-05-11 12:32:00 +12:00
Will Rossiter
828ad6eeca
FIX: Modifications to GridFieldExportButton to allow ArrayList use in SS_Report
2015-05-07 08:43:22 +12:00
