tonyair
/
silverstripe-userforms
mirror of https://github.com/silverstripe/silverstripe-userforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,583 Commits 32 Branches 158 Tags 14 MiB
Commit Graph

1583 Commits

Author SHA1 Message Date
Robbie Averill 44d6766440 Merge branch '5.1' into 5.2 2019-05-03 10:16:34 +12:00
Robbie Averill 334dca59ab Merge branch '5.0' into 5.1 2019-05-03 10:16:21 +12:00
Dylan Wagstaff 08d981ab1c
Merge pull request #880 from creative-commoners/pulls/5.4/better-add-button-support 
FIX Support new arguments for better buttons support
 2019-05-02 15:09:35 +12:00
Guy Marriott 9d311ca02b
FIX Support new arguments for better buttons support 2019-05-02 14:48:19 +12:00
Robbie Averill 1ac3f5a97c Merge branch '5.3' into 5.4 2019-05-02 11:02:23 +12:00
Robbie Averill 5f3014ac54 Merge branch '5.2' into 5.3 2019-05-02 11:02:12 +12:00
Robbie Averill c7cd970024 Merge branch '5.1' into 5.2 2019-05-02 11:01:59 +12:00
Robbie Averill 79e343c1d9 Merge branch '5.0' into 5.1 2019-05-02 11:01:50 +12:00
Dylan Wagstaff 88215b9efb
Merge pull request #876 from HARVS1789UK/hotfix/5.4.1 
Prevent 'undefined index' warnings with optional country dropdowns
 2019-05-01 14:28:16 +12:00
Joe Harvey 2cd0602886 Remove unnecessary isset() check 2019-05-01 09:16:22 +12:00
Joe Harvey 418017494f Prevent 'undefined index' warnings when optional country dropdown fields are left empty 2019-05-01 09:16:22 +12:00
Robbie Averill 6eb661fedf Merge branch '5.4' 2019-04-15 15:38:20 +12:00
Robbie Averill 0c5d83daf9 Remove obsolete branch alias 2019-04-15 15:37:32 +12:00
Robbie Averill a4cd982637 Merge branch '5.3' 2019-03-26 14:46:22 +13:00
Robbie Averill b1a04d6563
Merge pull request #871 from quantum-dragons/pulls/fix-form-vallidation-exception-message 
Fix exception error message fails when error in upload file.
 2019-03-26 14:44:57 +13:00
Ishan Jayamanne 3615f416e3 Fix exception error message fails when error in upload file. 2019-03-26 01:28:36 +00:00
Robbie Averill ad9612c3e9
Merge pull request #870 from creative-commoners/pulls/5.3/reintroduce-conditional-form-steps 
FIX Display rules for page breaks/editable form steps now works again
 2019-03-26 14:02:55 +13:00
Robbie Averill 3e450c0add
Merge pull request #869 from creative-commoners/pulls/5.3/submit-no-errors 
FIX correct userform reference & avoid submit errors
 2019-03-26 09:13:43 +13:00
Robbie Averill bf142eb6ef FIX Display rules for page breaks/editable form steps now works again 
This was previously broken in a regression from https://github.com/silverstripe/silverstripe-userforms/pull/575
where the fields themselves could still be toggled, but the jQuery event dispatches for the form steps
were removed. This pull request re-introduces those jQuery event triggers when hiding and showing
editable form fields via display rules.
 2019-03-25 15:09:38 +13:00
NightjarNZ 1d0c347d7f FIX correct userform reference & avoid submit errors 
"Uncaught TypeError: Cannot read property 'data' of undefined
Was being reported when attempting to submit a form, which would
then trigger the "are you sure" functionality which should only
show when attempting to browse away from a page when changes to the
form have been made.
 2019-03-24 14:35:19 +13:00
Robbie Averill 9f01151bdd Merge branch '5.3' 2019-03-19 12:50:17 +13:00
Robbie Averill 21813ef698 Rebuild dist files 2019-03-19 12:50:03 +13:00
Robbie Averill 7d9344345d Merge branch '5.3' 2019-03-19 12:13:46 +13:00
Robbie Averill 677f2c3d34 Upgrade webpack-config to 0.9 2019-03-19 12:13:36 +13:00
Robbie Averill e36de481cc Merge branch '5.3' 2019-03-19 12:05:54 +13:00
Dylan Wagstaff 0b84a3f37b
Merge pull request #867 from creative-commoners/pulls/5.3/update-dependencies 
FIX Upgrade javascript dependencies and add babel-loader to ensure yarn build works
 2019-03-19 11:57:00 +13:00
