From 9396f840f44ad7bebb59c9438db5262a24ff18cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 08:34:55 +0000 Subject: [PATCH 1/7] build(deps-dev): bump cypress from 14.2.1 to 14.3.0 in the cypress group (#8366) Bumps the cypress group with 1 update: [cypress](https://github.com/cypress-io/cypress). Updates `cypress` from 14.2.1 to 14.3.0 - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cypress-io/cypress/compare/v14.2.1...v14.3.0) --- updated-dependencies: - dependency-name: cypress dependency-version: 14.3.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: cypress ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index a74a341c7..dca7be667 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "auto-changelog": "^2.5.0", "bcryptjs": "^2.4.3", "cross-env": "^7.0.3", - "cypress": "^14.2.1", + "cypress": "^14.3.0", "cypress-network-idle": "^1.15.0", "date-fns": "^3.6.0", "dotenv": "^16.5.0", @@ -7758,9 +7758,9 @@ "optional": true }, "node_modules/cypress": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.2.1.tgz", - "integrity": "sha512-5xd0E7fUp0pjjib1D7ljkmCwFDgMkWuW06jWiz8dKrI7MNRrDo0C65i4Sh+oZ9YHjMHZRJBR0XZk1DfekOhOUw==", + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.3.0.tgz", + "integrity": "sha512-rRfPl9Z0/CczuYybBEoLbDVuT1OGkhYaJ0+urRCshgiDRz6QnoA0KQIQnPx7MJ3zy+VCsbUU1pV74n+6cbJEdg==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index eaaa1e748..bba13418b 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "auto-changelog": "^2.5.0", "bcryptjs": "^2.4.3", "cross-env": "^7.0.3", - "cypress": "^14.2.1", + "cypress": "^14.3.0", "cypress-network-idle": "^1.15.0", "date-fns": "^3.6.0", "dotenv": "^16.5.0", diff --git a/yarn.lock b/yarn.lock index 67f3c5d61..8b1bf7d8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4074,10 +4074,10 @@ cypress-network-idle@^1.15.0: resolved "https://registry.yarnpkg.com/cypress-network-idle/-/cypress-network-idle-1.15.0.tgz#e249f08695a46f1ddce18a95d5293937f277cbb3" integrity sha512-8zU16zhc7S3nMl1NTEEcNsZYlJy/ZzP2zPTTrngGxyXH32Ipake/xfHLZsgrzeWCieiS2AVhQsakhWqFzO3hpw== -cypress@^14.2.1: - version "14.2.1" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-14.2.1.tgz#2628696588d3d3961bf0ea0ad87baeb359790dcd" - integrity sha512-5xd0E7fUp0pjjib1D7ljkmCwFDgMkWuW06jWiz8dKrI7MNRrDo0C65i4Sh+oZ9YHjMHZRJBR0XZk1DfekOhOUw== +cypress@^14.3.0: + version "14.3.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-14.3.0.tgz#720923501ca0e371d344b810572cea58d5b50aec" + integrity sha512-rRfPl9Z0/CczuYybBEoLbDVuT1OGkhYaJ0+urRCshgiDRz6QnoA0KQIQnPx7MJ3zy+VCsbUU1pV74n+6cbJEdg== dependencies: "@cypress/request" "^3.0.8" "@cypress/xvfb" "^1.2.4" From 1afd9576ce5c03feb9bc74ac8c18a4d23f958725 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 18:43:23 +0200 Subject: [PATCH 2/7] Bump bcryptjs from 2.4.3 to 3.0.2 in /backend (#8224) Bumps [bcryptjs](https://github.com/dcodeIO/bcrypt.js) from 2.4.3 to 3.0.2. - [Release notes](https://github.com/dcodeIO/bcrypt.js/releases) - [Commits](https://github.com/dcodeIO/bcrypt.js/compare/2.4.3...v3.0.2) --- updated-dependencies: - dependency-name: bcryptjs dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index 516d763ec..b5a9e2bf8 100644 --- a/backend/package.json +++ b/backend/package.json @@ -42,7 +42,7 @@ "babel-eslint": "~10.1.0", "babel-jest": "~29.7.0", "babel-plugin-transform-runtime": "^6.23.0", - "bcryptjs": "~2.4.3", + "bcryptjs": "~3.0.2", "body-parser": "^1.20.3", "cheerio": "~1.0.0", "cors": "~2.8.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index 628eea48d..27e97ce0a 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -3164,10 +3164,10 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bcryptjs@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" - integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= +bcryptjs@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-3.0.2.tgz#caadcca1afefe372ed6e20f86db8e8546361c1ca" + integrity sha512-k38b3XOZKv60C4E2hVsXTolJWfkGRMbILBIe2IBITXciy5bOsTKot5kDrf3ZfufQtQOUN5mXceUEpU1rTl9Uog== binary-extensions@^2.0.0: version "2.0.0" From 45096332484673653bbc816524f2328456a93424 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:15:57 +0000 Subject: [PATCH 3/7] Bump bcryptjs from 2.4.3 to 3.0.2 (#8218) Bumps [bcryptjs](https://github.com/dcodeIO/bcrypt.js) from 2.4.3 to 3.0.2. - [Release notes](https://github.com/dcodeIO/bcrypt.js/releases) - [Commits](https://github.com/dcodeIO/bcrypt.js/compare/2.4.3...v3.0.2) --- updated-dependencies: - dependency-name: bcryptjs dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++++----- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index dca7be667..4e02f555e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@cypress/browserify-preprocessor": "^3.0.2", "@faker-js/faker": "9.6.0", "auto-changelog": "^2.5.0", - "bcryptjs": "^2.4.3", + "bcryptjs": "^3.0.2", "cross-env": "^7.0.3", "cypress": "^14.3.0", "cypress-network-idle": "^1.15.0", @@ -6597,10 +6597,14 @@ } }, "node_modules/bcryptjs": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", - "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==", - "dev": true + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-3.0.2.tgz", + "integrity": "sha512-k38b3XOZKv60C4E2hVsXTolJWfkGRMbILBIe2IBITXciy5bOsTKot5kDrf3ZfufQtQOUN5mXceUEpU1rTl9Uog==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "bcrypt": "bin/bcrypt" + } }, "node_modules/binary-extensions": { "version": "2.2.0", diff --git a/package.json b/package.json index bba13418b..7ddc60707 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@cypress/browserify-preprocessor": "^3.0.2", "@faker-js/faker": "9.6.0", "auto-changelog": "^2.5.0", - "bcryptjs": "^2.4.3", + "bcryptjs": "^3.0.2", "cross-env": "^7.0.3", "cypress": "^14.3.0", "cypress-network-idle": "^1.15.0", diff --git a/yarn.lock b/yarn.lock index 8b1bf7d8f..768fbb1a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3171,10 +3171,10 @@ bcrypt-ts@^5.0.2: resolved "https://registry.yarnpkg.com/bcrypt-ts/-/bcrypt-ts-5.0.2.tgz#8068af00de29cc6dce02766c46332158677643e1" integrity sha512-gDwQ5784AkkfhHACh3jGcg1hUubyZyeq9AtVd5gXkcyHGVOC+mORjRIHSj+fHfqwY5vxwyBLXQpcfk8MpK0ROg== -bcryptjs@^2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" - integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ== +bcryptjs@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-3.0.2.tgz#caadcca1afefe372ed6e20f86db8e8546361c1ca" + integrity sha512-k38b3XOZKv60C4E2hVsXTolJWfkGRMbILBIe2IBITXciy5bOsTKot5kDrf3ZfufQtQOUN5mXceUEpU1rTl9Uog== binary-extensions@^2.0.0: version "2.2.0" From fb12a139bc8e3922deea813f6a6b8acbefb2ea16 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 14 Apr 2025 19:56:29 +0200 Subject: [PATCH 4/7] fix(webapp): better settings ux (#8347) * Scroll to notification settings when opened (for mobile) * scroll to settings content when clicking on menu entry * Scroll to settings content on mobile and fix weird loading state * Add fail-safety * Fix linting --- webapp/pages/settings.vue | 29 ++++++++++++++++--- webapp/pages/settings/blocked-users.vue | 2 ++ webapp/pages/settings/data-download.vue | 2 ++ webapp/pages/settings/delete-account.vue | 2 ++ webapp/pages/settings/embeds.vue | 2 ++ webapp/pages/settings/index.vue | 2 ++ webapp/pages/settings/invites.vue | 2 ++ webapp/pages/settings/languages.vue | 2 ++ webapp/pages/settings/muted-users.vue | 2 ++ .../pages/settings/my-email-address/index.vue | 2 ++ webapp/pages/settings/my-organizations.vue | 2 ++ webapp/pages/settings/my-social-media.vue | 2 ++ webapp/pages/settings/notifications.vue | 2 ++ webapp/pages/settings/privacy.vue | 2 ++ webapp/pages/settings/scroll-to-content.js | 13 +++++++++ webapp/pages/settings/security.vue | 2 ++ 16 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 webapp/pages/settings/scroll-to-content.js diff --git a/webapp/pages/settings.vue b/webapp/pages/settings.vue index 1fce64d8f..5d526c3cc 100644 --- a/webapp/pages/settings.vue +++ b/webapp/pages/settings.vue @@ -5,14 +5,14 @@ - +
- - +
+
- +
@@ -87,3 +87,24 @@ export default { }, } + + diff --git a/webapp/pages/settings/blocked-users.vue b/webapp/pages/settings/blocked-users.vue index 90519452f..0eed6d370 100644 --- a/webapp/pages/settings/blocked-users.vue +++ b/webapp/pages/settings/blocked-users.vue @@ -75,8 +75,10 @@