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
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
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
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
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
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
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
Steve Boyd
2a47b1821e
NEW Extension to link file submissions to userform on the used on table
2020-11-04 11:47:50 +13:00
Dylan Wagstaff
0ce94b75f5
FIX correctly calculate MaxFileSizeMB
...
The inputted value is intended to represent megabytes, but is only
multiplied by 1024 - meaning it'd represent kilobytes. This is then used
to compare with the PHP setting number, which is bytes in the range of
megabytes. Kilobytes are always under megabytes, meaning size
comparisons elsewhere in the code are always true.
We should ensure the calculation for validation is correct.
2020-11-01 11:31:23 +13:00
Maxime Rainville
d2bf27c847
MNT Fix broken merged up ( #1013 )
2020-10-22 15:47:17 +13:00
Maxime Rainville
4eb0fe25b9
Merge branch '5.5' into 5.6
2020-10-22 10:22:19 +13:00
Maxime Rainville
61454fc5b9
Merge branch '5.4' into 5.5
2020-10-22 10:19:22 +13:00
Steve Boyd
4d56a6ae7c
Merge branch '5.7' into 5
2020-09-22 10:29:31 +12:00
Steve Boyd
42df67fe76
Merge branch '5.6' into 5.7
2020-09-22 10:29:09 +12:00
Steve Boyd
273cb1e46b
Merge branch '5.6' into 5
2020-09-22 10:27:58 +12:00
Steve Boyd
e1746d3e05
Merge pull request #1002 from creative-commoners/pulls/5.6/vertical-align-icon
...
FIX Vertically align confirm folder icon
2020-09-22 10:25:47 +12:00
Sacha Judd
347cfe6101
Merge pull request #1003 from creative-commoners/pulls/5/remove-boostrap3-class
...
BUG Remove old boostrap 3 CSS class
2020-09-16 12:26:47 +12:00
Maxime Rainville
24e770e00d
BUG Remove old boostrap 3 CSS class
2020-09-16 11:38:33 +12:00
Steve Boyd
f09691f9cb
FIX Vertically align confirm folder icon
2020-09-15 15:24:16 +12:00
dependabot[bot]
268d4e0be9
Merge pull request #995 from silverstripe/dependabot/npm_and_yarn/elliptic-6.5.3
2020-09-04 00:03:07 +00:00
Steve Boyd
dd9618e768
Merge branch '5.6' into 5
2020-09-03 09:35:15 +12:00
Garion Herman
162319512b
Merge pull request #1000 from creative-commoners/pulls/5.6/submit-error
...
FIX Check hidden inputs exist to prevent browser alert when submitting form
2020-09-02 13:47:09 +12:00
Steve Boyd
f5d07aa682
FIX Check hidden inputs exist to prevent browser alert when submitting form
2020-09-02 13:21:53 +12:00
Robbie Averill
d82bb6b25e
Merge pull request #998 from creative-commoners/pulls/5.6/default-translations
...
FIX Use translation string that belongs to UserDefinedFormAdmin
2020-08-19 09:19:31 -07:00
Steve Boyd
8d09cb171f
FIX Use translation string that belongs to UserDefinedFormAdmin
...
This is to for the benefit of cow translate which did not like the use of _t(CMSMain::class
2020-08-18 12:20:10 +12:00
Garion Herman
caeef2fc48
Update translations
2020-08-18 11:04:37 +12:00
dependabot[bot]
719ed96570
Bump elliptic from 6.5.1 to 6.5.3
...
Bumps [elliptic](https://github.com/indutny/elliptic ) from 6.5.1 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases )
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.1...v6.5.3 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-07-30 12:38:37 +00:00
