Commit Graph

1542 Commits

Author SHA1 Message Date
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
beb37ff3f0 Merge branch '5.2' 2018-08-24 08:48:48 +12:00
Robbie Averill
65da1c43d8 Update translations 2018-08-24 08:46:23 +12:00
Robbie Averill
9ed897a46f
Merge pull request #801 from arillo/fix/fieldisrequired
Fix/fieldisrequired
2018-08-24 08:39:18 +12:00
Bumbus
ae8ba5e6da de translation 2018-08-23 15:39:08 +02:00
Bumbus
a95cc1c731 fix FIELDISREQUIRED 2018-08-23 15:28:40 +02: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
9f79218612 Merge branch '5.2'
# Conflicts:
  #	client/dist/styles/userforms-cms.css
  #	client/src/styles/userforms-cms.scss
2018-07-26 15:19:06 +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
Daniel Hensby
90808ce167
Merge pull request #791 from aNickzz/master
Replace class "Actions" with "btn-toolbar"
2018-07-16 17:56:28 +01:00
Nicholas Sorokin
c906b0c973 Fix misplacement of actions class 2018-07-14 02:38:13 +09:30
Nicholas Sorokin
8c0763288f Include Actions class alongside step-buttons 2018-07-14 00:57:24 +09:30
Daniel Hensby
dc226cf8ba
Merge pull request #793 from stephenmcm/feat-disableShortcode
Optional disable $UserDefinedForm
2018-07-11 22:54:58 +01:00
Stephen McMahon
01520c22bd Fix(shortcode) re-order if block check $UserDefinedForm in $this->Content. Rename config value to be clearer 2018-07-09 15:20:30 +10:00
Stephen McMahon
ed1e9858af Fix(test) clean up format to make linter happy 2018-07-06 09:28:16 +10:00
Stephen McMahon
a3a2c3d286 Fix(UserDefinedFormController) change return type of index() when not using shortcode 2018-07-06 09:27:28 +10:00
Stephen McMahon
0a708d9ea3 Fix(tests) change asserts in to check correct values 2018-07-05 17:01:45 +10:00
Stephen McMahon
94192f4b66 Add(config) create disable_form_content_interpolation option for ignoring $UserDefinedForm in $this->Content 2018-07-05 16:10:43 +10:00
Nicholas Sorokin
d2ddaddede Replace class "Actions" with "btn-toolbar" 2018-07-02 17:04:14 +09:30
Daniel Hensby
f758ae3e03
Merge pull request #783 from SilverStripers/bugfix/grid-filter-errors 2018-06-20 10:02:15 +01: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
a5f6499011
Merge pull request #785 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-19 09:24:00 +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
Dylan Wagstaff
a1bb69c23c Add supported module badge to readme 2018-06-15 17:51:45 +12:00
Raissa North
ed80e1c95b FIX Prevent form's toolbar from extending into the preview 2018-06-15 17:17:44 +12:00
Robbie Averill
e768cf9b6c Update branch alias for 5.x-dev 2018-06-11 15:25:25 +12:00
Robbie Averill
2dd0234970 Merge branch '5.2' 2018-06-11 15:25:09 +12:00
Robbie Averill
6a6102cb27 Remove obsolete branch alias 2018-06-11 15:24:50 +12:00
Robbie Averill
bb131ec07a Merge branch '5.1' 2018-06-11 15:24:23 +12:00