1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 02:58:09 +01:00
Commit Graph

3512 Commits

Author SHA1 Message Date
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
Dan Finlay
97ab48ba0d Fix propagation 2017-06-20 08:01:00 -07:00
Dan Finlay
a2781df8b4 Add better event lifecycle management to token list.
Token list now renders errors when a token lookup fails.
Also now cleans up event listeners when re-initializing the token list.
2017-06-19 19:11:55 -07:00
Dan Finlay
f6cc6c6271 Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton 2017-06-19 19:04:16 -07:00
Dan Finlay
41d992cca9 Merge branch 'AddTokenList' into i1616-AddTokenAdding 2017-06-19 19:03:49 -07:00
Dan Finlay
0799e5edf5 Fix token balance rendering 2017-06-19 19:02:38 -07:00
Dan Finlay
60855b0510 Add send button to TokenFactory
A simple solution to a temporary token send screen: Linking to EtherScan.

Will hold us over until we make our own token send view.
2017-06-19 19:02:13 -07:00
Thomas Huang
235cb1f2d7 Keeps dapp gas price if set 2017-06-19 17:50:06 -07:00
Dan Finlay
3ccc2b3d2a Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 15:24:52 -07:00
Dan Finlay
1c05c82867 Add MetaMark support 2017-06-19 15:22:58 -07:00
Kevin Serrano
6eb40f2fab
Merge branch 'master' into AddTokenList 2017-06-19 13:53:48 -07:00
Kevin Serrano
fcf14b7aa7 Merge pull request #1624 from MetaMask/TestLinting
Remove second linting script for tests
2017-06-19 13:53:24 -07:00
Kevin Serrano
9da243f42d
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 13:51:38 -07:00
Thomas Huang
88844946fe Remove second linting script for tests 2017-06-17 12:14:35 -07:00
frankiebee
0d8c02db35 Merge branch 'master' into nonce-tracker 2017-06-16 17:07:12 -07:00
frankiebee
e672f2da0d remove irrelevant test 2017-06-16 17:04:56 -07:00
Frankie
7ec7e12266 Merge pull request #1607 from MetaMask/i1567-FixInaccurateError
Do not mark slowly mined txs as failed.
2017-06-16 16:54:32 -07:00
Frankie
ac728189e1 Merge branch 'master' into i1567-FixInaccurateError 2017-06-16 16:46:13 -07:00
Frankie
42f3ccd9dc Merge pull request #1623 from MetaMask/checkTxs
Check txs
2017-06-16 16:44:59 -07:00
frankiebee
9c2ead3d52 put event back on the "blockTracker:/provider" 2017-06-16 16:43:38 -07:00
frankiebee
3e359d6a6a Merge branch 'master' into i1567-FixInaccurateError 2017-06-16 16:39:52 -07:00
frankiebee
5f8e74e0aa put the block listeners back on the provider 2017-06-16 16:36:32 -07:00
frankiebee
3e4f2cf3d3 bump provider engine 2017-06-16 16:34:38 -07:00
Thomas Huang
fc3f83ac74 Merge pull request #1622 from MetaMask/i1621-DebounceBackgroundUpdates
Debounce background updates
2017-06-15 19:27:18 -07:00
Dan Finlay
06f6aa7a00 Debounce background updates
Our background sometimes emits absurd quantities of updates very quickly.
This PR reduces the amount of inter-process traffic by ensuring the `sendUpdate` method does not fire more than every 200 ms.

Fixes #1621
2017-06-15 18:01:10 -07:00
Frankie
7d64dbf19c Merge pull request #1619 from MetaMask/privacy-patch
Do not recommend posting logs publicly on github.
2017-06-15 16:58:50 -07:00