m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Sync master with develop (#11215)

Browse Source 
* Revert "lint fix"

This reverts commit 6dfab2e3c68e9399387362cb3cf6b667f565a80d.

* Revert "Adding "What's New" notification for Ledger Support Update (#11188)"

This reverts commit 939a34f16cba4add56bd670ba93650a0c46d38bc.

* Revert "Disable Ledger Live toggle for Firefox users (#11169)"

This reverts commit dec34fa4c6914a42457a62faa27140c8a1d30e97.

* Revert "Implement Ledger Live bridge (#10293)"

This reverts commit 397417bf09f468ef6718cd542112891f6c3cabd0.

* Version v9.5.7

* Update CHANGELOG.md

Co-authored-by: Mark Stacey <markjstacey@gmail.com>

* Revert "Revert "Implement Ledger Live bridge (#10293)""

This reverts commit 56db48a1c379f1c3d53ff617b4eced21f4d4ef44.

* Revert "Revert "Disable Ledger Live toggle for Firefox users (#11169)""

This reverts commit 6e0da428acb66c7daa6040ec4a788d5d7a6a7880.

* Revert "Revert "Adding "What's New" notification for Ledger Support Update (#11188)""

This reverts commit 7365f87f9e4f29b75ab9b02a24b2f7de858f6ded.

* Revert "Revert "lint fix""

This reverts commit 02b442aace41af511e5b2e79de093d7391885ebe.

* Track version in correct place (i.e. package.json) for master to develop sync for v9.5.7

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
This commit is contained in:
Dan J Miller 2021-05-31 15:38:52 -02:30 committed by GitHub
parent 3fc29bf4f2
commit 9e92ab41ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [9.5.7]
### Fixed
- Revert "Add Ledger Live Support" ([#10293](https://github.com/MetaMask/metamask-extension/pull/10293)), which introduced a UI crash for some locales
## [9.5.6] ## [9.5.6]
### Added ### Added
- [#10293](https://github.com/MetaMask/metamask-extension/pull/10293): Add Ledger Live Support - [#10293](https://github.com/MetaMask/metamask-extension/pull/10293): Add Ledger Live Support
@ -2249,7 +2253,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Uncategorized ### Uncategorized
- Added the ability to restore accounts from seed words. - Added the ability to restore accounts from seed words.
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.5.6...HEAD [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.5.7...HEAD
[9.5.7]: https://github.com/MetaMask/metamask-extension/compare/v9.5.6...v9.5.7
[9.5.6]: https://github.com/MetaMask/metamask-extension/compare/v9.5.5...v9.5.6 [9.5.6]: https://github.com/MetaMask/metamask-extension/compare/v9.5.5...v9.5.6
[9.5.5]: https://github.com/MetaMask/metamask-extension/compare/v9.5.4...v9.5.5 [9.5.5]: https://github.com/MetaMask/metamask-extension/compare/v9.5.4...v9.5.5
[9.5.4]: https://github.com/MetaMask/metamask-extension/compare/v9.5.3...v9.5.4 [9.5.4]: https://github.com/MetaMask/metamask-extension/compare/v9.5.3...v9.5.4

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "metamask-crx", "name": "metamask-crx",
"version": "9.5.6", "version": "9.5.7",
"private": true, "private": true,
"repository": { "repository": {
"type": "git", "type": "git",