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 )
2018-02-21 13:52:51 +13:00
Dylan Wagstaff
7e54584615
Merge pull request #722 from creative-commoners/pulls/5.0/fix_getFormParent
...
refactor how getCMSFields is built to handle no parent form
2018-02-21 09:46:08 +13:00
Andrew Aitken-Fincham
e2066a55b3
missing 'not', add alert-warning for unsaved form
2018-02-20 14:44:31 +00:00
Andrew Aitken-Fincham
bc5c6221f0
refactor how getCMSFields is built to handle no parent form
2018-02-20 11:45:45 +00:00
Dylan Wagstaff
20570ef108
Merge pull request #717 from creative-commoners/pulls/5.0/better_email_recipient_logic
...
adds logic for presence of email recipient fields
2018-02-15 10:41:27 +13:00
Daniel Hensby
ebdfbb5502
Merge pull request #719 from creative-commoners/pulls/5.0/revert_DO_to_UF_relationship_change
...
revert UDF has_one to DO has_one
2018-02-14 15:08:27 +00:00
Andrew Aitken-Fincham
201282874f
revert UDF has_one to DO has_one
2018-02-14 15:02:27 +00:00
Andrew Aitken-Fincham
0f6efea12a
add proper fallbacks to cover tests
2018-02-14 11:30:35 +00:00
Dylan Wagstaff
516452bb14
Merge pull request #716 from creative-commoners/pulls/5.0/fix_permissions_on_email_recipient
...
fall back to CMSMain rather than LeftAndMain to getFormParent correctly
2018-02-14 09:55:43 +13:00
Andrew Aitken-Fincham
8c34519644
adds logic for presence of email recipient fields
2018-02-13 16:24:53 +00:00
Andrew Aitken-Fincham
579028982c
fall back to CMSMain rather than LeftAndMain to getFormParent correctly
2018-02-13 14:41:38 +00:00
Dylan Wagstaff
46460c0e7c
FIX Enhance JS for multiple userform instances ( #715 )
...
After testing it seems that having multiple user defined forms on a page
has already been added as a feature. However various load time dynamically
generated javascript segments had not been adapted to suit. Now they
have.
Also fixed a variable that no longer exists in the external requirements
from preventing a webpack build.
2018-02-12 16:56:36 +13:00
Dylan Wagstaff
311eee9d2c
Merge pull request #713 from martinduparc/patch-3
...
jquery version update
2018-02-09 10:11:41 +13:00
Martin D
eafe6609e1
jquery version update
2018-02-08 15:48:51 -05:00
Robbie Averill
fa249dd09f
Merge branch '4'
2018-02-05 12:10:50 +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 )
2018-02-05 12:08:24 +13:00
Dylan Wagstaff
9ca53d1adb
Merge pull request #709 from creative-commoners/pulls/5.0/display-rules-message
...
FIX Update display rules not enabled warning message to be full width
2018-02-02 14:37:38 +13:00
Raissa North
36e25b7a6a
FIX Update source translation for Form.FIELDISREQUIRED ( #710 )
...
Change made so that template output is populated correctly.
2018-02-02 14:33:31 +13:00
Robbie Averill
7339c1c498
FIX Update display rules not enabled warning message to be full width
2018-02-02 12:58:19 +13:00
Raissa North
77c47a38fa
FIX Fix support address list in email address fields ( #707 )
2018-01-29 09:56:44 +13:00
Dylan Wagstaff
9a09873e7d
Merge pull request #704 from creative-commoners/pulls/5.0/fix-email-template-data
...
FIX Submitted form field data is rendered correctly in recipient email templates
2018-01-26 09:39:22 +13:00
Martin D
ad7b2c4ff2
Update UserDefinedFormController.php ( #705 )
...
Added $request argument to index method
2018-01-26 09:31:06 +13:00
Robbie Averill
e1a7030306
FIX Submitted form field data is rendered correctly in recipient email templates
...
Also remove some deprecated code from UserDefinedFormControllerTest and allow
simple or starter theme to be used in the test.
2018-01-25 16:17:28 +13:00
Dylan Wagstaff
9833086dc8
Merge pull request #703 from creative-commoners/pulls/5.0/sxift
...
FIX Email templates for submissions to display correctly, and attach files to emails
2018-01-25 11:55:41 +13:00
Robbie Averill
515f1923ba
FIX Update email attachment API for recipients and improve if statement readability
2018-01-25 11:24:36 +13:00
Robbie Averill
5695c9585a
FIX Email templates for for submissions display correctly in preview
2018-01-24 15:17:03 +13:00
Dylan Wagstaff
699dd32179
Merge pull request #702 from creative-commoners/pulls/5.0/gridfieldextensions
...
NEW Update GridFieldExtensions constraint to a 3.1.0 minimum
2018-01-23 13:27:29 +13:00
Robbie Averill
a4494266a7
NEW Update GridFieldExtensions constraint to a 3.1.0 minimum
2018-01-23 12:56:46 +13:00
Robbie Averill
43f0fc1d3b
Merge pull request #700 from creative-commoners/pulls/fix-syntax-error
...
Fix JS syntax error in UserForms.js
2018-01-10 20:09:00 +13:00
Raissa North
6cd679e2b9
FIX Add missing single quote in UserForms.js
2018-01-10 16:48:10 +13:00
Robbie Averill
e716209556
Merge pull request #677 from fullscreeninteractive/pulls/fix-email-rep-templates
...
Update default email_template_directory
2017-12-04 23:58:15 +13:00
Robbie Averill
262510a450
FIX Cast template values as array, include list in CMS fields for recipients
2017-12-04 23:45:52 +13:00
Will Rossiter
e82dc5f121
Update default email_template_directory
...
Also if the overridded directory is empty - don’t display the template dropdown as this will cause a validation error preventing the user from saving the page.
2017-12-04 23:27:12 +13:00
Dylan Wagstaff
5b59732c08
Merge pull request #688 from creative-commoners/pulls/5.0/update-composer-deps
...
Update composer dependencies for SS4 stable, and require gridfieldextensions 3.0.x-dev
2017-11-21 09:32:19 +13:00
Robbie Averill
821ba1f909
Update Scrutinizer config to run new build system
2017-11-20 17:50:55 +13:00
Robbie Averill
8bec75ca37
Update composer dependencies for SS4 stable, and require gridfieldextensions 3.0.x-dev
2017-11-20 17:48:12 +13:00
Robbie Averill
3e3450614b
Merge pull request #687 from creative-commoners/pulls/5.0/unerror-the-js
...
FIX javascript errors enacting default functionality
2017-11-20 17:36:23 +13:00
Dylan Wagstaff
7f208ee927
FIX javascript errors enacting default functionality
...
Mostly to do with translations, however the errors meant the front end
forms largely didn't work at all. Some of this was to do with the scoping
of `this` in es6 arrow functions, compared to the legacy code with entwine
that uses the fuller `function` definition. Reinstate missing dependency
for translations to function too.
2017-11-20 15:16:03 +13:00
Dylan Wagstaff
bcadbad092
Merge pull request #683 from creative-commoners/pulls/5.0/update-icon-paths
...
FIX Update getIcon resource resolution methods
2017-11-03 14:40:13 +13:00
Robbie Averill
ccf8f86bf8
FIX Update getIcon resource resolution methods
2017-11-03 11:12:55 +13:00
Robbie Averill
077d1463ed
DOCS Use flat badges in readme and remove Helpfulrobot
2017-11-01 17:30:24 +13:00
Dylan Wagstaff
a0a73de277
Merge pull request #682 from creative-commoners/pulls/5.0/fix-fields-method
...
FIX Explicitly get the Fields() method from controller's data record
2017-11-01 17:04:21 +13:00
