m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-15 06:07:16 +01:00
Code
2,567 Commits 2 Branches 0 Tags 265 MiB
53efc53a40
Commit Graph

2567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kumavis
53efc53a40 Merge branch 'master' into i#1203MainNetSwitch 2017-03-14 17:26:06 -07:00
kumavis
570cc891b5 Merge pull request #1212 from MetaMask/i1211-currencyretention 
Fix currency settings retention
 2017-03-14 17:24:55 -07:00
Kevin Serrano
311b80adf3 Merge branch 'master' into i1211-currencyretention 2017-03-14 17:09:21 -07:00
Kevin Serrano
37ffcfcf0e Rename variables to proper currency state variables. 2017-03-14 17:06:16 -07:00
Kevin Serrano
177f2dc948 Fix description of some migrations. 2017-03-14 17:05:47 -07:00
Kevin Serrano
956482be96 Fix development to use new currency state. 2017-03-14 17:05:27 -07:00
frankiebee
33a70a695b Add to CHANGELOG 2017-03-13 21:15:21 -07:00
frankiebee
f6e551ef5f Swithch the default network to mainnet 2017-03-13 21:14:19 -07:00
Kevin Serrano
2a68c89ba7 Merge pull request #1207 from MetaMask/i1206-customrpc 
Allow changing custom RPCs from lock screen
 2017-03-13 16:57:37 -07:00
Kevin Serrano
7d0bfdf076 Changelog addition. 2017-03-13 16:46:33 -07:00
Kevin Serrano
b10f370c74 Render config screen from unlock. 2017-03-13 16:43:34 -07:00
Kevin Serrano
e4feb50f6f Display Custom RPC on lock screen. 2017-03-13 16:41:25 -07:00
Kevin Serrano
e602cb13c5 Merge pull request #1197 from MetaMask/i1130-ResolveENS 
Allow ENS Names in Send Form
 2017-03-08 16:54:15 -08:00
Dan Finlay
ea59125ce1 Bump changelog 2017-03-08 15:48:18 -08:00
Dan Finlay
42e4a0621b Add ENS click to copy 
Also bump ethjs-ens version to get proper error for unregistered names.
 2017-03-08 15:38:22 -08:00
Dan Finlay
e3f6c010ab Get basic ENS working 
& merge master into ENS branch.
 2017-03-08 15:19:33 -08:00
Dan Finlay
1fbe4a801a Merge pull request #1196 from MetaMask/Version-3.4.0 
Version 3.4.0
 2017-03-08 13:43:42 -08:00
Dan Finlay
05346ec3c3 Version 3.4.0 2017-03-08 13:38:55 -08:00
Dan Finlay
2e99e6f5de Merge pull request #1191 from MetaMask/i1065-removealert 
Convert alert to a log.error
 2017-03-08 11:05:08 -08:00
Kevin Serrano
acc9a2a9d0
Modify message. 2017-03-08 10:53:11 -08:00
Kevin Serrano
6f980cfe10
Add more informative message 2017-03-08 10:46:17 -08:00
Kevin Serrano
b0280dc162 Merge branch 'master' into i1065-removealert 2017-03-08 10:22:08 -08:00
Dan Finlay
b0059bef44 Merge pull request #1189 from MetaMask/kumavis-patch-1 
tx-utils - clean and comment
 2017-03-08 10:21:03 -08:00
Dan Finlay
67c3126e63 Merge branch 'master' into kumavis-patch-1 2017-03-08 10:16:50 -08:00
Kevin Serrano
529eb25ced
Convert alert to a log.error 2017-03-08 10:13:45 -08:00
Kevin Serrano
26cac57838 Merge pull request #1147 from MetaMask/i1144-moarrpc 
Save recently used RPCs
 2017-03-08 10:07:15 -08:00
Kevin Serrano
6fd3d6e0d0
Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into i1144-moarrpc 2017-03-08 09:35:51 -08:00
Kevin Serrano
21769a008c
Fix typo, switch to log.error 2017-03-08 09:35:31 -08:00
Kevin Serrano
86f71d504c Merge branch 'master' into i1144-moarrpc 2017-03-08 09:28:36 -08:00
Kevin Serrano
0ee8ca178e
Remove unneeded setrpc method. 2017-03-08 09:08:28 -08:00
Kevin Serrano
cf2268c3d2
Nodeify and promisify calls to background. 2017-03-08 09:06:41 -08:00
kumavis
92b8443824 tx-utils - add encoding utils 2017-03-07 22:51:39 -08:00
kumavis
c063fab993 tx-utils - stricter naming type-based convention 2017-03-07 22:47:35 -08:00
kumavis
68b99dfb08 test - tx-utils 
add tests for `addGasBuffer`
 2017-03-07 22:28:02 -08:00
kumavis
17b805c76e tx-utils - clean and comment 2017-03-07 22:18:14 -08:00
Dan Finlay
de5a30c5ff Merge pull request #1187 from MetaMask/i1118-IncreaseGasBuffer 
I1118 increase gas buffer
 2017-03-07 21:41:54 -08:00
Dan Finlay
0889309bf3 Merge branch 'master' into i1118-IncreaseGasBuffer 2017-03-07 21:30:43 -08:00
Dan Finlay
1f0a4dd033 Bump changelog 2017-03-07 21:30:27 -08:00
Dan Finlay
a8551c4fe2 Merge pull request #1186 from MetaMask/grammarFix 
Fix grammar in erro message
 2017-03-07 21:24:45 -08:00
jaredpereira
52ee007fcb Merge branch 'master' into i1118-IncreaseGasBuffer 2017-03-07 22:55:56 -05:00
Jared Pereira
4916331c53 change BN.mul to BN.muln 2017-03-07 22:42:16 -05:00
frankiebee
2f7a95c257 Fix grammar in erro message 2017-03-07 18:56:38 -08:00
kumavis
dba261db25 Merge pull request #1185 from MetaMask/i#1032 
Fix issue where account import allows for duplicates
 2017-03-07 18:09:05 -08:00
Frankie
f0a35cefd3 Merge branch 'master' into i#1032 2017-03-07 18:01:50 -08:00
frankiebee
af5ad218e2 Merge branch 'master' into i#1032 2017-03-07 17:59:21 -08:00
frankiebee
3e8b584c98 fix issue where account import allows for duplicates 2017-03-07 17:59:03 -08:00
Jared Pereira
de44cd9ba4 add gas buffer multiply test 2017-03-07 20:49:40 -05:00
Jared Pereira
4256e631a6 remove constant buffer and add multiplier 2017-03-07 19:57:57 -05:00
kumavis
719be93f97 Merge pull request #1183 from MetaMask/provider-ten-oh-one 
deps - bump web3-provider-engine to 10.0.1
 2017-03-07 16:20:31 -08:00
kumavis
147ac416ba deps - bump web3-provider-engine to 10.0.1 
Fixes https://github.com/MetaMask/metamask-plugin/issues/1163
Fixes https://github.com/MetaMask/provider-engine/issues/121
 2017-03-07 16:16:26 -08:00