Commit Graph

9734 Commits (e060e4c71f267a2bf5a0466dc00eb7c7439472a5)
 

Author SHA1 Message Date
Kevin Serrano 69aa2ed25f Merge branch 'master' into FixLogoPasswordFollow 8 years ago
Kevin Serrano 348f1fb797 Merge pull request #631 from MetaMask/i599-LoginLoadingIndication 8 years ago
Dan Finlay a4e4c85453 Fix fox logo password following 8 years ago
Dan Finlay 7b6c018c39 Show loading indication during unlocking. 8 years ago
Dan Finlay 2f98d5bc0f Bump changelog 8 years ago
Dan Finlay 01f3683dcf Only init one wallet on restore 8 years ago
Frankie c97aef2b99 Merge pull request #629 from MetaMask/FixLogoLeak 8 years ago
Dan Finlay 4a7eab5b1a Merge branch 'master' into FixLogoLeak 8 years ago
Dan Finlay 6c05c221cd Fix new logo related errors 8 years ago
Dan Finlay fc0f64a5a8 Merge pull request #627 from MetaMask/i#589pendingTxsIssue 8 years ago
Frankie 3f64095eed Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue 8 years ago
Frankie ece1ecb90b Fix wording in changelog and bug 8 years ago
Frankie 079c1a8972 Merge branch 'master' into i#589pendingTxsIssue 8 years ago
Frankie 0d4bfe8038 Remove console.log 8 years ago
Kevin Serrano 1f0b2ca787 Merge pull request #625 from MetaMask/AddNewLogo 8 years ago
Frankie 7d8491de10 Add to CHANGELOG.md and Remove unnecessary catch 8 years ago
Frankie 69580480bc Merge branch 'master' into i#589pendingTxsIssue 8 years ago
Frankie 6f86c5f8ee Add network checks for unconfirmed Txs 8 years ago
Dan Finlay a1e9b951ac Bump changelog 8 years ago
Dan Finlay 762bf2f48a Merge branch 'master' into AddNewLogo 8 years ago
Dan Finlay 8d981ac87f Remove npm i again because apparently that worked 8 years ago
Dan Finlay fbf3dceca0 Remove deps added for older ubuntu 8 years ago
Dan Finlay 67b3309c3a Remove npm i to check if cache held 8 years ago
Dan Finlay 6b9922ad1d Try adding npm i to circle.yml 8 years ago
Kevin Serrano 80847739b2 Merge pull request #615 from MetaMask/ModularFiatBalance 8 years ago
Dan Finlay 20ae4c2689 Fix logo usage for metamask-logo v2.0.0 8 years ago
Dan Finlay 452ce14fda Update locked state 8 years ago
Dan Finlay ab3b409438 Restore broken variable reference 8 years ago
Dan Finlay c42b37a6e7 Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance 8 years ago
Dan Finlay c3dbcb5b02 Fix double tooltip 8 years ago
Dan Finlay d1e91766da Merge branch 'master' into ModularFiatBalance 8 years ago
Frankie 5f8d3085d7 Filter out pending txs based on network from tx history 8 years ago
Dan Finlay 382e532d6d Merge pull request #619 from johnweldon/master 8 years ago
John Weldon d6619a25e9 Fix typo 8 years ago
Kevin Serrano 03c84cff69 Merge pull request #618 from MetaMask/RollbackLeakFix 8 years ago
Dan Finlay 440e0797a7 Reverting memory leak fix 8 years ago
Dan Finlay 2ca58f5bf7 Merge branch 'master' into ModularFiatBalance 8 years ago
Kevin Serrano 54425f4ee7 Merge pull request #617 from MetaMask/i616-FixListenerLeak 8 years ago
Dan Finlay 2564c0c51c Bump changelog 8 years ago
Dan Finlay bfea26d3e3 Ensure listener is cleaned up 8 years ago
Dan Finlay e75a1d63f7 Bump changelog 8 years ago
Dan Finlay 0186e05a0d Linted 8 years ago
Dan Finlay 1537e3f5da Add fiat balances to tx conf view 8 years ago
Dan Finlay 16fe97676c Add fiat conversion to pending tx development state 8 years ago
Dan Finlay c46de79c10 Got basic fiat display modularized 8 years ago
Dan Finlay 90638f95c0 Fix fiat-value 8 years ago
Dan Finlay 09dd854a96 Nearly finished factoring fiat value into eth-balance 8 years ago
Dan Finlay b1cd7ebc47 Merge pull request #612 from MetaMask/first-time 8 years ago
Kevin Serrano 01618a88aa Update changelog and merge master. 8 years ago
Kevin Serrano 1117874953 Merge branch 'master' into first-time 8 years ago