Commit Graph

1581 Commits

Author SHA1 Message Date
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
Robbie Averill 48e6117d81
Merge pull request #828 from scott1702/pulls/5.3/where-have-my-templates-gone
FIX app email templates not resolving correctly
2018-11-18 09:26:25 +02:00
Scott Hutchinson 5cce7cb519 FIX app email templates not resolving correctly 2018-11-18 14:08:53 +13:00
Robbie Averill 3a440472e8 Merge branch '5.3' 2018-11-07 16:45:57 +02:00
Robbie Averill 20ff59c0f8 Remove obsolete branch alias 2018-11-07 16:45:40 +02:00
Robbie Averill b9a8571352 Merge branch '5.2' into 5.3 2018-11-07 16:45:17 +02:00
Daniel Hensby 621bc754ac
Merge pull request #823 from wernerkrauss/patch-1
Fix broken troubleshooting link
2018-10-22 12:38:11 +01:00
wernerkrauss 55a9e235f2
Fix broken troubleshooting link 2018-10-22 10:59:06 +02:00
Robbie Averill ebb9c837b5
Merge pull request #820 from janzenz/patch-1
Prevent eslint rules from cascading.
2018-10-04 08:01:22 +00:00
Janzen Zarzoso feac41ea74
Prevent eslint rules from cascading.
This prevents `eslint` rules from cascading to the parent directory.
2018-10-04 17:12:35 +13:00
Robbie Averill dce70d74d9
Merge pull request #818 from davejtoews/placeholder-0
Allows placeholder value of '0'
2018-10-02 22:27:46 +02:00
David Toews 5271f14998 Allows placeholder value of '0' 2018-10-01 16:20:33 -06:00
Robbie Averill 3bc2b45170 Merge branch '5.2' 2018-09-22 13:54:33 +02:00
Robbie Averill 3c8e403ac2
Merge pull request #815 from indygriffiths/patch-1
Fix EdtiableDateField DefaultToToday using minute instead of month
2018-09-22 13:54:13 +02:00
Indy Griffiths 2b4451cdac FIX DefaultToToday date format
Fixes incorrectly using the minute (m) instead of the month (M) and switches to showing an 2018-09-21 format value
2018-09-22 13:43:00 +02:00
Robbie Averill 6176cf63b8 Merge branch '5.1' into 5.2 2018-09-22 13:42:11 +02:00
Dylan Wagstaff ea2dc9ab6c
Merge pull request #808 from creative-commoners/pulls/5.2/recipient-preview-via-traits
FIX Recipient email content previews now when when userforms is used in a trait context
2018-09-08 18:48:29 +12:00
Guy Marriott 0ff57e26a6
Merge pull request #809 from creative-commoners/pulls/5.1/remap-polymorphic-fix
FIX Do not remap polymorphic class names to UserDefinedForm if they are already an instance of it
2018-09-08 13:20:22 +12:00
Robbie Averill 0ac33336bd FIX Do not remap polymorphic class names to UserDefinedForm if they are already an instance of it 2018-09-07 12:50:34 +02:00
Robbie Averill c88d6b1566 FIX Recipient email content previews now when when userforms is used in a trait context 2018-09-07 10:45:11 +02:00
Dylan Wagstaff 9b48b4f954
Merge pull request #806 from creative-commoners/pulls/5.2/localise-step-nav
FIX Step navigation buttons are not translatable
2018-09-04 21:06:23 +12:00
Dylan Wagstaff 02e27f0475
Merge pull request #807 from creative-commoners/pulls/5.2/fix-translation
FIX Do not override core translation for 'field is required'
2018-09-04 21:05:41 +12:00
Robbie Averill f734c2f033 FIX Do not override core translation for 'field is required' 2018-09-03 13:37:21 +02:00
Robbie Averill 6e3eea22bc FIX Step navigation buttons are not translatable 2018-09-03 07:56:52 +02:00
Dylan Wagstaff 76540d8ffc
Merge pull request #799 from creative-commoners/pulls/5.2/double-escaped-html
FIX Submitted form field values are no longer double escaped in the CMS
2018-08-27 12:42:11 +12:00