c0211927aa
Merge branch '3' into 4
2017-08-14 21:18:03 +01:00
a3b72c500d
Merge branch '3.5' into 3.6
2017-08-14 12:55:09 +01:00
31c5eebda0
FIX Avoid JS errors for HTMLEditorFields in small holders
2017-07-26 11:20:00 +01:00
ae03d18d91
Merge pull request #6696 from robbieaverill/bugfix/datetime-field-has-template
...
FIX Give DatetimeField its own template (which is extensible)
2017-03-13 13:05:32 +13:00
cc749d3a19
FIX Give DatetimeField its own template (which is extensible)
2017-03-13 11:36:53 +13:00
f1b99b6fa7
API Enable theming of GroupedDropdownField
...
Based on partial back-port of 4.0 code
2017-03-06 11:44:42 +13:00
c9b6e9bac0
API Update template lookup to late resolution for performance reasons
...
API Update behaviour of form fields to use standard template lookup mechanism
API Support custom "type" parameter to template lookup
2016-09-06 12:54:03 +12:00
1d1227cc9a
Merge branch '3'
2016-08-23 10:37:47 +01:00
b0ba2015d9
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 15:53:21 +12:00
c556b01071
API Update core templates for CompositeField / SelectionGroup.ss
2016-07-28 16:32:40 +12:00
a809e80d01
API Convert CMS forms to bootstrap
...
NEW Add cms-forms microtheme to cater to bootstrap's needs.
Note that the old SS3 assets section is buggy as a result of this change.
2016-07-25 17:24:26 +12:00
b8b4e98ac2
API Theme stacking
2016-07-15 16:29:25 +12:00
83c2af72ca
BUG Fix some regressions from #5653 ( #5806 )
2016-07-14 14:43:53 +12:00
dfe375e87e
Fix MemberDatetime helper description, and shifted them to templates ( #5766 )
...
* Fix MemberDatetime helper description, and shifted them to templates
* added descriptionTemplate for setting the description
* Unit test for description with templates
2016-07-06 09:16:27 +01:00
d52db0ba34
Merge 3 into master
...
# Conflicts:
# .travis.yml
# admin/css/ie7.css
# admin/css/ie7.css.map
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.js
# admin/scss/_style.scss
# admin/scss/_uitheme.scss
# control/HTTPRequest.php
# core/Object.php
# css/AssetUploadField.css
# css/AssetUploadField.css.map
# css/ConfirmedPasswordField.css.map
# css/Form.css.map
# css/GridField.css.map
# css/TreeDropdownField.css.map
# css/UploadField.css
# css/UploadField.css.map
# css/debug.css.map
# dev/Debug.php
# docs/en/00_Getting_Started/00_Server_Requirements.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
# filesystem/File.php
# filesystem/Folder.php
# filesystem/GD.php
# filesystem/Upload.php
# forms/ToggleField.php
# forms/Validator.php
# javascript/lang/en_GB.js
# javascript/lang/fr.js
# javascript/lang/src/en.js
# javascript/lang/src/fr.js
# model/Image.php
# model/UnsavedRelationList.php
# model/Versioned.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/DBField.php
# model/fieldtypes/Enum.php
# scss/AssetUploadField.scss
# scss/UploadField.scss
# templates/email/ChangePasswordEmail.ss
# templates/forms/DropdownField.ss
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
# tests/forms/EnumFieldTest.php
# tests/security/MemberTest.php
# tests/security/MemberTest.yml
# tests/security/SecurityTest.php
2016-04-29 17:50:55 +12:00
72a014d933
Allow '0' in DropdownField ( #5199 )
...
Display falsey values as option titles when they have been included.
2016-04-19 17:40:14 +12:00
f20ad434ce
API Update TinyMCE to 4.x
...
API Allow HtmlEditorField to be individually configured
BUG Fix incorrect change detection
BUG Fix missing i18n files
2016-02-23 10:10:02 +13:00
99de74d69e
API Add isDisabledValue to SelectField
...
API Remove deprecated {comma} syntax for multi select string encoded values
API MemberDatetimeOptionsetField now has a fixed preview date
BUG fix inverted arguments in OptionSetField::getOptionClass
2016-01-21 15:40:19 +13:00
bdb1a95758
API Cleanup and refactor of select fields
...
API Standardise Relation interface
2016-01-21 15:40:19 +13:00
122784b1cb
FIX OptionsetField input has required #4901
2016-01-12 12:22:24 +13:00
3ee8f505b7
MINORE: Remove training whitespace.
...
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.
Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.
The command used was this:
for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
ad42f802c4
BUG Fix duplicate HolderID on TreeDropdownField
2015-10-06 12:54:35 +13:00
560f9a6e39
API respect custom attributes on OptionsetField and CheckboxSetField
2015-07-10 14:49:05 +12:00
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
6be0488731
FIX TreeDropdownField doesnt change label on unselect
2015-06-11 16:14:08 +01:00
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
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
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
d68435e978
FIX SelectionGroup no longer shows empty FieldLists
2015-02-06 11:00:00 +00:00
6103d66116
Fix issue where TreeDropdownField loses value on show/hide
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1157
2015-01-27 11:53:53 +00:00
218ef0b599
Merge commit 'ec0c259' into 3
...
* commit 'ec0c259':
BUG: Reinstate tab and form focus states (fixes CMS #732 and #817 )
2015-01-07 14:26:19 +13:00
ec0c259c17
BUG: Reinstate tab and form focus states (fixes CMS #732 and #817 )
...
* Added methods to track and restore field focus
* Added a trigger event when tabstate reset
Update LeftAndMain.EditForm.js
2014-10-26 14:21:47 +13:00
2c24d51c0b
Revert #3358
2014-08-04 12:13:19 +12:00
8c56e54a47
Fixed usage of .XML with .ATT for attributes in CheckboxSetField
2014-08-04 10:18:34 +12:00
b2dac644a0
BUG Fixed escaping of name/value in options of form fields
...
DropdownField was currently escaping options, but CheckboxSetField and
OptionsetField were not. This fixes them to be consistent.
2014-08-04 09:55:35 +12:00
9048eab4a2
Merge branch '3.1'
2014-02-12 11:06:54 +13:00
1c7af2fd04
BUG Fix missing description element on FieldGroup_holder.ss
2014-02-10 10:38:00 +13:00
0d7e9a9692
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
_config/routes.yml
docs/en/topics/datamodel.md
forms/DropdownField.php
2014-02-04 08:19:04 +13:00
079b29bfff
FIX Add missing extraClass to FieldGroup_holder
...
FieldGroup_holder doesn't use FieldGroup
2014-01-28 20:00:20 +13:00
39d42e4ea3
Merge branch '3.1'
2014-01-09 08:22:47 +13:00
770e23f8e1
Merge pull request #2270 from ARNHOE/3.1-updatedfieldgroup
...
BUG Updated fieldgroup class and example code
2013-12-20 19:14:21 -08:00
fee54c75f0
API: Change DropdownField::getSource() to not return the emptyString value.
2013-10-18 11:16:27 +13:00
1c983bc16d
API: LookupField::Field now returns an HTMLText instance.
...
Moved LookupField into a template, removed getSource() as the DropdownField getSource() has been simplified to just a getter
2013-10-18 10:28:17 +13:00
60fc7e5346
Merge remote-tracking branch 'origin/3.1'
2013-10-06 19:07:39 +02:00
37e032df86
API: Change CreditCardField to use AttributeHTML
2013-10-03 15:26:31 +01:00
d79d50770c
FIX: Make CreditCardField use template
2013-10-03 10:51:39 +01:00
7ae75c1a89
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2013-08-16 13:37:44 +02:00
eb17cf3eb9
Merge pull request #2275 from ARNHOE/3.1-updatefieldgroupstyle
...
BUG Fieldgroup styling
2013-08-15 12:14:05 -07:00
6352201738
No <label for> on OptionsetField/CheckboxSetField holder
...
It produces invalid HTML since the "for" attribute doesn't
map to any HTML input field. Each individual checkbox or radio button
input element has its own <label for>
2013-08-13 18:05:11 +02:00
81843c7fb8
Fieldgroup Warped $title in a if
2013-08-05 18:12:35 +02:00
Daniel Hensby
Daniel Hensby
Damian Mooyman
Robbie Averill
Hamish Friedlander
Chris Joe
JorisDebonnet
torleif
Sam Minnee
Daniel Hensby
Will Rossiter
Naomi Guyer
Sean Harvey
Damian Mooyman
Ingo Schommer
Will Rossiter
Simon Welsh
Nathan J. Brauer
Ingo Schommer
Tom Densham
Arno Poot