Skip to content

Commit db2b0ca

Browse files
committed
Merge branch 'develop' into 'release'
Develop See merge request passbolt/desktop/passbolt-windows!229
2 parents ad64a8d + 67eba8c commit db2b0ca

File tree

83 files changed

+14824
-3564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+14824
-3564
lines changed

passbolt/Models/Messaging/Topics/MetadataTopics.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ public class MetadataTopics
1818
{
1919
public const string GET_OR_FIND_METADATA_TYPES_SETTINGS = "passbolt.metadata.get-or-find-metadata-types-settings";
2020
public const string SHARE_MISSING_METADATA_PRIVATE_KEYS_WITH_USER = "passbolt.metadata.share-missing-metadata-private-keys-with-user";
21+
public const string GET_OR_FIND_METADATA_KEYS_SETTINGS = "passbolt.metadata.get-or-find-metadata-keys-settings";
2122
}
2223
}

passbolt/Webviews/Background/dist/background-auth.js

Lines changed: 3507 additions & 793 deletions
Large diffs are not rendered by default.

passbolt/Webviews/Background/dist/background-auth.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

passbolt/Webviews/Background/dist/background-import.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35482,7 +35482,7 @@ const dl=BigInt("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffff
3548235482
/***/ ((module) => {
3548335483

3548435484
"use strict";
35485-
module.exports = /*#__PURE__*/JSON.parse('{"name":"background-webview","version":"2.2.1","description":"Background webview2 for passbolt dekstop windows","license":"AGPL-3.0","copyright":"Copyright 2022 Passbolt SA","homepage":"https://www.passbolt.com","repository":"https://github.com/passbolt/passbolt_windows","main":"index.js","scripts":{"build":"webpack","build-watch":"webpack --watch","lint":"npm run lint:lockfile && npm run lint:eslint","lint:lockfile":"lockfile-lint --path package-lock.json --allowed-hosts npm github.com --allowed-schemes \\"https:\\" \\"git+ssh:\\" --empty-hostname false --allowed-urls \\"[email protected]@\\"","lint:eslint":"eslint -c .eslintrc.json --ext js src","lint:eslint-fix":"eslint -c .eslintrc.json --ext js --fix src","test":"jest","test:unit":"jest --no-cache ./src/","test:coverage":"jest --no-cache ./src/ --coverage"},"devDependencies":{"@babel/eslint-parser":"^7.22.15","@babel/plugin-transform-runtime":"^7.26.10","@babel/preset-env":"^7.21.5","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^11.0.0","eslint":"^8.50.0","eslint-plugin-import":"^2.28.1","eslint-plugin-jest":"^27.4.0","eslint-plugin-no-unsanitized":"^4.0.2","eslint-plugin-react":"^7.33.2","jest":"^29.5.0","jest-environment-jsdom":"^29.5.0","jest-fetch-mock":"^3.0.3","jest-junit":"^15.0.0","jest-localstorage-mock":"^2.4.26","jest-webextension-mock":"^3.8.9","lockfile-lint":"^4.14.1","replace-in-file-webpack-plugin":"^1.0.6","text-encoding-utf-8":"^1.0.2","webpack":"^5.94.0","webpack-cli":"^5.1.4"},"dependencies":{"@babel/core":"^7.23.3","@babel/preset-react":"^7.22.15","buffer":"^6.0.3","formdata-node":"^6.0.3","openpgp":"^6.1.1","passbolt-browser-extension":"5.3.0","passbolt-styleguide":"^5.3.1","setimmediate":"^1.0.5","stream-browserify":"^3.0.0","validator":"^13.7.0"}}');
35485+
module.exports = /*#__PURE__*/JSON.parse('{"name":"background-webview","version":"2.2.1","description":"Background webview2 for passbolt dekstop windows","license":"AGPL-3.0","copyright":"Copyright 2022 Passbolt SA","homepage":"https://www.passbolt.com","repository":"https://github.com/passbolt/passbolt_windows","main":"index.js","scripts":{"build":"webpack","build-watch":"webpack --watch","lint":"npm run lint:lockfile && npm run lint:eslint","lint:lockfile":"lockfile-lint --path package-lock.json --allowed-hosts npm github.com --allowed-schemes \\"https:\\" \\"git+ssh:\\" --empty-hostname false --allowed-urls \\"[email protected]@\\"","lint:eslint":"eslint -c .eslintrc.json --ext js src","lint:eslint-fix":"eslint -c .eslintrc.json --ext js --fix src","test":"jest","test:unit":"jest --no-cache ./src/","test:coverage":"jest --no-cache ./src/ --coverage"},"devDependencies":{"@babel/eslint-parser":"^7.22.15","@babel/plugin-transform-runtime":"^7.26.10","@babel/preset-env":"^7.21.5","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^11.0.0","eslint":"^8.50.0","eslint-plugin-import":"^2.28.1","eslint-plugin-jest":"^27.4.0","eslint-plugin-no-unsanitized":"^4.0.2","eslint-plugin-react":"^7.33.2","jest":"^29.5.0","jest-environment-jsdom":"^29.5.0","jest-fetch-mock":"^3.0.3","jest-junit":"^15.0.0","jest-localstorage-mock":"^2.4.26","jest-webextension-mock":"^3.8.9","lockfile-lint":"^4.14.1","replace-in-file-webpack-plugin":"^1.0.6","text-encoding-utf-8":"^1.0.2","webpack":"^5.94.0","webpack-cli":"^5.1.4"},"overrides":{"brace-expansion":"^1.1.12"},"dependencies":{"@babel/core":"^7.23.3","@babel/preset-react":"^7.22.15","buffer":"^6.0.3","formdata-node":"^6.0.3","openpgp":"^6.1.1","passbolt-browser-extension":"5.4.1","passbolt-styleguide":"^5.4.4","setimmediate":"^1.0.5","stream-browserify":"^3.0.0","validator":"^13.7.0"}}');
3548635486

3548735487
/***/ })
3548835488

passbolt/Webviews/Background/dist/background-workspace.js

Lines changed: 3521 additions & 793 deletions
Large diffs are not rendered by default.

passbolt/Webviews/Background/dist/background-workspace.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

passbolt/Webviews/Background/dist/locales/passbolt-cs-CZ/common.json

Lines changed: 1855 additions & 0 deletions
Large diffs are not rendered by default.

passbolt/Webviews/Background/dist/locales/passbolt-de-DE/common.json

Lines changed: 123 additions & 96 deletions
Large diffs are not rendered by default.

passbolt/Webviews/Background/dist/locales/passbolt-en-UK/common.json

Lines changed: 48 additions & 21 deletions
Large diffs are not rendered by default.

passbolt/Webviews/Background/dist/locales/passbolt-es-ES/common.json

Lines changed: 53 additions & 26 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)