Skip to content

Commit ef3c2c7

Browse files
committed
Merge branch 'develop' into 'release'
2.4.0 code freeze See merge request passbolt/desktop/passbolt-windows!252
2 parents a0e3e27 + f5db7ac commit ef3c2c7

File tree

60 files changed

+2134
-1048
lines changed

Some content is hidden

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

60 files changed

+2134
-1048
lines changed

passbolt/Webviews/Background/package-lock.json

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

passbolt/Webviews/Background/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
"buffer": "^6.0.3",
5151
"formdata-node": "^6.0.3",
5252
"openpgp": "^6.1.1",
53-
"passbolt-browser-extension": "5.4.1",
54-
"passbolt-styleguide": "^5.4.4",
53+
"passbolt-browser-extension": "5.5.0",
54+
"passbolt-styleguide": "^5.5.2",
5555
"setimmediate": "^1.0.5",
5656
"stream-browserify": "^3.0.0",
5757
"validator": "^13.7.0"

passbolt/Webviews/Background/src/events/clipboardEvents.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ const listen = function(worker) {
3535
* @param {string} text the content to copy
3636
*/
3737
worker.port.on('passbolt.clipboard.copy-temporarily', async(requestId, text) => {
38+
// We cannot use copy temporarily because the alarm is causing the application to crash. See PB-45142.
3839
const clipboardController = new CopyToClipboardController(worker, requestId);
3940
await clipboardController._exec(text);
4041
});

0 commit comments

Comments
 (0)