diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fd9d40e62..3bd1772880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,24 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [v6.107.0](https://github.com/opengovsg/FormSG/compare/v6.106.0...v6.107.0) + +- feat: add Not Applicable to MyInfo occupations list [`#7032`](https://github.com/opengovsg/FormSG/pull/7032) +- chore: sync frontend package version with root [`#7061`](https://github.com/opengovsg/FormSG/pull/7061) +- chore: update readme for installing virus-scanner packages [`#7062`](https://github.com/opengovsg/FormSG/pull/7062) +- fix: recaptcha cn [`#7059`](https://github.com/opengovsg/FormSG/pull/7059) +- build: merge release v6.106.0 into develop [`#7060`](https://github.com/opengovsg/FormSG/pull/7060) +- build: release v6.106.0 [`#7055`](https://github.com/opengovsg/FormSG/pull/7055) + #### [v6.106.0](https://github.com/opengovsg/FormSG/compare/v6.105.0...v6.106.0) +> 31 January 2024 + - build: release v6.105.0 [`#7054`](https://github.com/opengovsg/FormSG/pull/7054) - build: merge release v6.104.0 into develop [`#7051`](https://github.com/opengovsg/FormSG/pull/7051) - build: merge release v6.103.0 into develop [`#7041`](https://github.com/opengovsg/FormSG/pull/7041) - feat(scripts): save multi-language forms report to tsv files [`#7027`](https://github.com/opengovsg/FormSG/pull/7027) +- chore: bump version to v6.106.0 [`8768ba2`](https://github.com/opengovsg/FormSG/commit/8768ba293bb4295bd69c48ab3db4ec2f3374dfd4) #### [v6.105.0](https://github.com/opengovsg/FormSG/compare/v6.104.0...v6.105.0) @@ -154,13 +166,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix(deps): bump type-fest from 4.8.2 to 4.8.3 in /shared [`#6943`](https://github.com/opengovsg/FormSG/pull/6943) - build: merge release v6.92.0 into develop [`#6934`](https://github.com/opengovsg/FormSG/pull/6934) - build: release v6.92.0 [`#6932`](https://github.com/opengovsg/FormSG/pull/6932) +- feat: set secret key input to password type on activation modal [`#6933`](https://github.com/opengovsg/FormSG/pull/6933) +- chore: bump version to v6.92.0 [`28a8b9c`](https://github.com/opengovsg/FormSG/commit/28a8b9ca95f456c0f2c95d22813bf6d2ae1509ed) - chore: bump version to v6.93.0 [`f7e9dcf`](https://github.com/opengovsg/FormSG/commit/f7e9dcf49f5104815f11ecad6c48d6e71a1e1bf8) #### [v6.92.0](https://github.com/opengovsg/FormSG/compare/v6.91.1...v6.92.0) > 28 November 2023 -- feat: set secret key input to password type on activation modal [`#6933`](https://github.com/opengovsg/FormSG/pull/6933) - fix: add myinfo errors to error map for storage-mode submissions [`#6931`](https://github.com/opengovsg/FormSG/pull/6931) - feat(FE): set secret key input to password type [`#6930`](https://github.com/opengovsg/FormSG/pull/6930) - feat: add prefills for variable payments [`#6899`](https://github.com/opengovsg/FormSG/pull/6899) @@ -176,7 +189,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix: omit isVisible property from webhook response [`#6907`](https://github.com/opengovsg/FormSG/pull/6907) - feat: charts [`#6790`](https://github.com/opengovsg/FormSG/pull/6790) - build: merge release 6.90.0 to develop [`#6914`](https://github.com/opengovsg/FormSG/pull/6914) -- chore: bump version to v6.92.0 [`28a8b9c`](https://github.com/opengovsg/FormSG/commit/28a8b9ca95f456c0f2c95d22813bf6d2ae1509ed) +- chore: bump version to v6.92.0 [`72fac02`](https://github.com/opengovsg/FormSG/commit/72fac021a92df588be577c25690b49e96796387d) #### [v6.91.1](https://github.com/opengovsg/FormSG/compare/v6.91.0...v6.91.1) @@ -208,17 +221,25 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - build: merge release v6.89.1 into develop [`#6905`](https://github.com/opengovsg/FormSG/pull/6905) - chore: bump version to v6.90.0 [`c03692e`](https://github.com/opengovsg/FormSG/commit/c03692e3d9aa64afa8007dffecfd9871542f4759) -#### [v6.89.2](https://github.com/opengovsg/FormSG/compare/v6.89.0...v6.89.2) +#### [v6.89.2](https://github.com/opengovsg/FormSG/compare/v6.89.1...v6.89.2) > 17 November 2023 - fix: hotfix v6.89.1 for proper error handling in encrypt-submission middleware [`#6903`](https://github.com/opengovsg/FormSG/pull/6903) -- build: release v6.89.0 [`#6898`](https://github.com/opengovsg/FormSG/pull/6898) -- fix: remove myinfo child from storage mode [`#6901`](https://github.com/opengovsg/FormSG/pull/6901) - chore: revert commit 6869 [`efab3cf`](https://github.com/opengovsg/FormSG/commit/efab3cf844113573d758b1b2c57147d5d0656a28) - chore: bump version to 6.89.2 [`1f4e9f7`](https://github.com/opengovsg/FormSG/commit/1f4e9f70cd33ac2f015fb902de5243a4227e4981) - fix: remove error block [`fb415fc`](https://github.com/opengovsg/FormSG/commit/fb415fcd7189a90056557c242ed98f1dc10e757e) +#### [v6.89.1](https://github.com/opengovsg/FormSG/compare/v6.89.0...v6.89.1) + +> 16 November 2023 + +- build: release v6.89.0 [`#6898`](https://github.com/opengovsg/FormSG/pull/6898) +- fix: remove myinfo child from storage mode [`#6901`](https://github.com/opengovsg/FormSG/pull/6901) +- chore: bump version to 6.89.1 [`253dd25`](https://github.com/opengovsg/FormSG/commit/253dd2596844d28e5dc3caae298fc775fb1a3f75) +- fix: add error handling [`d6c4985`](https://github.com/opengovsg/FormSG/commit/d6c4985aa8e35dd2278af9b70d00d4e86a48bde1) +- fix: remove email mode from myinfo limit message [`5a45c98`](https://github.com/opengovsg/FormSG/commit/5a45c980dbe3fc8c15eacb3ff1827f3003fcbfc4) + #### [v6.89.0](https://github.com/opengovsg/FormSG/compare/v6.88.0...v6.89.0) > 15 November 2023 @@ -255,13 +276,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix: add case for SGID MyInfo when field value is missing [`#6874`](https://github.com/opengovsg/FormSG/pull/6874) - build: merge release v6.86.0 into develop [`#6873`](https://github.com/opengovsg/FormSG/pull/6873) - build: release v6.86.0 [`#6866`](https://github.com/opengovsg/FormSG/pull/6866) +- chore: use non-testing branch for font-wqy-zenhei [`#6867`](https://github.com/opengovsg/FormSG/pull/6867) +- chore: bump version to v6.86.0 [`1eec9b6`](https://github.com/opengovsg/FormSG/commit/1eec9b63c914b56b7b10adffd03554e07fde0f3a) - chore: bump version to v6.87.0 [`5054803`](https://github.com/opengovsg/FormSG/commit/50548038804b03f30ce6d23b4d43b7a8cf7d9620) #### [v6.86.0](https://github.com/opengovsg/FormSG/compare/v6.85.1...v6.86.0) > 6 November 2023 -- chore: use non-testing branch for font-wqy-zenhei [`#6867`](https://github.com/opengovsg/FormSG/pull/6867) - chore: update credits and terms of use [`#6865`](https://github.com/opengovsg/FormSG/pull/6865) - fix: add cloudflareinsights as allowable csp [`#6864`](https://github.com/opengovsg/FormSG/pull/6864) - feat: optimise submission query [`#6863`](https://github.com/opengovsg/FormSG/pull/6863) @@ -269,7 +291,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix: only render delete button if owner [`#6837`](https://github.com/opengovsg/FormSG/pull/6837) - build: merge release v6.85.1 into develop [`#6861`](https://github.com/opengovsg/FormSG/pull/6861) - fix: hotfix v6.85.1 to prevent creation of SGID_MyInfo storage mode forms [`#6860`](https://github.com/opengovsg/FormSG/pull/6860) -- chore: bump version to v6.86.0 [`1eec9b6`](https://github.com/opengovsg/FormSG/commit/1eec9b63c914b56b7b10adffd03554e07fde0f3a) +- chore: bump version to v6.86.0 [`1c827cd`](https://github.com/opengovsg/FormSG/commit/1c827cd11844649ca303bb5dc9987db5367637c9) #### [v6.85.1](https://github.com/opengovsg/FormSG/compare/v6.85.0...v6.85.1) diff --git a/README.md b/README.md index 5c4986faeb..274d62db2e 100755 --- a/README.md +++ b/README.md @@ -75,6 +75,11 @@ To install the relevant npm packages, run the following in the root direcory: npm install ``` +To also install the required virus-scanner packages on local, run the following in the `serverless/virus-scanner` directory: +```bash +npm install +``` + To prevent breaking changes to webpack4 introduced in node 17 and above, enable the `--openssl-legacy-provider` flag: ```bash diff --git a/frontend/package-lock.json b/frontend/package-lock.json index ef9a4b1cd0..ed38f972e8 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "form-frontend", - "version": "6.102.0", + "version": "6.107.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "form-frontend", - "version": "6.102.0", + "version": "6.107.0", "hasInstallScript": true, "dependencies": { "@chakra-ui/react": "^1.8.6", diff --git a/frontend/package.json b/frontend/package.json index c363a307bb..b1591f4639 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "form-frontend", - "version": "6.102.0", + "version": "6.107.0", "homepage": ".", "private": true, "dependencies": { diff --git a/frontend/src/features/admin-form/settings/components/AuthSettingsSection/EsrvcIdBox.tsx b/frontend/src/features/admin-form/settings/components/AuthSettingsSection/EsrvcIdBox.tsx index c7bf034e6f..36309201b8 100644 --- a/frontend/src/features/admin-form/settings/components/AuthSettingsSection/EsrvcIdBox.tsx +++ b/frontend/src/features/admin-form/settings/components/AuthSettingsSection/EsrvcIdBox.tsx @@ -65,7 +65,7 @@ export const EsrvcIdBox = ({ case FormAuthType.SP: case FormAuthType.CP: case FormAuthType.MyInfo: - return 'Contact spcp.transoffice@accenture.com for your e-service ID' + return 'Contact askNDI@tech.gov.sg for your e-service ID' default: return '' } diff --git a/package-lock.json b/package-lock.json index 2d3a407cf1..95bc7cbf5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "FormSG", - "version": "6.106.0", + "version": "6.107.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "FormSG", - "version": "6.106.0", + "version": "6.107.0", "hasInstallScript": true, "dependencies": { "@aws-sdk/client-cloudwatch-logs": "^3.347.1", diff --git a/package.json b/package.json index 8105327d10..d2fae4a145 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "FormSG", "description": "Form Manager for Government", - "version": "6.106.0", + "version": "6.107.0", "homepage": "https://form.gov.sg", "authors": [ "FormSG " diff --git a/shared/constants/field/myinfo/myinfo-occupations.ts b/shared/constants/field/myinfo/myinfo-occupations.ts index c93802234e..1845dc54bd 100644 --- a/shared/constants/field/myinfo/myinfo-occupations.ts +++ b/shared/constants/field/myinfo/myinfo-occupations.ts @@ -1,4 +1,5 @@ export const myInfoOccupations = [ + 'Not Applicable', '2nd Engineer (Special Limit)', '2nd/3rd/4th Mate', '3d Modeller', diff --git a/src/app/loaders/express/constants.ts b/src/app/loaders/express/constants.ts index 98839ae7b8..c0b965cb28 100644 --- a/src/app/loaders/express/constants.ts +++ b/src/app/loaders/express/constants.ts @@ -30,6 +30,7 @@ export const CSP_CORE_DIRECTIVES = { 'https://*.googletagmanager.com/gtag/', 'https://*.cloudflareinsights.com/', // Cloudflare web analytics https://developers.cloudflare.com/analytics/types-of-analytics/#web-analytics 'https://www.gstatic.com/charts/', // React Google Charts for FormSG charts + 'https://www.gstatic.cn', ], connectSrc: [ "'self'",