Commit Graph

1555 Commits

Author SHA1 Message Date
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
Jose Pereira 7406670003 Fix: Fixes after peer review for #833 2019-01-16 12:24:28 +13:00
Jose Pereira 2ac6ae6a47 FIX: Fixes #833 added validation for minimum and maximum length 2019-01-16 11:15:53 +13:00
Luke Amos 490d05a3e8 FIX: Fixes #814 Changed code referencing email template. 2019-01-16 11:02:04 +13:00
Luke Amos 4931d94ad6 FIX: Fixes #814 added email template for plain text. 2019-01-16 10:09:36 +13:00
Robbie Averill 66576b9f3b
Merge pull request #847 from sachajudd/site-tree-icon
Add font-icon for site tree userform page
2019-01-14 09:08:14 +01:00
Sacha Judd 2682abea73 NEW Add font-icon for site tree userform page 2019-01-14 13:39:27 +13:00
Robbie Averill f7669d24d6 Merge branch '5.3' 2019-01-10 12:26:48 +01:00
Robbie Averill dd5dbe3123 Merge branch '5.2' into 5.3 2019-01-10 12:26:32 +01:00
Robbie Averill 2fd1c1b504 Merge branch '5.1' into 5.2
# Conflicts:
 #	.travis.yml
2019-01-10 12:26:18 +01:00
Robbie Averill 7a9ca8fcfd Merge branch '5.0' into 5.1 2019-01-10 12:25:40 +01:00
Robbie Averill f9094bed09
Merge pull request #846 from creative-commoners/pulls/5.0/add-php-7.3
Add PHP 7.3 to Travis builds
2019-01-10 12:25:11 +01:00
Robbie Averill 4900f46778
Merge pull request #845 from sunnysideup/patch-2
PATCH: Fixing escape error in required identifier
2019-01-10 12:20:26 +01:00
Robbie Averill f1134212f4 Add PHP 7.3 to Travis builds 2019-01-10 12:19:41 +01:00
Nicolaas 96be46a6ac FIX Fixing escape error in required identifier 2019-01-10 12:13:13 +01:00
Robbie Averill 2f3f7584d4 Merge branch '5.3' 2019-01-08 10:22:30 +01:00
Robbie Averill dd23966be3 Merge branch '5.2' into 5.3 2019-01-08 10:22:14 +01:00
Robbie Averill 3041d4d847 Merge branch '5.1' into 5.2 2019-01-08 10:21:58 +01:00
Robbie Averill c414ab96dd Merge branch '5.0' into 5.1 2019-01-08 10:21:49 +01:00
Robbie Averill fbe1193e74
Merge pull request #844 from jsirish/bugfix/legacyRecipientClasses
bugfix - update legacy class for recipient related classes
2019-01-08 10:21:08 +01:00
Jason Irish 90e1def1e7 bugfix - update legacy class for recipient related classes
fixes #843
2019-01-08 10:20:11 +01:00
Robbie Averill 1e9d7efb4d
Merge pull request #838 from silverstripe-terraformers/feature/editabledfieldisrequired-langs
Add FIELDISREQUIRED to SilverStripe\UserForms\Model\EditableFormField lang references
2018-12-12 13:45:10 +00:00
Jackson 79198fc3b2 Add FIELDISREQUIRED to SilverStripe\UserForms\Model\EditableFormField lang reference 2018-12-11 16:39:26 +13:00
Robbie Averill d71c482685 Merge branch '5.3' 2018-12-03 09:20:26 +00:00
Robbie Averill 444864c3f8 Merge branch '5.2' into 5.3 2018-12-03 09:19:58 +00:00
Robbie Averill 0f4820df62 Merge branch '5.1' into 5.2 2018-12-03 09:19:33 +00:00
Robbie Averill faa8188e0c Merge branch '5.0' into 5.1 2018-12-03 09:19:16 +00:00
Robbie Averill 4930a6744f
Merge pull request #835 from guyvanbael/DE_NL_regex_fix
changes regex for de and nl so dates validate correctly
2018-12-03 10:18:43 +01:00
Guy Van Bael 0977002acc changes regex for de and nl so dates validate correctly 2018-12-03 08:52:51 +00:00