Commit Graph

1463 Commits

Author SHA1 Message Date
Maxime Rainville
de9b93f5cd Merge branch '5.3' into 5.4 2020-06-25 16:53:04 +12:00
Maxime Rainville
3dffbef9f2 Merge branch '5.2' into 5.3 2020-06-25 16:44:42 +12:00
Maxime Rainville
a3896eb39e
Test postgresql (#979) 2020-06-25 16:44:11 +12:00
Maxime Rainville
1bbdb86c9a Merge branch '5.3' into 5.4 2020-05-26 15:04:51 +12:00
Maxime Rainville
8307b8bee9 Merge branch '5.2' into 5.3 2020-05-26 15:04:08 +12:00
Maxime Rainville
826025c68d Merge branch '5.1' into 5.2 2020-05-26 15:03:44 +12:00
Maxime Rainville
24c24ad7b8 Merge branch '5.0' into 5.1 2020-05-26 15:02:57 +12:00
Serge Latyntcev
3349599a89 Merge tag '5.4.2' into 5.4
Release 5.4.2
2020-04-15 12:37:43 +12:00
Serge Latyntcev
3bbad20442 [CVE-2020-9280] Task for shifting UserForm uploads into correct folders
A task helper for recovering UserForm uploads targeting incorrectly migrated folders (from Silverstripe CMS 3)
    If your project has not been migrated from Silverstripe CMS 3, you do not need this helper.
    Before running this task make sure you have repaired the migrated folders themselves.
    To do that you have to run the extra migration subtask (`migrate-folders`).

    This task is particularly looking at all UserForm file submissions and checks they are in the same
    folder where the particular version of its EditableFileField has been set up to upload it to.

    If it finds the file has been misplaced, it tries to move it to the correct folder, but only if
    the file has not had any manipulations since the uploading happened (the file Version=1).

    If an affected file has a draft, then only Live version will be moved, but the draft will be preserved as is.

    For more details see CVE-2020-9280
2020-04-14 15:58:23 +12:00
Garion Herman
c58565e6ce
Merge pull request #943 from creative-commoners/pulls/5.0/revert-default-value
Revert default value
2020-03-16 16:56:27 +13:00
Steve Boyd
1c73fd90ca Revert default value 2020-03-16 16:36:36 +13:00
Maxime Rainville
71a8cac9e5
BUG Remove bad default value for UserForm Content (#926)
* BUG Remove bad default value for UserForm Content

* BUG Update travis build to use Xenial
2020-03-09 15:35:58 +13:00
Robbie Averill
0c59065d32 Merge branch '5.3' into 5.4 2019-06-27 14:13:52 +12:00
Robbie Averill
3c1197c0a6 Merge branch '5.2' into 5.3 2019-06-27 14:13:41 +12:00
Robbie Averill
551ef4fa56 Merge branch '5.1' into 5.2 2019-06-27 14:13:29 +12:00
Robbie Averill
4fb27d3138 Merge branch '5.0' into 5.1 2019-06-27 14:12:57 +12:00
Robbie Averill
0114ea4275 Remove SilverStripe 4.0-4.2 from Travis builds 2019-06-27 14:12:46 +12:00
Guy Marriott
d7c76ecf80
FIX Preview email link now handles cases where it's loaded in the browser, requested via AJAX and used in a trait or a page context (#887)
FIX Preview email link now handles cases where it's loaded in the browser, requested via AJAX and used in a trait or a page context
2019-05-27 20:01:56 +12:00
Guy Marriott
f4cd7a3836
FIX Allowed text length fields now align correctly with each other (#886)
FIX Allowed text length fields now align correctly with each other
2019-05-21 11:48:01 +12:00
Robbie Averill
483fbc8499 FIX Preview email link now handles cases where it's loaded in the browser, requested via AJAX and used in a trait or a page context 2019-05-17 15:51:11 +12:00
Robbie Averill
d0e937a588 FIX Allowed text length fields now align correctly with each other 2019-05-17 15:12:57 +12:00
Robbie Averill
d141c83e0a Import missing PHPDoc doc blocks, switch intval() for (int) casting 2019-05-17 14:56:00 +12:00
Guy Marriott
15c170bb49
Merge pull request #885 from creative-commoners/pulls/5.4/step-title-display
FIX Multi page userforms now display their step titles, which were previously broken
2019-05-17 14:01:19 +12:00
Robbie Averill
181e0de171 FIX Multi page userforms now display their step titles, which were previously broken 2019-05-17 11:12:27 +12:00
Robbie Averill
5758075d42 Update translations 2019-05-10 10:14:40 +12:00
Guy Marriott
b990c9e004
Update translations 2019-05-09 15:44:58 +12:00
Robbie Averill
e63dd46381 Update jquery to 3.4.0 2019-05-08 11:29:58 +12:00
Robbie Averill
52c0074ef3
Merge pull request #881 from creative-commoners/pulls/5.4/resilient-recipients
Add presence validation for EmailRecipient recipient, add error handling
2019-05-06 09:21:28 +12:00
Garion Herman
2f0aea847a Add presence validation for EmailRecipient recipient, add error handling 2019-05-03 16:46:32 +12:00
Robbie Averill
b3dc50d253 Merge branch '5.3' into 5.4 2019-05-03 10:16:58 +12:00
Robbie Averill
c63a06cb91 Merge branch '5.2' into 5.3 2019-05-03 10:16:47 +12:00
Robbie Averill
44d6766440 Merge branch '5.1' into 5.2 2019-05-03 10:16:34 +12:00
Robbie Averill
334dca59ab Merge branch '5.0' into 5.1 2019-05-03 10:16:21 +12:00
Dylan Wagstaff
08d981ab1c
Merge pull request #880 from creative-commoners/pulls/5.4/better-add-button-support
FIX Support new arguments for better buttons support
2019-05-02 15:09:35 +12:00
Guy Marriott
9d311ca02b
FIX Support new arguments for better buttons support 2019-05-02 14:48:19 +12:00
Robbie Averill
1ac3f5a97c Merge branch '5.3' into 5.4 2019-05-02 11:02:23 +12:00
Robbie Averill
5f3014ac54 Merge branch '5.2' into 5.3 2019-05-02 11:02:12 +12:00
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
0c5d83daf9 Remove obsolete branch alias 2019-04-15 15:37:32 +12:00
Robbie Averill
a4cd982637 Merge branch '5.3' 2019-03-26 14:46:22 +13:00
Robbie Averill
b1a04d6563
Merge pull request #871 from quantum-dragons/pulls/fix-form-vallidation-exception-message
Fix exception error message fails when error in upload file.
2019-03-26 14:44:57 +13:00
Ishan Jayamanne
3615f416e3 Fix exception error message fails when error in upload file. 2019-03-26 01:28:36 +00:00
Robbie Averill
ad9612c3e9
Merge pull request #870 from creative-commoners/pulls/5.3/reintroduce-conditional-form-steps
FIX Display rules for page breaks/editable form steps now works again
2019-03-26 14:02:55 +13:00
Robbie Averill
3e450c0add
Merge pull request #869 from creative-commoners/pulls/5.3/submit-no-errors
FIX correct userform reference & avoid submit errors
2019-03-26 09:13:43 +13:00
Robbie Averill
bf142eb6ef 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-25 15:09:38 +13:00
NightjarNZ
1d0c347d7f FIX correct userform reference & avoid submit errors
"Uncaught TypeError: Cannot read property 'data' of undefined
Was being reported when attempting to submit a form, which would
then trigger the "are you sure" functionality which should only
show when attempting to browse away from a page when changes to the
form have been made.
2019-03-24 14:35:19 +13:00