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:
kumavis 2016-05-13 18:15:07 -07:00
commit dd46ce79fd
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -6,6 +6,10 @@
- Replaced identicons with jazzicons - Replaced identicons with jazzicons
- Fixed glitchy transitions - Fixed glitchy transitions
## 1.8.4 2016-05-13
- Point rpc servers to https endpoints.
## 1.8.3 2016-05-12 ## 1.8.3 2016-05-12
- Bumped web3 to 0.6.0 - Bumped web3 to 0.6.0

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.3", "version": "1.8.4",
"manifest_version": 2, "manifest_version": 2,
"description": "__MSG_appDescription__", "description": "__MSG_appDescription__",
"icons": { "icons": {

4
app/scripts/lib/config-manager.js
View File

@ -2,8 +2,8 @@ const Migrator = require('pojo-migrator')
const extend = require('xtend') const extend = require('xtend')
const STORAGE_KEY = 'metamask-config' const STORAGE_KEY = 'metamask-config'
const TESTNET_RPC = 'http://morden.infura.io' const TESTNET_RPC = 'https://morden.infura.io'
const MAINNET_RPC = 'http://mainnet.infura.io/' const MAINNET_RPC = 'https://mainnet.infura.io/'
const migrations = require('./migrations') const migrations = require('./migrations')