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

Merge branch 'master' into eyeballs

Browse Source
This commit is contained in:
Dan Finlay 2016-05-13 00:20:40 -07:00
commit f2676d1241
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -6,6 +6,11 @@
- Replaced identicons with jazzicons - Replaced identicons with jazzicons
- Fixed glitchy transitions - Fixed glitchy transitions
## 1.8.3 2016-05-12
- Bumped web3 to 0.6.0
- Really fixed `eth_syncing` method response.
## 1.8.2 2016-05-11 ## 1.8.2 2016-05-11
- Fixed bug where send view would not load correctly the first time it was visited per account. - Fixed bug where send view would not load correctly the first time it was visited per account.

2
app/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "__MSG_appName__", "name": "__MSG_appName__",
"short_name": "Metamask", "short_name": "Metamask",
"version": "1.8.2", "version": "1.8.3",
"manifest_version": 2, "manifest_version": 2,
"description": "__MSG_appDescription__", "description": "__MSG_appDescription__",
"icons": { "icons": {

2
package.json
View File

@ -55,7 +55,7 @@
"textarea-caret": "^3.0.1", "textarea-caret": "^3.0.1",
"three.js": "^0.73.2", "three.js": "^0.73.2",
"through2": "^2.0.1", "through2": "^2.0.1",
"web3": "^0.15.1", "web3": "ethereum/web3.js#0.16.0",
"web3-provider-engine": "^7.6.3", "web3-provider-engine": "^7.6.3",
"xtend": "^4.0.1" "xtend": "^4.0.1"
}, },