Commit Graph

616 Commits

Author SHA1 Message Date
Robbie Averill
c8698d99bd Merge branch '4' 2017-08-22 10:44:04 +12:00
Robbie Averill
a0aa714feb Merge branch '4.4' into 4.5 2017-08-22 10:40:37 +12:00
Franco Springveldt
f7ff07b828 Merge pull request #648 from creative-commoners/pulls/4.4/php53-compat-fix
FIX Alias object context in closure for PHP 5.3 compat, add test to cover it
2017-08-22 10:31:04 +12:00
Robbie Averill
8d4cd036f7 Merge branch '4' 2017-08-21 15:39:05 +12:00
Robbie Averill
d953603bed Merge branch '4.4' into 4.5 2017-08-21 15:35:39 +12:00
Robbie Averill
792d040652 Merge branch '4.3' into 4.4 2017-08-21 15:33:20 +12:00
Robbie Averill
dd7e13e7f8 Merge branch '4.2' into 4.3 2017-08-21 15:31:15 +12:00
Robbie Averill
fac99f7b6b FIX Alias object context in closure for PHP 5.3 compat, add test to cover it 2017-08-16 13:59:41 +12:00
Robbie Averill
c6b30990c8 Merge pull request #552 from hailwood/patch-1
Make getMergeFieldsMap protected
2017-08-11 15:19:27 +12:00
Robbie Averill
bf326b86c2 Remove default value field from EditableFileField 2017-08-01 10:05:07 +12:00
Daniel Hensby
b068bf65bf
Merge pull request #536 from solnet-aquarium/emailValidation 2017-07-20 10:41:28 +01:00
Robbie Averill
ce65dc557f Merge pull request #643 from creative-commoners/pulls/4.4/make-gridfield-injectable
NEW Update GridField creation to be injectable
2017-07-16 19:55:46 +12:00
Franco Springveldt
a626d0a66e NEW Update GridField creation to be injectable 2017-07-16 18:39:03 +12:00
Franco Springveldt
1b472cda7b ENHANCEMENT removed needless list from CheckboxGroupField and RadioField 2017-07-12 10:40:53 +12:00
Robbie Averill
eb1fb03e28 Merge pull request #627 from creative-commoners/pulls/4.2/submissions-export-fields
FIX submissions export values
2017-06-27 16:08:47 +12:00
Franco Springveldt
1e1b596739 FIX use the correct method for CSV exports and include the full file path 2017-06-27 11:22:08 +12:00
Franco Springveldt
9edc5c3230 Merge pull request #615 from creative-commoners/pulls/4.2/fix-plain-or-html-toggle
FIX Selector for HTML/plain email content toggle. Show preview button for both.
2017-06-27 09:33:53 +12:00
Daniel Hensby
1219927043 Merge pull request #616 from creative-commoners/pulls/4.2/shortcodes-in-email-templates
FIX Ensure HTML email preview content is parsed as HTML including shortcodes
2017-06-26 16:43:32 +01:00
Robbie Averill
67ead916f5 Merge remote-tracking branch 'origin/4' 2017-06-26 18:17:42 +12:00
Robbie Averill
93c25b764f Merge remote-tracking branch 'origin/4.3' into 4 2017-06-26 18:17:06 +12:00
Robbie Averill
fa5ca24110 Merge remote-tracking branch 'origin/4.2' into 4.3 2017-06-26 18:14:23 +12:00
Franco Springveldt
08b0a74124 Merge pull request #621 from creative-commoners/pulls/4.2/fix-submissions-gridfield-state
FIX Pass submissions GridFieldConfig to GridField constructor to avoid error in state
2017-06-26 18:07:24 +12:00
Franco Springveldt
a1a7a0f51f Merge pull request #622 from creative-commoners/pulls/4.2/cache-display-rules-model-loads
Use get_by_id on display rules model loads to ensure they get cached
2017-06-26 15:02:51 +12:00
Robbie Averill
683ee14428 FIX Preview recipient email link for SS 3.6 2017-06-21 15:42:18 +12:00
Robbie Averill
f24af09f00 Use get_by_id on display rules model loads to ensure they get cached 2017-06-21 14:14:17 +12:00
Robbie Averill
d88ce28174 FIX Pass submissions GridFieldConfig to GridField constructor to avoid error in state
This framework bug causes the submissions GridField to lose the filter context when exporting as CSV. Passing the config directly to the GridField constructor allows the state to be set containing the config, where setting it after construction will lose this context. This will be fixed in SS 3.5.x and 3.6.x core releases, but this fix patches it for userforms anyway.
2017-06-20 15:35:36 +12:00
Robbie Averill
427ce3432b Merge pull request #619 from camfindlay/feature/submitter-email
ENHANCEMENT Display and export the submitter email
2017-06-19 17:30:37 +12:00
Cam Findlay
5ad7767ead ENHANCEMENT Display and export the submitter email 2017-06-19 12:15:56 +12:00
Franco Springveldt
630c5c3395 Merge pull request #612 from creative-commoners/pulls/4.2/fix-email-template-rendering
Update UserFormRecipientItemRequest::preview to use theme-templates
2017-06-16 11:39:02 +12:00
Robbie Averill
558c61097d Merge remote-tracking branch 'origin/4' 2017-06-13 12:58:10 +12:00
Robbie Averill
89656e8ac9 Merge remote-tracking branch 'origin/4.3' into 4 2017-06-13 12:57:46 +12:00
Robbie Averill
728647cb71 Merge remote-tracking branch 'origin/4.2' into 4.3 2017-06-13 12:32:11 +12:00
Florian Thoma
4b2669242d leave escaping of value to template 2017-06-13 09:49:02 +10:00
Robbie Averill
bf20e19285 FIX Ensure HTML email preview content is parsed as HTML including shortcodes 2017-06-12 12:03:05 +12:00
Robbie Averill
f9bf407295 Merge remote-tracking branch 'origin/4' 2017-06-09 11:29:44 +12:00
Robbie Averill
e96594247b FIX Selector for HTML/plain email content toggle. Show preview button for both. 2017-06-09 11:04:52 +12:00
Florian Thoma
6e69972c35 fix default values for EditableMultipleOptionField subclasses 2017-06-09 09:01:56 +10:00
Robbie Averill
f488fcce83 Merge remote-tracking branch 'origin/4.3' into 4 2017-06-09 10:25:50 +12:00
Robbie Averill
c02181e69b FIX Use configuration nesting wrapper around themed preview logic 2017-06-09 10:19:58 +12:00
Michael van Schaik
091997027b Adding back previous value for SSViewer::theme_enabled 2017-06-09 10:17:34 +12:00
Michael van Schaik
dcc821f3c6 Update UserFormRecipientItemRequest::preview to use theme-templates
Fixes #556
2017-06-09 10:17:27 +12:00
Robbie Averill
51890f6084 FIX Remove "hide" class from form inputs, leave it on the field holder - fixes display rules issue 2017-06-06 10:13:09 +12:00
Reece Alexander
e86306c7bf FIX incorrect calculation of MAX_FILE_SIZE (#600)
* Fixes incorrect calculation of MAX_FILE_SIZE

* Fixes expected bytes in EditableFileFiled test
2017-05-25 09:32:06 +12:00
Reece Alexander
ec2b012eed FIX incorrect calculation of MAX_FILE_SIZE (#600)
* Fixes incorrect calculation of MAX_FILE_SIZE

* Fixes expected bytes in EditableFileFiled test
2017-05-24 18:31:25 +12:00
Robbie Averill
5777b33f37 Merge pull request #599 from silverstripe/bugfix/empty-column-gridfield
Remove empty column in display logic GridField for form field
2017-05-24 16:08:18 +12:00
Sacha Judd
ca1e2abd83 FIX Remove empty column in display logic GridField for form field 2017-05-24 13:58:48 +12:00
Robbie Averill
7c3edd4d51 FIX Hide and show form fields by toggling the "hide" class instead of jQuery methods 2017-05-22 15:54:28 +12:00
Robbie Averill
11f43c27dc FIX Make EditableLiteralField extensible, have its own template, honour visibility rules 2017-05-18 10:34:04 +12:00
Franco Springveldt
6fd952c737 Adding extra filters (GreaterThan, LessThan, etc.) to Email Custom Rules (#590) 2017-05-15 18:03:51 +12:00
Franco Springveldt
2357ce02ad NEW Email custom rules now supports GreaterThan, LessThan, etc conditionals 2017-05-15 14:05:18 +12:00
michael3dgoo
ada8dac4b1 Removing HideFieldLabels code 2017-05-08 15:48:33 +09:30
michael3dgoo
4451d0c94d CSS hide when ShowOnLoad false 2017-05-08 06:49:20 +09:30
torleif
dc530c0381 Fixes #529 2017-05-01 17:50:39 +12:00
Damian Mooyman
c78942474c Merge 4 into master 2017-05-01 17:47:44 +12:00
Damian Mooyman
e7e810d0f8 Merge 4.3 into 4 2017-05-01 17:44:39 +12:00
Damian Mooyman
d756578a26 Merge remote-tracking branch 'origin/4.1' into 4.2 2017-05-01 17:38:57 +12:00
Damian Mooyman
eea6572ac1 merge 4.0 into 4.1 2017-05-01 17:38:15 +12:00
3Dgoo
457a8a7557 API Moving placeholder variable to EditableFormField (#581) 2017-04-28 20:31:51 +12:00
Franco Springveldt
a94f0e35aa Enhancement: Implemented and/or display rules for UserForms 2017-04-28 10:22:15 +12:00
Juan van den Anker
7983a7f119 Enhancement: added an extension point to UserDefinedForm.finished 2017-04-24 07:56:18 +12:00
3Dgoo
ebbf9a727c ENHANCEMENT Changing form ID to be unique 2017-04-18 13:11:32 +12:00
Robbie Averill
2e73787088 FIX Add translation to some areas of EditableFormField that were missing them (#568)
This commit recreates https://github.com/silverstripe/silverstripe-userforms/pull/386 from
@rasstislav.
2017-04-11 08:15:29 +12:00
Daniel Hensby
5b6c16dbd6 Merge pull request #550 from robbyahn/bugfix/issue-547-radio-button
issue-547 radio button group display fix
2017-04-03 16:57:55 +01:00
Loz Calver
bf391697fa Fix casting bug with email previews (#549) 2017-04-03 10:35:16 +12:00
3Dgoo
d16692d9c1 Adding block_default_userforms_css and block_default_userforms_ js config variables to control whether to load css and JavaScript files or not. (#562) 2017-04-01 23:02:18 +13:00
Damian Mooyman
c349ae980e
BUG Use non-destructive pubilshing for editable options
Fixes #544
2017-03-13 10:14:30 +13:00
Daniel Hensby
84eecb0b76 Merge pull request #553 from TcFxGt4AGE/patch-1
Fix logic for radio buttons
2017-03-06 17:15:38 +00:00
Derek Kaijser
9a5144104c Fix empty file fields
Fix for empty file fields when not all upload fields are used.
2017-03-02 12:46:13 +13:00
Derek Kaijser
3d8f5d1406 Fix logic for radio buttons
parents only works if you have a single radio group with conditionals.
closest is what we want.
2017-03-02 11:58:39 +13:00
Matthew Hailwood
704690b798 Make getMergeFieldsMap protected
Annoying having to copy this method if you want to replace "process" in an extending class so we'll make it a bit looser shall we?
2017-03-01 10:33:05 +13:00
robbyahn
ba39031426 issue-547 radio button group display fix 2017-02-24 04:06:06 +13:00
Danae
bb000ca893 FIX: Change delete() to deleteFromStage() for EditableMultipleOptionField::doPublish(). This fixes the issue where options were being removed from the draft table instead of the Live table, effectively deleting them from the CMS (#545) 2017-02-14 15:47:16 +13:00
Daniel Hensby
3e9a271310
Merge branch '4.3' into 4 2017-02-03 15:17:09 +00:00
Daniel Hensby
94bbbc0954
Merge branch '4.1' into 4.2 2017-02-03 15:05:03 +00:00
Daniel Hensby
a5c8fac64f
Merge branch '4.0' into 4.1 2017-02-03 14:39:36 +00:00
torleif
8c27891600 Fix for #185 and #194 (#539)
* Fix for #185 and #194

* Fix for #185 and #194

* Fix for #185 and #194
2017-01-30 10:24:00 +00:00
Daniel Hensby
2f710d6518 FIX Improve publish performance for formfields (#538)
* FIX Improve publish performance for formfields

* FIX Travis builds broken with external code coverage
2017-01-25 09:35:50 +13:00
Kirk Mayo
ac4c1678a2 Added email address validation to model
Added unit tests for email address validation

Corrected order of params for assertNotContains

EmailRecipient email address validation
2017-01-12 08:51:05 +13:00
Damian Mooyman
b047a1468c BUG Fix issue with UserFormsCheckboxSetField
Fixes #533
2016-12-21 15:09:27 +13:00
Damian Mooyman
1743ed1556
BUG Fix issue with UserFormsCheckboxSetField
Fixes #533
2016-12-14 10:45:42 +13:00
Elliot Goode
d0bf02d25f ENHANCEMENT: Add autocomplete to EditableTextField
* Fixes #526 (autocomplete attributes)

adds ability for text fields to store additional html5 autocomplete
attributes, attributes are per text field and populated from a dropdown
list from the html5 specification. (Credit card and password
autocomplete values omitted as should user defined forms be used to
collect this information?)

* Options moved to config

moved array of auto complete values out to config option as recommended

* Clarify function

updated name, and added description to make more obvious what function
is for normal users

* added translation for field names

along with some localisation for DE/EN/ES/FR/IT/PL/RU languages

* formatting changes and argument removal

formatted array as chopped list, and remove argument that wasn’t
required.

* ADHD kicking in

consistency changes.
2016-12-14 10:12:46 +13:00
torleif
a6229ab22b Fixes #529 2016-12-09 12:01:10 +13:00
torleif
6e567852b7 Fixes #529 2016-12-09 09:15:44 +13:00
Ryan O'Hara
8af5ff93c3 Make sure option gridfield is created before the UpdateCMSFields function so we can override fields in extensions 2016-11-28 16:26:27 +13:00
Damian Mooyman
aa171f8e45 BUG Enable Shortcode parsing for the Content in EditableLiteralField 2016-11-21 12:26:18 +13:00
Eduard Briem
c3ba8f42e1 using forTemplate() instead of (string) casting fixes unit test 2016-11-21 10:48:10 +13:00
Eduard Briem
b1a4b4823f force cast to string $this->dbObject('Content') in EditableLiteralField 2016-11-21 09:20:46 +13:00
Nic Horstmeier
6e10acf6cd ENHANCEMENT setEmptyString option on EditableDropdown
closes #17
2016-11-16 17:04:54 -06:00
Eduard Briem
184a433a15 enable Shortcode parsing using $this->dbObject instead of manually invoking the shortcode parsers 2016-11-07 11:42:55 +13:00
Eduard Briem
d6d61635be Enable Shortcode parsing for the Content in EditableLiteralField to be able to use internal links inside the HTMLEditorfield 2016-11-04 08:41:02 +13:00
Nic Horstmeier
1a5d5eac4b BUGFIX incorrect method name
fixes #513
2016-10-12 23:34:23 -05:00
Daniel Hensby
54e6e9aeb5
Merge branch '4.0' 2016-09-23 17:27:15 +01:00
Daniel Hensby
efcd85fcbe
Merge branch '3.1' into 4.0 2016-09-23 17:24:09 +01:00
Daniel Hensby
eed799dbd9
Merge branch '3.0' into 3.1 2016-09-23 17:21:37 +01:00
Nic Horstmeier
76483188dc BUGFIX EditableFormHeading doesn't properly handle numeric values
fixes #510
2016-09-20 19:26:47 -05:00
Damian Mooyman
7167f3a1c5 Merge pull request #501 from muskie9/enhancement/fileSizeLimit#430
ENHANCEMENT add customisable file upload size limit
2016-08-23 17:36:29 +12:00
Damian Mooyman
c6c609a4c9 Merge remote-tracking branch 'origin/3.1'
# Conflicts:
#	code/forms/UserForm.php
#	code/model/UserDefinedForm.php
#	code/model/editableformfields/EditableFileField.php
#	code/model/editableformfields/EditableOption.php
2016-08-18 10:20:56 +12:00
muskie9
b701b250a3 ENHANCEMENT add customisable file upload size limit 2016-08-11 17:51:47 -05:00
Damian Mooyman
57048fd901 Convert to psr-2 2016-08-09 17:05:22 +12:00
Daniel Hensby
a3d425d443
Merge pull request #269 from mediabeastnz 2016-07-28 14:20:43 +01:00