Commit Graph

1752 Commits

Author SHA1 Message Date
Maxime Rainville
4d9e78a841 Merge branch '5.9' into 5 2021-05-28 14:36:57 +12:00
Maxime Rainville
9e66b403be Merge branch '5.8' into 5.9 2021-05-28 14:36:23 +12:00
Maxime Rainville
2b249c29e2
Merge pull request #1075 from creative-commoners/pulls/5.8/fix-orphan-removal-test
MNT Fix testOrphanRemovalDoesNotAffectOtherClassesWithTheSameID to start with a First Page Step
2021-05-28 09:46:45 +12:00
Maxime Rainville
a989700d52 MNT Fix testOrphanRemovalDoesNotAffectOtherClassesWithTheSameID to start with a First Page Step 2021-05-27 11:45:39 +12:00
Steve Boyd
203e3749af Merge branch '5.9' into 5 2021-05-21 14:31:08 +12:00
Daniel Hensby
41fa8f0718
Merge pull request #1051 from wilr/wilr-patch-1
FIX Uploaded files not appearing in emails and cleanup deleted files.
2021-05-17 09:10:31 +01:00
Maxime Rainville
1915acf05f Update translations 2021-05-17 15:09:54 +12:00
Will Rossiter
beaf901208
FIX When deleting form submission, delete linked file 2021-05-17 09:13:19 +12:00
dependabot[bot]
e9e1f8cbcf
Merge pull request #1047 from silverstripe/dependabot/npm_and_yarn/elliptic-6.5.4 2021-05-15 07:19:28 +00:00
dependabot[bot]
8450b219c4
Merge pull request #1066 from silverstripe/dependabot/npm_and_yarn/hosted-git-info-2.8.9 2021-05-15 07:19:15 +00:00
dependabot[bot]
0208b9db2b
Merge pull request #1064 from silverstripe/dependabot/npm_and_yarn/lodash-4.17.21 2021-05-15 07:19:02 +00:00
dependabot[bot]
19a185d86a
Bump lodash from 4.17.20 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-14 20:41:25 +00:00
dependabot[bot]
e866b09376
Bump hosted-git-info from 2.8.5 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.5 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.5...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-14 20:41:24 +00:00
dependabot[bot]
9fcfe23f7f
Bump elliptic from 6.5.3 to 6.5.4
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-14 20:41:19 +00:00
dependabot[bot]
b91f53ec39
Merge pull request #1048 from silverstripe/dependabot/npm_and_yarn/npm-6.14.11 2021-05-14 20:40:34 +00:00
dependabot[bot]
c4132dba6b
Merge pull request #1052 from silverstripe/dependabot/npm_and_yarn/y18n-3.2.2 2021-05-14 20:39:51 +00:00
Dan Hensby
ce18179d49
Merge pull request #1049 from hamaka/fix/attachments_respecting_hideformdata 2021-05-14 21:32:09 +01:00
Daniel Hensby
bc5689b55a
Merge pull request #1056 from purplespider/patch-1
Stops reply-to address being set to empty, if reply-to field value is empty
2021-05-14 21:21:52 +01:00
Steve Boyd
4d2ca74ea5 Merge branch '5.8' into 5 2021-05-03 15:34:18 +12:00
Andre Kiste
6b94f9b791
Merge pull request #1040 from creative-commoners/pulls/5.8/email-preview
FIX Show correct fields in email preview
2021-05-03 15:25:18 +12:00
Steve Boyd
911400003b Merge branch '5.8' into 5 2021-04-27 15:10:05 +12:00
Andre Kiste
d8ab74247c
Merge pull request #1057 from creative-commoners/pulls/5.8/i-click-elements
MNT Use behat-extension function for clicking elements
2021-04-22 12:28:09 +12:00
Steve Boyd
d178652cf8 MNT Use behat-extension function for clicking elements 2021-04-15 13:25:47 +12:00
Maxime Rainville
a917fbe2ea Merge branch '5.8' into 5 2021-04-14 11:30:53 +12:00
Maxime Rainville
2bd2ee9780
Merge pull request #1042 from creative-commoners/pulls/5.8/dir-seperator-windows-unit-test
MNT Unit test for directory seperator on windows
2021-04-14 11:26:16 +12:00
Steve Boyd
6794aa7cd3 MNT Unit test for directory seperator on windows 2021-04-13 22:48:52 +12:00
Maxime Rainville
3993f019e9
Merge pull request #1037 from creative-commoners/pulls/5.8/plain-text-merge-fields
FIX Include merge fields in plain text emails
2021-04-13 22:45:18 +12:00
Steve Boyd
52e678c6e7 FIX Include merge fields in plain text emails 2021-04-13 19:05:29 +12:00
James Cocker
b01d296c42
Avoids reply to address being set to empty, if reply to field value is empty 2021-04-12 21:27:25 +01:00
Bauke Zwaan
4a883f1641 fix for testing EmailRecipients 2021-04-12 15:22:45 +02:00
Bauke Zwaan
34883adb12 Add testing 2021-04-06 15:46:37 +02:00
Maxime Rainville
540bfbd743
Merge pull request #1054 from fromholdio/fix/psr-4-compliance
Fixes #1053 UsedOnTableExtension namespace psr-4 compliant
2021-04-05 21:19:14 +12:00
Luke Fromhold
78f3e68a25 Fix directory for UsedOnTableExtension namespace, to be psr-4 compliant. New dir rather than namespace to prevent backwards-incompat. 2021-04-02 16:04:17 +11:00
dependabot[bot]
78a49b9d49
Bump y18n from 3.2.1 to 3.2.2
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 14:34:26 +00:00
Will Rossiter
e925aa1979
FIX Uploaded files not appearing in emails
As files uploaded into `DRAFT` mode ensure that these are still displayed in the submitted form.
2021-03-22 21:30:14 +13:00
3Dgoo
c71cf11a8e
Fix <br> in textarea on validation redirect (#1035)
* Fix <br> in textarea on validation redirect

When someone inserts break lines in a textarea field and submits the form, if the form validation fails and the form is populated the text area will populate with <br> displayed in the field.

This fixes that issue.

* Update EditableTextareaField.ss
2021-03-22 17:10:42 +13:00
Bauke Zwaan
fad372d4ba Only add attachments when HideFormData-setting is not set for this recipient 2021-03-12 09:30:11 +01:00
dependabot[bot]
f1fb087812
Bump npm from 6.13.4 to 6.14.11
Bumps [npm](https://github.com/npm/cli) from 6.13.4 to 6.14.11.
- [Release notes](https://github.com/npm/cli/releases)
- [Changelog](https://github.com/npm/cli/blob/v6.14.11/CHANGELOG.md)
- [Commits](https://github.com/npm/cli/compare/v6.13.4...v6.14.11)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-11 01:02:47 +00:00
Steve Boyd
a617be30fe Merge branch '5.8' into 5 2021-03-11 14:00:06 +13:00
Steve Boyd
b0b35465c3
Merge pull request #1038 from creative-commoners/pulls/5.8/second-page-intial-visibility-hide
FIX Visibility of subsequent form fields and step buttons
2021-03-11 13:48:29 +13:00
Steve Boyd
cdf6264242 MNT Behat test for hidden form steps 2021-03-10 16:06:01 +13:00
Steve Boyd
79259b593a FIX Visibility of subsequent form fields and step buttons 2021-03-10 16:06:01 +13:00
Garion Herman
a4f2043d9a
Merge pull request #1045 from creative-commoners/pulls/5.8/jquery-yarn
ENH Use yarn and webpack to upgrade jquery
2021-03-04 17:40:59 +13:00
Steve Boyd
9eaee41282 ENH Use yarn and webpack to upgrade jquery 2021-03-04 17:05:55 +13:00
Chris Penny
72a213790e
MNT Update docblocks and import statements (#1044) 2021-02-26 16:13:23 +13:00
Steve Boyd
75fe398be5
Merge pull request #1041 from chrometoasters/pulls/1039-email-template-path-win-fix
Use correct directory separator on Windows when selecting email templates
2021-02-21 21:50:33 +13:00
Michal Kleiner
0abda42179 Use correct directory separator on Windows when selecting email templates 2021-02-10 11:52:15 +13:00
Steve Boyd
18bf5c7186
Update build status badge 2021-01-21 16:43:21 +13:00
Steve Boyd
8801790b66 FIX Show correct fields in email preview
Co-authored-by: Michael Caruana <mikeyc7m@users.noreply.github.com>
2021-01-17 22:55:10 +13:00
Steve Boyd
146bffeaff Merge branch '5.8' into 5 2021-01-17 15:59:16 +13:00