Commit Graph

1243 Commits (7f947f8ab2f22d57f5c7c84c30b942a721049a17)
 

Author SHA1 Message Date
Dan Finlay 49ab51d825 Merge branch 'master' into PopupNotifications 8 years ago
kumavis 9dad3a5917 Merge pull request #573 from MetaMask/kumavis-patch-1 8 years ago
kumavis c97866e367 Merge branch 'master' into kumavis-patch-1 8 years ago
kumavis 07927b5798 Merge pull request #558 from MetaMask/i390-TransactionLimit 8 years ago
kumavis 8b9999b71e inpage - cleanContextForImports fix 8 years ago
kumavis 5c9ca21ba3 Merge branch 'master' into i390-TransactionLimit 8 years ago
kumavis f9c58c0746 Merge pull request #572 from MetaMask/i479 8 years ago
kumavis 2f01ec5be2 Merge branch 'master' into i479 8 years ago
kumavis b8077983d6 inpage provider - reassign incomming ids 8 years ago
Dan Finlay a0d0245343 Add gulp tasks as npm scripts 8 years ago
Dan Finlay 5d24621b56 More linting 8 years ago
Dan Finlay a9b53530b6 Fix back button hiding on popup 8 years ago
Dan Finlay 17f3f90d80 Linted 8 years ago
Dan Finlay 75fd650f69 Merge branch 'master' into PopupNotifications 8 years ago
Dan Finlay 361e26fad7 Limit to one popup, re-focus on additional notifications. 8 years ago
Dan Finlay b79a52c71c Merge pull request #571 from MetaMask/chinese-local 8 years ago
Dan Finlay 642e84da6c Merge master 8 years ago
Dan Finlay 6e1000f361 Merge branch 'master' into PopupNotifications 8 years ago
Dan Finlay f57cbe59fc Removed view more button, added account info button. 8 years ago
Kevin Serrano bc2abd0a78 First part of chinese translation. 8 years ago
Kevin Serrano 18aef9570f Add spanish locales. 8 years ago
Dan Finlay c223ba2e00 Add builds.zip to gitignore 8 years ago
Dan Finlay 3d451ddf3e Merge branch 'master' into i390-TransactionLimit 8 years ago
Kevin Serrano cec88cc9ac Merge branch 'master' into fox-sub 8 years ago
Dan Finlay 3756384da6 Merge pull request #568 from MetaMask/Version2.9.0 8 years ago
Dan Finlay 31e0a3491b Version 2.9.0 8 years ago
Dan Finlay a11979968c Merge pull request #562 from MetaMask/ethBalance 8 years ago
Frankie 7e3b0aca62 Add test 8 years ago
Frankie edfb0eb968 Fix issue where if given a balance that does not need to be parsed will not be parsed 8 years ago
Kevin Serrano 7a466697d3 Modify logic for component update. 8 years ago
Kevin Serrano 43e28788d7 Create replacement logo for non-webgl 8 years ago
Dan Finlay 30af7e96cb Merge pull request #559 from MetaMask/shapeshiftTx 8 years ago
Dan Finlay 8592ffd855 Merge branch 'master' into i390-TransactionLimit 8 years ago
Dan Finlay 9cd85aea2f Merge branch 'master' into shapeshiftTx 8 years ago
Dan Finlay 9c29328085 Merge pull request #557 from MetaMask/balance-fix 8 years ago
Frankie e3e5538ddc Remove "+" from shapeshift tx and change wording in CHANGELOG 8 years ago
Frankie 5b9f7a9288 Delete npm-debug.log 8 years ago
Frankie f80b9b2693 Create a dev state with shapeshift tx 8 years ago
Dan Finlay fe5fff3248 Change 'View More' to 'Show More' 8 years ago
Frankie 98dab0ffd2 Make ballance teal for shapeshift tx and add to change log 8 years ago
Dan Finlay 4f857e297b Linted 8 years ago
Dan Finlay bd9d89826c Added `view more` button to transaction list 8 years ago
Kevin Serrano d53b056425 Bump changelog. 8 years ago
Kevin Serrano 683651e75d Lint and changelog. 8 years ago
Kevin Serrano 4cebf12bb5 Fix rounding issues. 8 years ago
Dan Finlay 7389f9d0a0 Enforce tx history limit 8 years ago
Frankie 3525dc0801 Create a ShapeShift tx in tx History 8 years ago
Frankie 23aeb1c5c1 Add api Public key 8 years ago
Frankie efa61f2cf8 Merge branch 'master' into shapeshiftTx 8 years ago
Frankie 752d16f6c0 WIP: ShapeShift tx 8 years ago