Commit Graph

549 Commits

Author SHA1 Message Date
Robbie Averill
7edc058121 FIX Escape dollar signs in UserForm contents before inserting them with regex 2017-09-22 14:43:46 +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
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
bf326b86c2 Remove default value field from EditableFileField 2017-08-01 10:05:07 +12: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
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
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
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
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
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