Robbie Averill 808b6e7702 FIX Upgrade javascript dependencies and add babel-loader to ensure yarn build works 2019-03-18 12:06:40 +13:00
Robbie Averill 830e3a1100
Merge pull request #866 from quantum-dragons/bugfix/editableoption-canmethods-fix 
BUGFIX: re-added can* methods for EditableOption field
 2019-03-13 11:15:55 +13:00
pjayme b49d38ff0f updated canCreate function to check for Parent object 2019-03-13 10:18:41 +13:00
pjayme d8a8ddc61d re-added can* methods for EditableOption field 2019-03-13 09:20:51 +13:00
Robbie Averill ccf6338bed Merge branch '5.3' 2019-03-11 17:35:10 +13:00
Dylan Wagstaff df918cac8b
Merge pull request #855 from 3Dgoo/feature/subjects-with-fields 
Allow form fields in email subjects
 2019-01-29 12:14:54 +13:00
Michael Nowina-Krowicki 55ea24232b Test for EmailRecipient Subject with MergeField 2019-01-28 14:58:55 +10:30
3Dgoo a8e21b193f
Allow form fields in email subjects 
Allows form fields in email subjects using merge field the same as body insertion functionality.
 2019-01-28 09:06:12 +10:30
Robbie Averill 5c8f086f3e
Merge pull request #854 from kinglozzer/multiple-forms 
FIX: Multiple multi-page forms on one page
 2019-01-18 16:42:53 +01:00
Loz Calver 23abafdef4 FIX: Multiple multi-page forms on one page 2019-01-18 14:37:01 +00:00
Dylan Wagstaff 2d310a38f4
Merge pull request #853 from dnadesign/fix/reply-to-not-set 
Check recipient alternate from/to fields exists
 2019-01-17 14:02:23 +13:00
Alexandre Saelens 6acee54596 Avoid calling getter twice 2019-01-17 12:47:09 +13:00
Alexandre Saelens 2e60a79e40 Check recipient alternate from/to fields exists 2019-01-17 12:40:50 +13:00
Robbie Averill 1ad1019e0a
Merge pull request #852 from LukeAmos/issue/814 
FIX Fixes #814 Renamed 'SubmittedFormEmailHtml' to 'SubmittedFormEmail'
 2019-01-16 22:55:50 +01:00
Luke Amos 1efeeca6db FIX Fixes #814 Renamed 'SubmittedFormEmailHtml' to 'SubmittedFormEmail' 
following peer feedback.  Updated respective code and unit test
 2019-01-17 10:30:05 +13:00
Robbie Averill b2101c15fc
Merge pull request #851 from LukeAmos/issue/850 
FIX Fixes #850 added validation to numerical form fields
 2019-01-16 22:12:32 +01:00
Robbie Averill f235c8642c Add unit tests for EditableNumericField::validate() 2019-01-16 21:59:02 +01:00
Luke Amos d917262565 FIX Fixes #850 Considered location following peer feedback 2019-01-17 09:20:31 +13:00
Luke Amos ca06f000a1 FIX Fixes #850 added validation to numerical form fields 2019-01-16 23:32:15 +13:00
Guy Marriott 305cf39b32
Merge pull request #849 from josepereira245/issue/833 
FIX: Fixes #833 added validation for minimum and maximum length
 2019-01-16 15:57:46 +13:00
Jose Pereira 0fd0b3fc1f FIX: Fixes #833 After peer review. 2019-01-16 15:08:42 +13:00
Dylan Wagstaff 85408afdd5
Merge pull request #848 from LukeAmos/issue/814 
FIX: Fixes issue #814 added email template for plain text, as to avoid raw HTML ending up in plain text emails.

https://github.com/silverstripe/silverstripe-userforms/issues/814

># HTML is present in the PlainText Body of emails
>
>I only noticed this because we started using PostMark (which seems to reject HTML emails which have HTML in the Plain Text Body). I suspect though that this will make emails more likely to be seen as spam?
>
>I have tracked the issue (I think) back to this line: /code/Control/UserDefinedFormController.php@master#L294
>
>Looks like the HTML template is being used by both.
>
>I have checked and cannot see this issue reported anywhere else. Is it worth doing a PR with a fix?
 2019-01-16 14:43:46 +13:00
Luke Amos 2cb649abbb FIX #Fixes silverstripe#814 Fixing automated test for code. 2019-01-16 14:14:19 +13:00
Jose Pereira 4ebcfccf44 FIX: Fixes #833 fixes after peer review 2019-01-16 13:50:16 +13:00