Commit Graph

2324 Commits

Author SHA1 Message Date
Russell
4d047e5cb7 Fix path to /thirdparty/jquery-ui-themes/smoothness/jquery-ui.css 2015-12-22 10:45:01 +13:00
Loz Calver
9467ab9a7e NEW: Implement unshift() in field list classes (closes #4834) 2015-12-14 16:18:57 +00:00
Marijn Kampf
006717a3cc Fix Fatal error on invalid image
If user has uploaded an invalid image the original code would crash when called from template
2015-11-25 12:17:50 +00:00
muskie9
603caccb90 ENHANCEMENT CurrencyField to use Currency.currency_symbol
fixes #4035

I have limited experience with regex, so I hope I did it correctly. I was able to save/save & publish with the curent regex and the values look good.
2015-11-09 19:38:51 -06:00
Damian Mooyman
c4dc10b255 Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
	forms/DropdownField.php
	tests/model/ImageTest.php
2015-11-03 13:06:39 +13:00
madmatt
275ecfd8a9 BUGFIX: Use Object->hasMethod() instead of method_exists()
This fixes an issue when you pass a `PaginatedList` back from `ModelAdmin::getList()`
2015-11-01 09:10:29 +13:00
Damian Mooyman
db16248b9a BUG Fix broken InlineFormAction 2015-10-29 10:48:49 +13:00
Cam Findlay
c3641587a5 FIX only use sethasemptydefault if exists.
Backport of #4672 with a slight rewrite incase of subclasses of the field.
2015-10-20 12:39:04 +13:00
JorisDebonnet
f6a1e5ec30 Bugfix for DropdownField->castedCopy
The Newsletter module crashed on it when viewing a sent Newsletter.
2015-10-08 19:02:47 +02:00
Patrick Nelson
a71d99cf84 FIX for #4663 ensuring return values from TabSet are retained from parent. Removing useless override. Cleaning up documentation in TabSet and return types. 2015-10-07 17:03:51 -04:00
Patrick Nelson
12c423909f FIX (partial) for #3181 where non-submit buttons are being activated on "enter" key press (relates to CMS issue at https://github.com/silverstripe/silverstripe-cms/issues/1288). 2015-10-06 15:03:49 -04:00
Loz Calver
cb55a0a621 FIX: GridFieldSortableHeader incorrectly reporting fields as sortable 2015-09-30 16:25:17 +01: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
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
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
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
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
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