tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
14,471 Commits 31 Branches 527 Tags 162 MiB
f0bc073848
Commit Graph

2254 Commits

Author SHA1 Message Date
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
Damian Mooyman
4cacebdb88 Merge pull request #4128 from assertchris/clean-up-label-field 
Clean up LabelField
 2015-05-01 10:10:12 +12:00
Christopher Pitt
e1df8ec2fc Clean up LabelField 2015-04-30 16:21:33 +12:00
Christopher Pitt
f1524d9d31 Clean up HiddenField 2015-04-30 11:53:50 +12:00
Stevie Mayhew
0d94cf15a5 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
Ingo Schommer
4c165d42fe Merge pull request #4110 from assertchris/clean-up-text-field 
Clean up TextField
 2015-04-27 12:11:18 +12:00
Christopher Pitt
3e3139d7c7 Clean up TextField 2015-04-27 12:02:34 +12:00
Christopher Pitt
6d19006cab Clean up Validator 2015-04-27 11:39:18 +12:00
Patrick Nelson
bfd8b6663a FIX for #4104, minor revision of error messages in ListboxField (more intuitive). 2015-04-25 18:26:11 -04:00
Damian Mooyman
e0b7bc9cda Merge pull request #4054 from dnadesign/fixToPrintButton 
fixing print functionality if passed arrayData
 2015-04-22 09:34:22 +12:00
Christopher Pitt
5231dc7cc7 Abstracting GridField row class generation 2015-04-20 15:34:10 +12:00
Christopher Pitt
2d9a003168 Add row and cell generator methods 2015-04-17 12:45:45 +12:00
John Milmine
c5006be3d6 fixing print functionality if passed array data 2015-04-01 21:55:24 +13:00
Damian Mooyman
43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php
 2015-03-31 19:54:15 +13:00
Daniel Hensby
aba0b70964 FIX GridFieldDetailForm::setItemEditFormCalback broke chaining 2015-03-23 15:16:09 +00:00
Loz Calver
c58f4c469d Replace core uses of DataObject::has_one/has_many/many_many 2015-03-13 16:16:12 +00:00
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
Patrick Nelson
f5f41b2f0e FIX: Ensuring custom CMS validator uses Object->hasMethod() to respect extension decorator pattern. 2015-03-09 13:53:08 -04:00
Damian Mooyman
1770fab206 BUG Fix gridfield generating invalid session keys 2015-03-09 11:44:39 +13:00
Ingo Schommer
1a9c206d15 Merge pull request #3871 from patbolo/3173-folder-treedropdownfield 
BUGFIX Use correct query when searching for items managed by a tree drop...
 2015-03-08 23:23:03 +13:00
Damian Mooyman
87adc44469 BUG Fix serialised stateid exceeding request length 2015-03-05 15:00:38 +13:00
Jean-Fabien Barrois
f9d493dff5 BUGFIX Fixes case insensitive search for postgres databases 2015-03-02 09:55:29 +13:00
Jean-Fabien Barrois
bbe27999eb BUGFIX Use correct query when searching for items managed by a tree dropdown field #3173 2015-02-27 11:18:27 +13:00
Damian Mooyman
8b2ad80c8f Merge pull request #3921 from chillu/pulls/remove-grouped-dropdown-validate 
Remove GroupedDropdownField::validate() (regression)
 2015-02-23 08:39:50 +13:00
John Milmine
fa9cbb74ce checking for destroy 
needed if field is passed array data rather than objects.
 2015-02-21 23:03:34 +13:00
Ingo Schommer
750e81b7cf Remove GroupedDropdownField::validate() (regression) 
Regression caused by 41ea83b337,
which introduced field validation in the parent class without
also adapting this subclass.

Fixing the immediate issue (can't save this field type),
as a first step to the actual fix (implementing validate).

See https://github.com/silverstripe/silverstripe-translatable/issues/179
 2015-02-21 16:15:03 +13:00
Damian Mooyman
dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
 2015-02-20 10:17:19 +13:00
Phill Price
907944cdf3 Update CheckboxSetField.php 
Updated example to work in api - as DropdownField does.
 2015-02-17 10:05:27 +00:00
Phill Price
9971de6eff Update InlineFormAction.php 
typo fix
 2015-02-16 20:19:53 +00:00
Sean Harvey
cebc0d08c5 Merge pull request #3894 from tractorcow/pulls/3.1/encoding-fixes 
BUG Lots of encoding fixes
 2015-02-16 09:18:41 +13:00
Ben Speakman
f9a61a6802 Use double quotes to escape quotes in CSV export 
Resolves #3895
 2015-02-13 10:10:52 +00:00
Damian Mooyman
1db08bac88 BUG Fix FormAction title encoding 
BUG Fix TreeMultiSelectField using the wrong label
BUG Fix encoding of selected title on TreeDropdownField
BUG Fix DataDifferencer trying to compare non-comparable fields (non-dbfield objects)
BUG: Fix issue with TreeMultiSelectField not saving
BUG: Fix issue with GridFieldPrintButton
ENHANCEMENT Instead of using multiple api calls to encode dbfield values, delegate this operation to the individual fields via forTemplate
Instead of using a new API to communicate html encoding to treeselect, just ensure all content is HTML encoded, and enable html_titles in jstree.
 2015-02-13 15:50:45 +13:00
Daniel Hensby
89c14d079d Making TreeMultiSelectField consistent with parent class 
NEW TreeDropdownField sanatiser helper added
Use config for default_cast of objects
FIX Determine if Diffed value should be escaped
Forcing casting for core DB fields
Fixing permissions labels
 2015-02-13 11:12:30 +13:00
Damian Mooyman
518045257e BUG Fixed handling of numbers in certain locales. 
Fixes #2161
 2015-02-13 10:50:00 +13:00
Ingo Schommer
5f31983ded NEW: updateAttributes hook in FormField 2015-02-08 19:14:31 +13:00