1101 Commits

Author SHA1 Message Date
Robbie Averill
c553da73c4
Merge pull request #900 from scott1702/feature/pulls/4.6/injectable-emails
Allow userforms email to be injectable
4.6.3
2019-08-14 13:31:00 +12:00
Scott Hutchinson
3077a64b3c Allow userforms email to be injectable 2019-08-14 13:22:32 +12:00
Robbie Averill
8e189c2c49 Merge branch '4.5' into 4.6 4.6.2 2019-07-23 15:49:36 +02:00
Robbie Averill
09b95b9cd7 Add PHP 7.3 to Travis builds 2019-07-23 15:44:36 +02:00
Dylan Wagstaff
069cf82468
Merge pull request #890 from jbennecker/4.6
Validate numeric min/max values on server side
2019-07-16 10:08:06 +12:00
Julian Bennecker
cafb4300a7 Some minor tidy up changes 2019-07-15 13:20:20 +02:00
Julian Bennecker
7bf85efba9 Change error messages for UserFormsNumericField 2019-07-15 11:42:10 +02:00
Julian Bennecker
f213eecaf9 translatable error message 2019-07-12 08:53:08 +02:00
Robbie Averill
ae9099f72f
Merge pull request #896 from torque-foxes/pulls/4.5/hide-fields
FIX Ensure initial visibility on fields is respected on hidden form steps
4.5.8
2019-06-27 14:04:41 +12:00
Scott Hutchinson
c66566aa81 FIX Ensure initial visibility on fields is respected on hidden form steps 2019-06-27 13:25:40 +12:00
Julian Bennecker
6bc5073404 Validate numeric min/max values on server side 2019-05-21 10:24:31 +02:00
Robbie Averill
81d74331dd Merge branch '4.5' into 4.6 4.6.1 2019-03-26 14:42:52 +13:00
Robbie Averill
47340308c0
Merge pull request #872 from creative-commoners/pulls/4.5/step-visibility
FIX Display rules for page breaks/editable form steps now works again
4.5.7
2019-03-26 14:38:03 +13:00
Robbie Averill
c2aaec36ac Remove PHP 5.3 from Travis builds 2019-03-26 14:18:12 +13:00
Robbie Averill
0a3ebcb224 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-26 14:17:41 +13:00
Andreas Gerhards
74559ff5a1 Update travis to test 7.2 and SS 3.7 2019-03-07 12:05:52 +13:00
Andreas Gerhards
d327f0d53f NEW Add SS 3.7 and PHP 7.2 compatability 2019-03-07 12:05:42 +13:00
Robbie Averill
34466742a8 Remove PHP 5.3 from Travis builds 2019-03-07 12:05:29 +13:00
Daniel Hensby
9f7bbe0e27
Merge branch '4.5' into 4 4.6.0 2018-07-16 11:16:01 +01:00
Robbie Averill
53eb9d1802
Merge pull request #774 from dhensby/pulls/4.5/composer-update
Update composer constraints to min supported version of framework
4.5.6
2018-05-18 09:36:06 +12:00
Daniel Hensby
9169821864
Update composer constraints to min supported version of framework 2018-05-17 12:23:59 +01:00
Daniel Hensby
5904b7408a
Merge branch '4.5' into 4 2018-05-09 13:40:25 +01:00
Daniel Hensby
47d344903e
Merge pull request #768 from creative-commoners/pulls/4.5/remove-unnecessary-translation
FIX Remove unnecessary translation of parameterised field value
2018-05-09 13:39:25 +01:00
Raissa North
8f363d6b60 FIX Remove unnecessary translation of parameterised field value 2018-05-09 17:43:08 +12:00
Dylan Wagstaff
d9bef262a4
Merge pull request #752 from creative-commoners/pulls/4.5/member-list-template
FIX Use userforms template for member list field, fixes display rule issue
2018-03-26 11:28:32 +13:00
Robbie Averill
f7ffb706ce FIX Use userforms template for member list field, fixes display rule issue 2018-03-23 14:11:39 +13:00
Robbie Averill
ee0e43118f Merge branch '4.5' into 4 2018-02-21 14:06:13 +13:00
Robbie Averill
1ee7e1543b Merge branch '4.4' into 4.5 2018-02-21 14:05:10 +13:00
Robbie Averill
54b1db79da Merge branch '4.3' into 4.4 2018-02-21 14:04:08 +13:00
Robbie Averill
56381f7a8d Merge branch '4.2' into 4.3 2018-02-21 14:03:41 +13:00
Robbie Averill
809227213e Merge branch '4.1' into 4.2 2018-02-21 14:03:14 +13:00
Robbie Averill
b58c2ef44f Merge branch '4.0' into 4.1 2018-02-21 14:03:00 +13:00
Robbie Averill
89e8c8be50 Merge branch '3.1' into 4.0 2018-02-21 13:59:15 +13:00
Scott Hutchinson
0ce8b95546 FIX Escape dollar signs in UserForm contents before inserting them with regex (#723) 3.1.2 2018-02-21 13:52:51 +13:00
Robbie Averill
f348590cbe Merge branch '4.5' into 4 2018-02-05 12:10:34 +13:00
Scott Hutchinson
96cde0f04c FIX: Ensure display rules work correctly for EditableFormHeading (#712) 4.5.5 2018-02-05 12:08:24 +13:00
Robbie Averill
b766d2a9a2 Merge branch '4.5' into 4 2017-10-06 10:33:45 +13:00
Robbie Averill
7db0b1d24a Merge pull request #669 from mikeyc7m/Branch_4.5.3
fix for broken validation on optionsets
4.5.4
2017-10-06 10:31:48 +13:00
MikeyC
4c4a3d4928 fix for broken validation on optionsets 2017-10-05 11:12:12 +11:00
Robbie Averill
17bbf2b75d Merge branch '4.5' into 4 2017-09-26 11:27:21 +13:00
Robbie Averill
22df83ba4e Merge branch '4.4' into 4.5 2017-09-26 11:27:04 +13:00
Robbie Averill
c162f29553 Merge branch '4.3' into 4.4 2017-09-26 11:26:48 +13:00
Robbie Averill
0adca4a072 Merge branch '4.2' into 4.3 2017-09-26 11:26:35 +13:00
Will Rossiter
283eef758f Merge pull request #665 from creative-commoners/pulls/4.2/freeze-ss3-translations
Remove transifex configuration from SS3 branches. Please commit directly to lang files.
2017-09-26 11:26:04 +13:00
Robbie Averill
29e9057771 Remove transifex configuration from SS3 branches. Please commit directly to lang files. 2017-09-26 11:23:43 +13:00
Robbie Averill
62fde3e8ce Merge branch '4.5' into 4 2017-09-26 11:17:30 +13:00
Will Rossiter
e9f51173e6 Merge pull request #663 from creative-commoners/pulls/4.5/fix-escaped-dollar-signs
FIX Escape dollar signs in UserForm contents before inserting them with regex
2017-09-26 11:14:31 +13:00
Robbie Averill
55187d727e Merge branch '4.4' into 4.5 2017-09-25 19:53:28 +13:00
Robbie Averill
40d690aae6 Merge branch '4.3' into 4.4 2017-09-25 19:53:00 +13:00
Robbie Averill
34c60cfa39 Merge branch '4.2' into 4.3 2017-09-25 19:52:42 +13:00