Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DDW-686] Fix vulnerability warning #1414

Merged
merged 7 commits into from
Jun 6, 2019
Merged

[DDW-686] Fix vulnerability warning #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8351ad4
[DDW-686] Introduce package version vulnerability warning
Jun 5, 2019
9f1c6ac
[DDW-686] CHANGELOG update
Jun 5, 2019
f7f7e5d
[DDW-686] Fix marked package version to recommended 0.6.1 or greater
Jun 5, 2019
a58c714
[DDW-686] force re-build
Jun 5, 2019
dbcd8c1
[DDW-686] Rebuild node_modules to refresh yarn.lock file
Jun 5, 2019
dc492c6
Merge branch 'develop' into fix/ddw-686-fix-vulnerability-warning
nikolaglumac Jun 6, 2019
144bd9d
Merge branch 'develop' into fix/ddw-686-fix-vulnerability-warning
nikolaglumac Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Changelog

### Fixes

- Fixed "marked" dependency vulnerability warning ([PR 1414](https://github.com/input-output-hk/daedalus/pull/1414)
- Fixed addresses not visible on Receive screen when Password is set for the wallet in minimized mode ([PR 1407](https://github.com/input-output-hk/daedalus/pull/1407))
- Fixed truncated "Add Wallet" screen while wallet is restored ([PR 1405](https://github.com/input-output-hk/daedalus/pull/1405))
- Fixed spending password being asked on Receive screen when clicking on "Copy address" link. ([PR 1392](https://github.com/input-output-hk/daedalus/pull/1392))
Expand Down
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,5 +188,8 @@
"pre-commit": "pretty-quick --staged",
"pre-push": "yarn prettier:check && yarn lint && yarn flow:test && yarn manage:translations"
}
},
"resolutions": {
"**/**/marked": "^0.6.1"
}
}
7 changes: 4 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7264,9 +7264,10 @@ markdown-loader@4.0.0:
loader-utils "^1.1.0"
marked "^0.5.0"

marked@^0.5.0, marked@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.5.2.tgz#3efdb27b1fd0ecec4f5aba362bddcd18120e5ba9"
marked@^0.5.0, marked@^0.5.2, marked@^0.6.1:
version "0.6.2"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==

matchdep@^2.0.0:
version "2.0.0"
Expand Down