Commit Graph

3437 Commits

Author SHA1 Message Date
Dan Finlay 307e967a0c Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin into i1616-AddTokenAdding 2017-06-27 15:04:21 -07:00
Dan Finlay 78af771c79 Do not allow adding non token addresses 2017-06-27 15:03:35 -07:00
Dan Finlay 5440ed23d6 Support other network links 2017-06-27 14:53:27 -07:00
Dan Finlay 3aff9fdd2a Support other network links 2017-06-27 14:49:41 -07:00
Dan Finlay 81ec53a814 Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin into i1616-AddTokenAdding 2017-06-27 14:46:06 -07:00
Dan Finlay 5cfce8c45a Fix token adding bug 2017-06-27 14:45:43 -07:00
Thomas Huang 215948dc38 Merge pull request #1684 from MetaMask/neverGiveUp
dont stop retrying brodcasting txs
2017-06-27 14:30:39 -07:00
frankiebee db2836a1ae dont stop retrying brodcasting txs 2017-06-27 14:19:28 -07:00
Thomas Huang 77054e1fbb Rename Send to Next 2017-06-27 13:56:51 -07:00
frankiebee 847a4282a2 Merge branch 'master' into nonce-tracker 2017-06-27 13:10:56 -07:00
Thomas Huang a352690661 Remove trailing periods and white space 2017-06-27 12:09:50 -07:00
Thomas Huang ca832959c2 Update change log 2017-06-27 10:34:02 -07:00
Thomas Huang 1977417017 Merge branch 'master' into i1473-dappDefaultGasPrice 2017-06-27 10:32:28 -07:00
Thomas Huang 48f7cff8c0 Merge pull request #1678 from MetaMask/i1584-seederror
Display error when seed phrase is invalid
2017-06-26 16:35:47 -07:00
Thomas Huang 8194b398f6 Merge branch 'master' into i1584-seederror 2017-06-26 16:32:47 -07:00
Thomas Huang 62c4501160 Merge pull request #1677 from MetaMask/i1676-quickclick
Prevent Duplicate Submission with Quick Clicking
2017-06-26 16:18:37 -07:00
Kevin Serrano d6c14f4609
Bump changelog. 2017-06-26 16:15:11 -07:00
Kevin Serrano 92da8bc578
Fix error message for invalid seed words. 2017-06-26 16:14:35 -07:00
Kevin Serrano 9962a3068b
Change disabling button as state property. 2017-06-26 15:57:46 -07:00
Kevin Serrano f2cfbda1c9
Bump changelog. 2017-06-26 15:48:41 -07:00
Kevin Serrano 615b8d05a1
Prevent users from accidentally submitting two transactions by disabling button. 2017-06-26 15:47:53 -07:00
Kevin Serrano f925a37a9f
Fix react warning for keys on ens address book 2017-06-26 14:01:35 -07:00
Kevin Serrano 31da623c21
Fix react warning on create-vault-complete 2017-06-26 14:01:09 -07:00
Thomas Huang 8b5b2d8329 Merge pull request #1663 from MetaMask/infura-status
Add Infura Status Information to UI State
2017-06-26 12:06:23 -07:00
Thomas Huang 27a0694d85 Merge pull request #1674 from MetaMask/remove-maps
Simplify build variables. Remove maps from production.
2017-06-26 11:58:45 -07:00
Thomas Huang 7628a83fd6 Fix Back Button on Add Token View 2017-06-26 11:47:08 -07:00
Kevin Serrano f21d425839
Simplify build variables. Remove maps from production. 2017-06-26 11:37:12 -07:00
Dan Finlay 58e993ff29 Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton 2017-06-24 02:42:03 -04:00
Dan Finlay b04d1de447 Merge branch 'master' into i784-SendTokenButton 2017-06-23 11:00:58 -04:00
Dan Finlay 06706f6e1b Merge branch 'master' into i1616-AddTokenAdding 2017-06-23 08:50:44 -04:00
Kevin Serrano f022c7c714 Merge pull request #1603 from MetaMask/AddTokenList
Add popular token list
2017-06-22 17:28:10 -07:00
frankiebee 42a2bcb132 remove option fetch 2017-06-22 14:06:20 -07:00
frankiebee 1ddcbaad5b add `done` and stub fetch 2017-06-22 13:47:20 -07:00
Kevin Serrano 199663c0a4
Add test for infura controller. 2017-06-22 12:51:53 -07:00
Kevin Serrano f9f0f6f9ef
Add infura network status to our UI state. 2017-06-22 12:32:34 -07:00
Kevin Serrano b7f8657ab5
Add infura network status to our UI state. 2017-06-22 12:32:08 -07:00
Dan Finlay c0c588053a Print integration build errors 2017-06-22 09:46:03 -04:00
frankiebee abbbe1156c Merge branch 'master' into nonce-tracker 2017-06-21 19:52:28 -07:00
frankiebee 92df9965eb fix nonceTracker 2017-06-21 19:51:00 -07:00
frankiebee fa8c74fe9b add a test for #getNonceLock 2017-06-21 17:28:19 -07:00
Thomas Huang 2a42925399 Merge pull request #1655 from MetaMask/fix-malito
Fix broken malito link.
2017-06-21 16:20:25 -07:00
Kevin Serrano eb7a9d7517
Fix broken malito link. 2017-06-21 15:55:22 -07:00
Frankie fa7b8d247b Merge pull request #1646 from MetaMask/ScarierSeedWording
Make seed confirmation wording scarier
2017-06-21 14:35:55 -07:00
Dan Finlay 2f4ebea306 Bump changelog 2017-06-20 18:26:08 -07:00
Dan Finlay d0294720e2 Make seed confirmation wording scarier 2017-06-20 18:23:49 -07:00
Frankie c09564d78a Merge pull request #1644 from MetaMask/i1630-badgefix
Fix badge number to include personal_sign
2017-06-20 15:58:03 -07:00
Kevin Serrano b3a6df2dca
Bump changelog. 2017-06-20 15:41:34 -07:00
Kevin Serrano 044c16219b
Fix badge number to include personal_sign 2017-06-20 15:38:23 -07:00
Dan Finlay c7780727eb Bump circleCI node version to 8.0.0 2017-06-20 09:01:55 -07:00
Dan Finlay 027394b205 Reduce token list clutter by only showing held tokens
We could change this when we allow hiding/removing tokens, but for now, this is a simple and pleasant solution.
2017-06-20 08:58:25 -07:00