Commit Graph

1555 Commits

Author SHA1 Message Date
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 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
Steve Boyd f09691f9cb FIX Vertically align confirm folder icon 2020-09-15 15:24:16 +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
Steve Boyd bd494e1f78
Merge pull request #992 from creative-commoners/pulls/5.6/caught-in-the-middlecolumn
FIX Place validation messages on .field if .middleColumn is missing
2020-07-24 14:45:38 +12:00
Garion Herman 792fd82419 FIX Place validation messages on .field if .middleColumn is missing
Checkbox and OptionSet fields attempt to place validation errors in
.middleColumn to align them with the label, but in some custom themes
this is not available, so the error is swallowed instead. Instead, we
should place it in the main wrapping .field element as a fallback.
2020-07-22 15:48:00 +12:00
Steve Boyd de5a671645
Merge pull request #986 from creative-commoners/pulls/5.6/trim-recipient-email
FIX Trim recipient email addresses before write
2020-07-15 09:01:24 +12:00
Steve Boyd 59cd87d842 FIX Trim recipient email addresses before write 2020-07-14 16:41:36 +12:00
Maxime Rainville 27228d12af [CVE-2020-9309] Require MimeUploadValidator on userformis' File Upload field 2020-07-13 11:33:46 +12:00
Maxime Rainville 9e008e6341 [CVE-2020-9309] Require MimeUploadValidator on userformis' File Upload field 2020-07-13 11:25:17 +12:00
Maxime Rainville 575d1f99a4 Merge branch '5.5' into 5.6 2020-07-09 14:40:04 +12:00
Chris Penny 0c09eec6f8
DOC Add docs around creating custom fields. Fixed #928 (#932)
* Add docs around creating custom fields
* Update docs/en/creating-custom-fields.md
Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
2020-07-06 08:41:59 +12:00
Maxime Rainville 9645d9d809 Merge branch '5.4' into 5.5 2020-06-25 17:07:42 +12:00
Maxime Rainville 6f04f9537d Fix linting issue 2020-06-25 17:04:20 +12:00
Maxime Rainville b80868c091 Merge branch '5.4' into 5.5 2020-06-25 16:57:44 +12:00
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 c0c46981de Update translations 2020-06-16 13:50:26 +12:00
Steve Boyd 03b32659ca
Update for 5.6 (#978) 2020-06-16 05:23:02 +12:00
Andre Kiste 88c6433f07
Merge pull request #976 from creative-commoners/pulls/5/fix-for-elemental-block
BUG Fix confirm upload form modal on Elemental block
2020-06-14 14:03:20 +12:00
Maxime Rainville 25978d3c58 Clean up tests 2020-06-12 00:55:12 +12:00
Maxime Rainville df120133ab Move confirm folder logic to a dedicated controller 2020-06-11 19:53:46 +12:00
Maxime Rainville dc5ce0000a BUG Fix confirm upload form modal on Elemental block 2020-06-11 15:17:13 +12:00
Andre Kiste 3b40be3b8f
NEW Add folder confirmation modal when adding a new `EditableFileField` to a userform. (#972) 2020-06-10 16:59:01 +12:00
Garion Herman 14ce51e517
NEW Improve Unrestricted Folder warning, bump core requirement to ^4.6 (#965) 2020-06-09 21:01:09 +12:00
Steve Boyd 447be1049e
Merge pull request #964 from creative-commoners/pulls/5/file-manager-icons
NEW DB column showing if file is userform upload
2020-05-28 14:46:11 +12:00
Steve Boyd ed53709631 NEW DB column showing if file is userform upload
- UserFormUpload used by File::isTrackedFormUpload()
2020-05-28 13:14:34 +12:00
Steve Boyd e54a825ea3 Merge branch '5.5' into 5 2020-05-27 13:41:51 +12:00
Steve Boyd c3d990f70f
FIX Create image thumbnails for asset-admin for images uploaded through userforms (#969) 2020-05-27 12:26:14 +12:00
Maxime Rainville f27045ba93
DOC Recommend installation of spamprotection (#966)
DOC Recommend installation of spamprotection
2020-05-27 08:55:37 +12:00
Maxime Rainville 09ea65edc7 Merge branch '5.5' into 5 2020-05-26 15:13:09 +12:00
Maxime Rainville 319fa4734c Merge branch '5.4' into 5.5 2020-05-26 15:11:46 +12:00
Maxime Rainville 133e897ad3 Merge branch '5.4' into 5 2020-05-26 15:06:14 +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
Robbie Averill 26004d464a
Merge pull request #961 from dhensby/pulls/5.5/lint-fix
Linting fixes
2020-05-11 12:44:31 -07:00
Dan Hensby e86cc8d872
Add lint and lint-clean scripts to composer 2020-05-05 16:33:28 +01:00
Dan Hensby ede2d93363
Linting fixes 2020-05-05 16:30:57 +01:00
Dan Hensby 5a1da4c2c1
Merge pull request #958 from silverstripe-terraformers/bugfix/empty-anchor 2020-05-05 16:29:08 +01:00
Robbie Averill 45489fa312
Merge pull request #953 from silverstripe/dependabot/npm_and_yarn/jquery-3.5.0
Bump jquery from 3.4.1 to 3.5.0
2020-05-04 16:56:29 -07:00
Robbie Averill 208213372a
Merge pull request #955 from lerni/patch-1
update docs
2020-05-04 16:51:21 -07:00