Commit Graph

1629 Commits

Author SHA1 Message Date
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
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
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
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
Steve Boyd
ce2fe31bdd Merge branch '5.7' into 5.8 2021-01-17 15:58:55 +13:00
Dylan Wagstaff
c0a30f1b6a
FIX unrequire fields when they become dataless (#1016)
* FIX unrequire fields when they become dataless

When fields that collect input data are changed in configuration via the
CMS to become fields that no longer collect input data (e.g. TextField
-> HTML Block), submitting the resulting form results in a fatal error,
server 500 response, etc. due to trying to check if a field without data
(ever) has data in it.

To circumvent this we can set the required state to false if the field
is being converted to one that does not collect data (which FormField
API conveniently provides a check for).

* Move parent::onBeforeWrite() to top of function

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
2021-01-17 15:55:47 +13:00
Dylan Wagstaff
a42729679b
FIX account for owner class while removing orphans (#1018)
* FIX account for owner class while removing orphans
* Explicitly set $page and $block ID's in test fixture

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
2021-01-17 15:29:33 +13:00
Dylan Wagstaff
e7f51d227a
ENH Move jQuery include away from CDN (#1019)
- Move jQuery include away from CDN
2021-01-17 14:37:01 +13:00
dependabot[bot]
5433b7502d
Merge pull request #1033 from silverstripe/dependabot/npm_and_yarn/ini-1.3.7 2020-12-31 06:47:29 +00:00
Garion Herman
2a56891f67 Merge branch '5.8' into 5 2020-12-21 11:20:21 +13:00
Garion Herman
7ae70598f8
Merge pull request #1029 from creative-commoners/pulls/5.8/travis-shared
MNT Travis shared config
2020-12-21 11:18:56 +13:00
dependabot[bot]
85fa3be976
Bump ini from 1.3.5 to 1.3.7
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 02:49:47 +00:00
Steve Boyd
a007ca476c
Merge pull request #1032 from creative-commoners/pulls/5.8/fix-translation-keys
FIX Reformat malformed translation keys in lang files
2020-12-10 17:10:09 +13:00
Garion Herman
fcf2d2f5dc FIX Reformat malformed translation keys in lang files
The related translation keys were patched in #1031.
2020-12-10 15:38:20 +13:00
Garion Herman
7f0e24cc79
Merge pull request #1031 from chrometoasters/pulls/1030-translations-dot-fix
FIX Add missing dots in translation string references
2020-12-10 14:36:18 +13:00
Garion Herman
8f358be859
Merge pull request #1027 from creative-commoners/pulls/5.8/update-translations
Revert translation update
2020-12-10 14:33:12 +13:00
Steve Boyd
9471b54d7e MNT Travis shared config, use sminnee/phpunit 2020-12-08 14:56:47 +13:00
Steve Boyd
0e997259de Revert translation update 2020-12-07 17:29:11 +13:00
Michal Kleiner
66bbe44972
FIX Add missing dots in translation string references 2020-12-02 10:01:50 +13:00
Steve Boyd
5c64cc825f ENH Update translations 2020-11-18 12:56:02 +13:00
Garion Herman
d0e0740f9c
Merge pull request #1001 from silverstripe/dependabot/npm_and_yarn/node-sass-4.14.1
Bump node-sass from 4.13.0 to 4.14.1
2020-11-17 13:28:20 +13:00
Garion Herman
ad0c8ae52f DEP Rebuild assets after node-sass update 2020-11-17 11:38:47 +13:00
dependabot[bot]
0c01160e74 Bump node-sass from 4.13.0 to 4.14.1
Bumps [node-sass](https://github.com/sass/node-sass) from 4.13.0 to 4.14.1.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.13.0...v4.14.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-17 11:38:20 +13:00
Steve Boyd
f81360e737 Merge branch '5.7' into 5 2020-11-12 15:18:00 +13:00
Steve Boyd
ead1827aa1 Merge branch '5.6' into 5.7 2020-11-12 15:17:31 +13:00
Scott Hutchinson
8dd6950218
Merge pull request #1020 from NightJar/fix/5.7/maxfilesize
FIX correctly calculate MaxFileSizeMB
2020-11-11 15:10:01 +13:00
Garion Herman
6df5397a32
Merge pull request #1015 from creative-commoners/pulls/5/usedontable-extension
NEW Extension to link file submissions to userform on the used on table
2020-11-04 14:35:46 +13:00