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

266 Commits

Author SHA1 Message Date
Dan Finlay
11c1004a41 Linted 2016-12-20 16:07:24 -08:00
Dan Finlay
77d2deb176 Merged master into dev 2016-12-19 13:37:27 -08:00
Dan Finlay
6d13ef691f Revert "Interface enhancements" 2016-12-16 10:04:57 -08:00
Dan Finlay
83880a5c92 Remove morden testnet provider
Instances configured to point at Morden will now point at Ropsten.
2016-12-15 16:12:03 -08:00
Luis Iván Cuende
4a8bc63c8d
Better account details view 2016-12-14 10:03:56 -08:00
Luis Iván Cuende
c65db9290d
Better editable label 2016-12-14 09:38:20 -08:00
Dan Finlay
85d5b12f8d Fix tx adding code
Broken in this commit:
bc39cd7b89

Synchronous methods were added to an `async.waterfall` array.

This commit also removes the delegate call checking, since we concluded it was misinformed.
2016-11-29 12:46:08 -08:00
Dan Finlay
b899119582 Merge branch 'master' into dev 2016-11-23 16:54:27 -08:00
Kevin Serrano
8261cf232d
Merge branch 'dev' into dev-cleanup 2016-11-22 10:50:15 -08:00
Kevin Serrano
17669e4af8
Make ropsten faucet button point at the correct url. 2016-11-22 10:20:59 -08:00
Kevin Serrano
8d2afccdc0
Ropsten has sole access to the faucet. 2016-11-22 10:13:57 -08:00
Kevin Serrano
88ed1f191f
Add to changelog. 2016-11-22 09:45:28 -08:00
Kevin Serrano
f5b0795ac5
change all instances of selectedAddress to selectedAccount. 2016-11-21 16:21:16 -08:00
Dan Finlay
7ab9d40820 Merge branch 'dev' into i831-AddRopsten-Dev 2016-11-21 11:03:32 -08:00
Dan Finlay
e8a8302624 Begin adding Ropsten support
Ropsten links will still not work until Etherscan publishes their ropsten link format.

At that time we will need to update ui/lib/account-link.js

Otherwise, fixes #831
2016-11-21 10:58:49 -08:00
Kevin Serrano
0c23925c23
Fix lint rules for ternary operator placement. 2016-11-11 15:37:22 -08:00
Kevin Serrano
23263bec7d
Linting to the max. 2016-11-11 10:26:12 -08:00
kumavis
c664b8f11e Merge branch 'master' into i328-MultiVault 2016-11-11 03:18:33 -05:00
Frankie
b60992b446 Fix funny looking errors in conf-tx 2016-11-10 22:13:30 -08:00
kumavis
e123e3095b Merge branch 'master' into i328-MultiVault 2016-11-11 01:01:06 -05:00
kumavis
536cab0687 detect tx error - show warning and fix gasLimit 2016-11-10 21:19:34 -08:00
Frankie
f665b779cb Merge branch 'master' into i328-MultiVault 2016-11-10 16:53:47 -08:00
Kevin G. Serrano
7b3f1ecc41
Unify warning functions. 2016-11-07 16:02:02 -08:00
Dan Finlay
f2bfdd7f8c Make identicon tolerant of changing state 2016-11-01 17:06:18 -07:00
Kevin Serrano
25c46a1636
Make case condition more consistent. Remove extra action. Fix incorrect display of network. 2016-10-30 16:01:12 -07:00
Kevin Serrano
9b4f3825e7
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-10-28 16:19:14 -07:00
Dan Finlay
ed3814bff8 Fix identicon rendering 2016-10-27 16:16:28 -07:00
Dan Finlay
b1fb8da3b0 Fix provider menu selection indication 2016-10-25 14:16:04 -07:00
Frankie
aace26c4bd Create callback and Clean-up details 2016-10-13 16:53:32 -07:00
Frankie
67eba9f542 Specify base 10 in bignumber 2016-10-13 16:04:23 -07:00
Frankie
c400f7c0f6 Fix gasPrice range 2016-10-13 15:10:29 -07:00
Frankie
3a610f2c06 Merge branch 'master' into i#495CustomGasField 2016-10-10 18:18:07 -07:00
Frankie
e1b78da3e6 Add custom gas field to send page 2016-10-10 18:17:56 -07:00
Dan Finlay
769bd8e2ee Removed hex prefix from private key export
For compatibility with Jaxx, MEW, and Geth.

Fixes #687
2016-10-04 13:26:51 -07:00
Dan Finlay
1f771f30e4 Space out purchase details on ShapeShift form 2016-09-15 21:18:21 -07:00
Dan Finlay
ed51b91b4a Merge branch 'master' into i675-LoadingBuy 2016-09-15 21:05:24 -07:00
Dan Finlay
4eef2c57cf Show loading indication when selecting ShapeShift 2016-09-15 20:58:18 -07:00
Frankie
77ef71448d Fix CHANGELOG.md and restructure onClick events 2016-09-15 19:35:04 -07:00
Frankie
3682a2a1f9 linting 2016-09-15 18:25:05 -07:00
Frankie
dcda841f4d Merge branch 'master' into tx-viz 2016-09-15 18:16:41 -07:00
Frankie
9c982a4bd6 add tx-viz link to transaction history 2016-09-15 18:13:13 -07:00
Frankie
cf484d735f Clean up some of the code 2016-09-15 14:31:45 -07:00
kumavis
1325990726 css - smaller balance warning 2016-09-15 13:04:09 -07:00
kumavis
f0d83813d6 confTx - add insufficient balance warning message 2016-09-15 12:56:40 -07:00
kumavis
5005fc143b confTx - show disabled accept btn + add colors 2016-09-15 12:42:35 -07:00
Frankie
ef0b535d94 Drop the buy button in the confTx view if account does not have enough eth 2016-09-15 10:24:05 -07:00
Frankie
19c1b1fd8e Merge branch 'master' into qrCode 2016-09-13 12:18:19 -07:00
kumavis
f7794d9949 PendingTxDetails - partially remove imagify support 2016-09-13 10:18:57 -07:00
Frankie
218f380d87 Add qrcode-npm to package.json and swap out Qr Code generator api for node-module 2016-09-12 17:27:14 -07:00
Frankie
c37c050c8a Revert "Add new eth-lightwallet salting to vault." 2016-09-12 10:34:06 -07:00