Damian Mooyman
|
b552a7370f
|
Merge remote-tracking branch 'origin/3'
Conflicts:
tests/model/ImageTest.php
|
2015-09-09 15:44:47 +12:00 |
|
Damian Mooyman
|
f10785350e
|
Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
|
2015-09-09 14:50:47 +12:00 |
|
Damian Mooyman
|
309ac0d196
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
.travis.yml
admin/code/CMSProfileController.php
admin/tests/LeftAndMainTest.php
control/HTTP.php
security/Permission.php
tests/forms/FormTest.php
tests/model/ArrayListTest.php
tests/security/PermissionTest.php
|
2015-09-09 14:35:29 +12:00 |
|
Jake Bentvelzen
|
d766f9fd13
|
Modified GridField in 'HtmlEditorField_Toolbar' class to allow custom classes.
|
2015-09-01 10:38:58 +10:00 |
|
Damian Mooyman
|
e86b45bf5d
|
BUG Remove html5 number field due to insufficient localisation support
|
2015-09-01 12:23:35 +12:00 |
|
Damian Mooyman
|
dc4c40f642
|
Merge pull request #4507 from JorisDebonnet/resampled-images-in-folders
Save resampled images into a folder structure indicating transformations
|
2015-09-01 11:16:23 +12:00 |
|
JorisDebonnet
|
ea05526e9d
|
Save resampled images into a folder structure indicating transformations
|
2015-09-01 00:40:27 +02:00 |
|
Sam Minnée
|
f4b7cd3f68
|
Merge pull request #4500 from stevie-mayhew/pulls/get-response
FEATURE: implement getter and setter usage for response
|
2015-08-29 15:35:55 +12:00 |
|
Stevie Mayhew
|
1b57e0ca5b
|
FEATURE: implement getter and setter usage for response
|
2015-08-29 10:24:06 +12:00 |
|
Daniel Hensby
|
8015919932
|
Be defensive with token availability
|
2015-08-27 17:58:43 +01:00 |
|
Daniel Hensby
|
899eb0b235
|
FIX Use complete fieldlist for extracting data
|
2015-08-27 17:58:19 +01:00 |
|
Damian Mooyman
|
1686c83826
|
Revert #3425 #3396 to restore deprecated functionality
Fixes #4514
|
2015-08-24 11:26:25 +12:00 |
|
Patrick Nelson
|
e13aebc3d7
|
FIX for #4502 Prevents JSON.parse() from scrambling sorted results from server-side.
Conflicts:
tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
|
2015-08-19 11:42:45 +01:00 |
|
Daniel Hensby
|
0b36082564
|
Merge branch '3'
Conflicts:
.travis.yml
composer.json
docs/en/changelogs/4.0.0.md
forms/gridfield/GridFieldExportButton.php
|
2015-08-17 13:12:41 +01:00 |
|
Daniel Hensby
|
a8ab5a468d
|
Merge branch '3.1' into 3.2
Conflicts:
admin/code/LeftAndMain.php
composer.json
|
2015-08-17 11:43:28 +01:00 |
|
Loz Calver
|
1b6442058d
|
Check that method 'hasMethod' exists in GridFieldSortableHeader
|
2015-08-03 16:49:18 +01:00 |
|
Sam Minnée
|
4e8aa0c4f2
|
Merge pull request #4460 from JeroenDeDauw/rm-dead-assign
Remove dead assignment
|
2015-08-03 14:48:33 +12:00 |
|
jeroendedauw
|
9a4ecbf41b
|
Remove unused local vars
|
2015-07-31 21:52:21 +02:00 |
|
jeroendedauw
|
88c5e7f6e2
|
Remove dead assignment
|
2015-07-31 21:49:41 +02:00 |
|
Damian Mooyman
|
09210efbc0
|
Merge remote-tracking branch 'origin/3'
Conflicts:
composer.json
control/Session.php
docs/en/05_Contributing/01_Code.md
docs/en/05_Contributing/02_Release_Process.md
forms/FormField.php
model/DataQuery.php
model/Image.php
model/queries/SQLConditionalExpression.php
view/SSViewer.php
view/ViewableData.php
|
2015-07-31 15:49:35 +12:00 |
|
Jonathon Menz
|
aa286ef7d7
|
FIX Missing thumbnails and inconsistencies
Made thumbnails and columns in File list Grid Fields more consistent (fixes #4409)
|
2015-07-30 16:15:51 -07:00 |
|
JorisDebonnet
|
dd0c85c9cf
|
Use fputcsv in GridFieldExportButton
|
2015-07-27 04:23:49 +02:00 |
|
Daniel Hensby
|
79c4f63855
|
DOCS Fixing docs (and bad API usage)
|
2015-07-20 16:42:33 +01:00 |
|
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 |
|
Damian Mooyman
|
55170a0b74
|
API make DataObject::validate public
|
2015-06-17 15:51:30 +12:00 |
|
Damian Mooyman
|
0103b076c3
|
Merge remote-tracking branch 'origin/3'
Conflicts:
forms/Form.php
model/ManyManyList.php
|
2015-06-17 15:41:13 +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 |
|