Commit Graph

1341 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Robbie Averill
65da1c43d8 Update translations 2018-08-24 08:46:23 +12:00
Robbie Averill
04cdac2229
Merge pull request #736 from creative-commoners/pulls/5.0/Postgre
Test against PgSQL also
2018-08-21 15:17:56 +12:00
Robbie Averill
cc3ea728e4 FIX Postgres compatibility in requireDefaultRecords database queries 2018-08-21 15:04:51 +12:00
Dylan Wagstaff
1f3fcc865f Test against PgSQL also 2018-08-21 14:54:47 +12:00
Daniel Hensby
617206af69
Merge pull request #798 from creative-commoners/pulls/5.2/minor-ui-fix
FIX Remove divider line and add margin underneath Submissions GridField
2018-08-20 17:36:49 +01:00
Robbie Averill
ab402b117c FIX Submitted form field values are no longer double escaped in the CMS 2018-08-15 18:22:36 +12:00
Robbie Averill
075985d9c9 Add translation to "Submitter" field label 2018-08-15 16:42:44 +12:00
Robbie Averill
ba9bbfaed5 FIX Remove divider line and add margin underneath Submissions GridField 2018-08-15 16:39:44 +12:00
Robbie Averill
7e91be9cb4 Merge branch '5.1' into 5.2 2018-07-26 15:17:22 +12:00
Robbie Averill
01a772e1b7 Merge branch '5.0' into 5.1 2018-07-26 15:17:10 +12:00
Guy Marriott
6df941065f
Merge pull request #787 from creative-commoners/pulls/5.2/transactionless-test
Disable transactions in UserDefinedFormTest to prevent fixture leaks
2018-06-20 17:48:07 +12:00
Robbie Averill
9812d43a3f Disable transactions in UserDefinedFormTest to prevent fixture leaks 2018-06-20 17:08:20 +12:00
Dylan Wagstaff
e4b87bae03
Merge pull request #786 from creative-commoners/pulls/5.2/test-fixes
Re-enable test for removing custom rules from live stage when forms are published with deletions
2018-06-19 17:01:24 +12:00
Robbie Averill
eddfa10cd3 Remove cache from get_one_by_stage calls in tests 2018-06-19 16:14:36 +12:00
Robbie Averill
398c65c540 Re-enable test for removing custom rules from live stage when forms are published with deletions 2018-06-19 16:04:43 +12:00
Robbie Averill
bc1773fc63
Merge pull request #784 from creative-commoners/pulls/5.0/fix-toolbar
FIX Prevent form's toolbar from extending into the preview
2018-06-15 22:03:10 +12:00
Raissa North
ed80e1c95b FIX Prevent form's toolbar from extending into the preview 2018-06-15 17:17:44 +12:00