tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 15:05:42 +00:00
Code Issues Projects Releases Wiki Activity
1,793 Commits 33 Branches 167 Tags
Commit Graph

838 Commits

Author SHA1 Message Date
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