Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Filter out pending txs based on network from tx history | Frankie | 2016-09-08 | 1 | -1/+1 |
* | Merge pull request #618 from MetaMask/RollbackLeakFix | Kevin Serrano | 2016-09-07 | 1 | -1/+0 |
|\ | |||||
| * | Reverting memory leak fix | Dan Finlay | 2016-09-07 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #617 from MetaMask/i616-FixListenerLeak | Kevin Serrano | 2016-09-07 | 3 | -1/+3 |
|\ | |||||
| * | Bump changelog | Dan Finlay | 2016-09-07 | 2 | -25/+1 |
| * | Ensure listener is cleaned up | Dan Finlay | 2016-09-07 | 3 | -1/+27 |
|/ | |||||
* | Merge pull request #612 from MetaMask/first-time | Dan Finlay | 2016-09-07 | 5 | -7/+14 |
|\ | |||||
| * | Update changelog and merge master. | Kevin Serrano | 2016-09-07 | 1 | -0/+1 |
| * | Merge branch 'master' into first-time | Kevin Serrano | 2016-09-07 | 2 | -0/+107 |
| |\ | |/ |/| | |||||
* | | Merge pull request #614 from MetaMask/i546-NegativeErr | Kevin Serrano | 2016-09-07 | 2 | -0/+107 |
|\ \ | |||||
| * | | Add negative value validation to tx approval | Dan Finlay | 2016-09-07 | 2 | -0/+107 |
|/ / | |||||
| * | Fix capitalization. | Kevin Serrano | 2016-09-07 | 1 | -1/+1 |
| * | Replace chrome with generalized browser API. | Kevin Serrano | 2016-09-07 | 1 | -2/+2 |
| * | Add to changelog. | Kevin Serrano | 2016-09-07 | 1 | -0/+2 |
| * | Redirect to video in a new tab on fresh install. | Kevin Serrano | 2016-09-07 | 1 | -1/+6 |
| * | Fix typos and refine wording. | Kevin Serrano | 2016-09-07 | 2 | -5/+4 |
|/ | |||||
* | Merge pull request #611 from vincentserpoul/patch-1 | Kevin Serrano | 2016-09-06 | 1 | -2/+3 |
|\ | |||||
| * | linting | Vincent Serpoul | 2016-09-06 | 1 | -1/+1 |
| * | Error message more helpful | Vincent Serpoul | 2016-09-06 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #609 from MetaMask/livereload | kumavis | 2016-09-04 | 3 | -7/+45 |
|\ | |||||
| * | Fix boolean. | Kevin Serrano | 2016-09-03 | 1 | -1/+1 |
| * | Merge branch 'master' into livereload | Kevin Serrano | 2016-09-03 | 2 | -1/+5 |
| |\ | |/ |/| | |||||
* | | Merge pull request #608 from MetaMask/2.10.2 | Kevin Serrano | 2016-09-03 | 2 | -1/+5 |
|\ \ | |||||
| * | | Version 2.10.2 | kumavis | 2016-09-03 | 2 | -1/+5 |
|/ / | |||||
| * | Merge branch 'master' into livereload | Kevin Serrano | 2016-09-03 | 3 | -19/+28 |
| |\ | |/ |/| | |||||
* | | Merge pull request #607 from MetaMask/notif-fix2.10.2 | Kevin Serrano | 2016-09-03 | 1 | -18/+24 |
|\ \ | |||||
| * \ | Merge branch 'master' into notif-fix | Kevin Serrano | 2016-09-03 | 0 | -0/+0 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #606 from MetaMask/2.10.12.10.1 | kumavis | 2016-09-03 | 2 | -1/+4 |
|\ \ \ | |||||
| | * | | notif - use standard err-first callback style | kumavis | 2016-09-03 | 1 | -18/+24 |
| |/ / | |||||
| * / | Version 2.10.1 | kumavis | 2016-09-03 | 2 | -1/+4 |
|/ / | |||||
| * | Changelog add. | Kevin Serrano | 2016-09-03 | 1 | -1/+1 |
| * | Changelog add and rename vars. | Kevin Serrano | 2016-09-03 | 2 | -6/+7 |
| * | Refactor for spreading. Add conditionals for livereload. | Kevin Serrano | 2016-09-03 | 1 | -6/+24 |
| * | Add production flag. Conditionally copy reload based on production. | Kevin Serrano | 2016-09-02 | 1 | -1/+16 |
| * | Install deps. Fix chrome/firefox typo. | Kevin Serrano | 2016-09-02 | 2 | -3/+7 |
|/ | |||||
* | Merge pull request #603 from MetaMask/i566-NoPopupWhenOpen | Kevin Serrano | 2016-09-02 | 4 | -14/+21 |
|\ | |||||
| * | Merge branch 'master' into i566-NoPopupWhenOpen | Dan Finlay | 2016-09-02 | 1 | -4/+18 |
| |\ | |/ |/| | |||||
* | | Merge pull request #601 from MetaMask/filterfix | Dan Finlay | 2016-09-01 | 1 | -4/+18 |
|\ \ | |||||
| * | | inpage - remap ids on response | kumavis | 2016-09-01 | 1 | -4/+18 |
|/ / | |||||
| * | Bump changelog | Dan Finlay | 2016-09-02 | 1 | -0/+1 |
| * | Linted | Dan Finlay | 2016-09-02 | 1 | -1/+1 |
| * | Show conf screen after send request | Dan Finlay | 2016-09-02 | 1 | -2/+1 |
| * | Skip loading indication from send screen | Dan Finlay | 2016-09-02 | 1 | -1/+0 |
| * | Do not open popup for internally produced txs | Dan Finlay | 2016-09-02 | 1 | -11/+19 |
|/ | |||||
* | Merge pull request #600 from MetaMask/i597-ModifyInfuraUrls | Dan Finlay | 2016-09-01 | 1 | -2/+2 |
|\ | |||||
| * | Add metamask route to infura urls | Dan Finlay | 2016-09-01 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #596 from MetaMask/EdgeCompatibility | kumavis | 2016-08-30 | 9 | -28/+76 |
|\ | |||||
| * | Make element enumeration Edge compatible | Dan Finlay | 2016-08-30 | 1 | -10/+7 |
| * | Add test for Edge compatibility | Dan Finlay | 2016-08-30 | 1 | -0/+29 |
| * | Remove old notification cleanup code | Dan Finlay | 2016-08-30 | 1 | -10/+0 |
| * | Make popup a type Edge supports | Dan Finlay | 2016-08-30 | 1 | -1/+2 |
| * | Add extra edge compatibility | Dan Finlay | 2016-08-30 | 1 | -2/+13 |
| * | Fix console.error references | Dan Finlay | 2016-08-30 | 1 | -3/+3 |
| * | Remove bind calls from console errors | Dan Finlay | 2016-08-30 | 1 | -4/+4 |
| * | Add tolerance for failed form persisting | Dan Finlay | 2016-08-30 | 1 | -0/+7 |
| * | Merge branch 'master' into EdgeCompatibility | Dan Finlay | 2016-08-30 | 76 | -491/+3768 |
| |\ | |/ |/| | |||||
* | | Merge pull request #594 from MetaMask/i541-CustomMenuItemFix | kumavis | 2016-08-30 | 4 | -8/+13 |
|\ \ | |||||
| * | | Bump changelog | Dan Finlay | 2016-08-30 | 1 | -0/+2 |
| * | | Show custom rpc menu item always | Dan Finlay | 2016-08-30 | 1 | -6/+9 |
| * | | Make custom network dev state not loading | Dan Finlay | 2016-08-30 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #593 from MetaMask/Version-2.10.02.10.0 | Dan Finlay | 2016-08-30 | 2 | -4/+5 |
|\ \ | |||||
| * | | Version 2.10.0 | Dan Finlay | 2016-08-30 | 2 | -4/+5 |
|/ / | |||||
* | | Merge pull request #591 from MetaMask/SpellingFix | Dan Finlay | 2016-08-27 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix spelling error | Dan Finlay | 2016-08-27 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #588 from MetaMask/i#563forgotPassword | Dan Finlay | 2016-08-27 | 8 | -44/+177 |
|\ \ | |||||
| * | | make the back button its own function | Frankie | 2016-08-27 | 1 | -21/+22 |
| * | | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 20 | -196/+699 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #554 from MetaMask/PopupNotifications | kumavis | 2016-08-26 | 11 | -183/+108 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-26 | 13 | -18/+607 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #590 from MetaMask/i432PersistFormState | kumavis | 2016-08-26 | 10 | -13/+591 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i432PersistFormState | Dan Finlay | 2016-08-26 | 2 | -1/+7 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Bump changelog | Dan Finlay | 2016-08-26 | 1 | -1/+2 |
| * | | | | Linted | Dan Finlay | 2016-08-26 | 1 | -3/+1 |
| * | | | | Persist shapeshift form input values | Dan Finlay | 2016-08-26 | 1 | -3/+12 |
| * | | | | Add shapeshift development state | Dan Finlay | 2016-08-26 | 2 | -1/+349 |
| * | | | | Persist send tx form field values | Dan Finlay | 2016-08-26 | 1 | -5/+14 |
| * | | | | Remove log | Dan Finlay | 2016-08-26 | 1 | -1/+0 |
| * | | | | Add send form development state | Dan Finlay | 2016-08-26 | 2 | -1/+77 |
| * | | | | Update persistient-form docs | Dan Finlay | 2016-08-26 | 1 | -18/+11 |
| * | | | | Make restore vault form persist | Dan Finlay | 2016-08-26 | 1 | -3/+14 |
| * | | | | Add restore vault development state | Dan Finlay | 2016-08-26 | 2 | -1/+40 |
| * | | | | Add persistent form class | Dan Finlay | 2016-08-26 | 2 | -1/+82 |
| * | | | | Noted initial thoughts | Dan Finlay | 2016-08-26 | 1 | -0/+14 |
| | * | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-25 | 10 | -12/+433 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-25 | 2 | -0/+11 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-24 | 5 | -9/+17 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Linted | Dan Finlay | 2016-08-24 | 1 | -1/+0 |
| | * | | | | | | Close notification on opening main UI | Dan Finlay | 2016-08-24 | 3 | -9/+17 |
| | * | | | | | | Skip popup dismissal in tests | Dan Finlay | 2016-08-24 | 1 | -0/+6 |
| | * | | | | | | Linted | Dan Finlay | 2016-08-24 | 1 | -1/+0 |
| | * | | | | | | Close popup even if last tx is dismissed from main UI | Dan Finlay | 2016-08-24 | 2 | -15/+22 |
| | * | | | | | | Emit updates to all listeners on pending tx updates | Dan Finlay | 2016-08-24 | 3 | -53/+23 |
| | * | | | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 14 | -18/+156 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix back button hiding on popup | Dan Finlay | 2016-08-23 | 1 | -1/+2 |
| | * | | | | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 3 | -0/+30 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Limit to one popup, re-focus on additional notifications. | Dan Finlay | 2016-08-23 | 1 | -6/+17 |
| | * | | | | | | | | Merge master | Dan Finlay | 2016-08-23 | 1 | -1/+2 |
| | * | | | | | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 22 | -38/+552 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Bump changelog | Dan Finlay | 2016-08-17 | 1 | -0/+1 |
| | * | | | | | | | | | Linted | Dan Finlay | 2016-08-17 | 2 | -22/+9 |
| | * | | | | | | | | | MVP Popup Notifications Working | Dan Finlay | 2016-08-17 | 6 | -89/+23 |
| | * | | | | | | | | | Unify notification and popup ui files | Dan Finlay | 2016-08-17 | 7 | -58/+29 |
| | * | | | | | | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-17 | 21 | -13/+390 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Set up MVP for popup-based notifications. | Dan Finlay | 2016-08-17 | 6 | -130/+161 |
| | | | | | | | | | * | | Change style on back button to be more like the rest of the app | Frankie | 2016-08-26 | 1 | -25/+55 |
| | | | | | | | | | * | | Add - "npm i -g mocha" to circle | Frankie | 2016-08-26 | 1 | -0/+1 |
| | | | | | | | | | * | | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 27 | -40/+659 |
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #587 from MetaMask/kuma-fix | Kevin Serrano | 2016-08-26 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #586 from MetaMask/kumavis-patch-2 | kumavis | 2016-08-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | CI - add lsb-base dep | kumavis | 2016-08-26 | 1 | -1/+1 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | add deps. | Kevin Serrano | 2016-08-26 | 1 | -0/+1 |
| * | | | | | | | | | | | Bump chrome version. | Kevin Serrano | 2016-08-26 | 1 | -1/+1 |
| * | | | | | | | | | | | Modify cirlce.yml | Kevin Serrano | 2016-08-26 | 1 | -0/+5 |
| * | | | | | | | | | | | Testing bump for web3 provider engine | Kevin Serrano | 2016-08-26 | 1 | -1/+1 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #584 from MetaMask/shortcut-fix | Kevin Serrano | 2016-08-25 | 2 | -5/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Bump versioning. | Kevin Serrano | 2016-08-25 | 2 | -1/+6 |
| * | | | | | | | | | | Merge branch 'master' into shortcut-fix | Kevin Serrano | 2016-08-25 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #583 from MetaMask/Version-2.9.1 | Dan Finlay | 2016-08-25 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Version 2.9.1 | Dan Finlay | 2016-08-25 | 2 | -1/+3 |
|/ / / / / / / / / / / | |||||
| * / / / / / / / / / | Fixed prohibited shortcut combination. | Kevin Serrano | 2016-08-25 | 1 | -4/+4 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #581 from MetaMask/i484PersistPendingSignatures | Kevin Serrano | 2016-08-25 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into i484PersistPendingSignatures | Dan Finlay | 2016-08-25 | 9 | -11/+439 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #579 from MetaMask/api-test-fix | Dan Finlay | 2016-08-25 | 4 | -3/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into api-test-fix | Kevin Serrano | 2016-08-25 | 5 | -8/+412 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #580 from MetaMask/FixEmptySignBug | Kevin Serrano | 2016-08-25 | 5 | -8/+412 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Linted | Dan Finlay | 2016-08-25 | 1 | -1/+0 |
| * | | | | | | | | | | | Bump changelog | Dan Finlay | 2016-08-25 | 1 | -0/+1 |
| * | | | | | | | | | | | Improve msg signing padding | Dan Finlay | 2016-08-25 | 1 | -5/+3 |
| * | | | | | | | | | | | Fix empty sign message bug | Dan Finlay | 2016-08-25 | 1 | -1/+1 |
| * | | | | | | | | | | | Add pending sign msg development state | Dan Finlay | 2016-08-25 | 2 | -1/+407 |
|/ / / / / / / / / / / | |||||
| * | | | | | | | | | | Naming issue. | Kevin Serrano | 2016-08-25 | 1 | -1/+1 |
| * | | | | | | | | | | Implement usage of nock. | Kevin Serrano | 2016-08-25 | 3 | -24/+24 |
| * | | | | | | | | | | Changelog change. | Kevin Serrano | 2016-08-25 | 1 | -0/+1 |
| * | | | | | | | | | | Now calls API functions with mock options. | Kevin Serrano | 2016-08-25 | 1 | -3/+5 |
| * | | | | | | | | | | Added mock option to function. | Kevin Serrano | 2016-08-25 | 1 | -13/+23 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #575 from MetaMask/shortcuts | Kevin Serrano | 2016-08-25 | 2 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Clarify shortcut. | Kevin Serrano | 2016-08-25 | 1 | -1/+1 |
| * | | | | | | | | | Change shortcut again to Ctrl+Alt+M | Kevin Serrano | 2016-08-25 | 2 | -5/+5 |
| * | | | | | | | | | Change shortcut to Alt+M | Kevin Serrano | 2016-08-25 | 2 | -5/+5 |
| * | | | | | | | | | Update changelog. | Kevin Serrano | 2016-08-24 | 1 | -0/+1 |
| * | | | | | | | | | Add shortcut for opening MetaMask. | Kevin Serrano | 2016-08-24 | 1 | -0/+10 |
|/ / / / / / / / / | |||||
| * | | | | | | | | Bump changelog | Dan Finlay | 2016-08-25 | 1 | -0/+1 |
| * | | | | | | | | Linted | Dan Finlay | 2016-08-25 | 1 | -1/+1 |
| * | | | | | | | | Fix bug where unconfirmed message sig is lost when locked. | Dan Finlay | 2016-08-25 | 1 | -0/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #574 from MetaMask/fox-sub | Dan Finlay | 2016-08-24 | 5 | -9/+17 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Remove gulp dependency. | Kevin Serrano | 2016-08-24 | 1 | -1/+0 |
| * | | | | | | | Modify package.json. | Kevin Serrano | 2016-08-24 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' into fox-sub | Kevin Serrano | 2016-08-24 | 17 | -18/+186 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #573 from MetaMask/kumavis-patch-1 | kumavis | 2016-08-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into kumavis-patch-1 | kumavis | 2016-08-23 | 12 | -15/+128 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #558 from MetaMask/i390-TransactionLimit | kumavis | 2016-08-23 | 12 | -15/+128 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into i390-TransactionLimit | kumavis | 2016-08-23 | 4 | -2/+58 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add gulp tasks as npm scripts | Dan Finlay | 2016-08-23 | 1 | -0/+3 |
| * | | | | | | | | | More linting | Dan Finlay | 2016-08-23 | 2 | -4/+1 |
| * | | | | | | | | | Linted | Dan Finlay | 2016-08-23 | 4 | -8/+4 |
| * | | | | | | | | | Removed view more button, added account info button. | Dan Finlay | 2016-08-23 | 6 | -24/+70 |
| * | | | | | | | | | Add builds.zip to gitignore | Dan Finlay | 2016-08-23 | 1 | -0/+1 |
| * | | | | | | | | | Merge branch 'master' into i390-TransactionLimit | Dan Finlay | 2016-08-23 | 21 | -24/+532 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into i390-TransactionLimit | Dan Finlay | 2016-08-19 | 3 | -13/+20 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Change 'View More' to 'Show More' | Dan Finlay | 2016-08-19 | 1 | -1/+1 |
| * | | | | | | | | | | Linted | Dan Finlay | 2016-08-19 | 1 | -1/+1 |
| * | | | | | | | | | | Added `view more` button to transaction list | Dan Finlay | 2016-08-19 | 5 | -7/+59 |
| * | | | | | | | | | | Enforce tx history limit | Dan Finlay | 2016-08-19 | 2 | -0/+17 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| | | | * | | | | | | inpage - cleanContextForImports fix | kumavis | 2016-08-23 | 1 | -1/+1 |
| |_|_|/ / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #572 from MetaMask/i479 | kumavis | 2016-08-23 | 1 | -2/+28 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into i479 | kumavis | 2016-08-23 | 3 | -0/+30 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #571 from MetaMask/chinese-local | Dan Finlay | 2016-08-23 | 3 | -0/+30 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | First part of chinese translation. | Kevin Serrano | 2016-08-23 | 1 | -0/+10 |
| * | | | | | | | | Add spanish locales. | Kevin Serrano | 2016-08-23 | 2 | -0/+20 |
|/ / / / / / / / | |||||
| * / / / / / / | inpage provider - reassign incomming ids | kumavis | 2016-08-23 | 1 | -2/+28 |
|/ / / / / / / | |||||
| | | * | | | | Update package.json | Kevin Serrano | 2016-08-24 | 1 | -2/+3 |
| | | * | | | | Changelog. | Kevin Serrano | 2016-08-24 | 1 | -0/+2 |
| | | * | | | | Linting. | Kevin Serrano | 2016-08-24 | 1 | -2/+1 |
| | | * | | | | Created option to pass in static file for fallback for logo. | Kevin Serrano | 2016-08-24 | 2 | -3/+5 |
| | | * | | | | Merge branch 'master' into fox-sub | Kevin Serrano | 2016-08-23 | 6 | -9/+19 |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| | | * | | | | Modify logic for component update. | Kevin Serrano | 2016-08-20 | 1 | -5/+4 |
| | | * | | | | Create replacement logo for non-webgl | Kevin Serrano | 2016-08-20 | 2 | -3/+10 |
| | | | | * | | Add to CHANGELOG | Frankie | 2016-08-26 | 1 | -1/+5 |
| | | | | * | | Add a back button on lock screen to go back to init menu | Frankie | 2016-08-26 | 6 | -43/+141 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #568 from MetaMask/Version2.9.0 | Dan Finlay | 2016-08-23 | 2 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Version 2.9.0 | Dan Finlay | 2016-08-23 | 2 | -1/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #562 from MetaMask/ethBalance | Dan Finlay | 2016-08-23 | 4 | -8/+16 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add test | Frankie | 2016-08-20 | 1 | -1/+6 |
| * | | | | | Fix issue where if given a balance that does not need to be parsed will not b... | Frankie | 2016-08-20 | 3 | -7/+10 |
|/ / / / / | |||||
* | | | | | Merge pull request #559 from MetaMask/shapeshiftTx | Dan Finlay | 2016-08-19 | 18 | -16/+513 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Merge branch 'master' into shapeshiftTx | Dan Finlay | 2016-08-19 | 3 | -13/+20 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #557 from MetaMask/balance-fix | Dan Finlay | 2016-08-19 | 3 | -13/+20 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Bump changelog. | Kevin Serrano | 2016-08-19 | 1 | -0/+1 |
| * | | | | Lint and changelog. | Kevin Serrano | 2016-08-19 | 1 | -2/+2 |
| * | | | | Fix rounding issues. | Kevin Serrano | 2016-08-19 | 2 | -14/+20 |
|/ / / / | |||||
| * | | | Remove "+" from shapeshift tx and change wording in CHANGELOG | Frankie | 2016-08-19 | 2 | -22/+8 |
| * | | | Delete npm-debug.log | Frankie | 2016-08-19 | 1 | -49/+0 |
| * | | | Create a dev state with shapeshift tx | Frankie | 2016-08-19 | 3 | -1/+213 |
| * | | | Make ballance teal for shapeshift tx and add to change log | Frankie | 2016-08-19 | 3 | -3/+7 |
| * | | | Create a ShapeShift tx in tx History | Frankie | 2016-08-19 | 8 | -65/+105 |
| * | | | Add api Public key | Frankie | 2016-08-19 | 1 | -0/+2 |
| * | | | Merge branch 'master' into shapeshiftTx | Frankie | 2016-08-19 | 24 | -15/+401 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #520 from MetaMask/usd-conversion | Dan Finlay | 2016-08-17 | 21 | -13/+390 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Added compliance for tests and properly accounts for N/A conversions. | Kevin Serrano | 2016-08-17 | 4 | -12/+11 |
| * | | | Lint. | Kevin Serrano | 2016-08-17 | 1 | -4/+5 |
| * | | | Remove logs. | Kevin Serrano | 2016-08-17 | 1 | -3/+0 |
| * | | | Hide conversions when API fails. | Kevin Serrano | 2016-08-17 | 1 | -29/+42 |
| * | | | Remove npm debug log. | Kevin Serrano | 2016-08-17 | 1 | -46/+0 |
| * | | | Fix uncalled fn. | Kevin Serrano | 2016-08-17 | 1 | -1/+1 |
| * | | | Add to changelog. | Kevin Serrano | 2016-08-17 | 1 | -0/+2 |
| * | | | Change account list balance rendering. | Kevin Serrano | 2016-08-17 | 2 | -3/+6 |
| * | | | Remove console logs. | Kevin Serrano | 2016-08-17 | 2 | -2/+46 |
| * | | | Add recent conversion date. | Kevin Serrano | 2016-08-17 | 1 | -0/+4 |
| * | | | Add fallback to API failure. | Kevin Serrano | 2016-08-17 | 2 | -1/+7 |
| * | | | Remove react-select as dependency. | Kevin Serrano | 2016-08-17 | 2 | -8/+0 |
| * | | | Remove logging. Clean up duplicate entries in currency list. | Kevin Serrano | 2016-08-17 | 3 | -4/+2 |
| * | | | Add to package request-promise. | Kevin Serrano | 2016-08-17 | 1 | -0/+1 |
| * | | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-08-17 | 2 | -1/+3 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #550 from MetaMask/Version2.8.0 | Frankie | 2016-08-16 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Version 2.8.0 | Dan Finlay | 2016-08-16 | 2 | -1/+3 |
|/ / / / | |||||
| * | | | Remove extra test. | Kevin Serrano | 2016-08-17 | 2 | -50/+0 |
| * | | | linting and ignoring. | Kevin Serrano | 2016-08-17 | 8 | -15/+55 |
| * | | | Divided eth components for tx and account detail. | Kevin Serrano | 2016-08-17 | 4 | -16/+129 |
| * | | | Merge master. | Kevin Serrano | 2016-08-16 | 31 | -185/+1309 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #547 from MetaMask/cssFixes | Dan Finlay | 2016-08-15 | 2 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | Add margin to "go to test faucet" button and show more of the address on qr c... | Frankie | 2016-08-15 | 2 | -1/+8 |
|/ / / / | |||||
| * | | | Did not previously call functions before! | Kevin Serrano | 2016-08-10 | 2 | -3/+6 |
| * | | | Fix default value. Add loading indication for async. | Kevin Serrano | 2016-08-10 | 3 | -4/+6 |
| * | | | Enable full listing of supported currencies by Cryptonator. | Kevin Serrano | 2016-08-10 | 3 | -6/+16 |
| * | | | Add fix for zero balance shorten. | Kevin Serrano | 2016-08-08 | 3 | -2/+4 |
| * | | | Get fiat numbers rendering on tooltip. Need to find way to create line breaks. | Kevin Serrano | 2016-08-06 | 7 | -14/+33 |
| * | | | Holding off on select formatting for now. Renamed keys for options. | Kevin Serrano | 2016-08-05 | 4 | -7/+7 |
| * | | | Create default values for metamask state for conversion. Fix config files for... | Kevin Serrano | 2016-08-05 | 3 | -3/+9 |
| * | | | currency now selectable and save-able. | Kevin Serrano | 2016-08-05 | 3 | -2/+26 |
| * | | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-08-05 | 22 | -81/+253 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-07-26 | 8 | -3/+74 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-07-26 | 9 | -19/+237 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load. | Kevin Serrano | 2016-07-23 | 12 | -12/+224 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Linting! | Kevin Serrano | 2016-07-23 | 4 | -6/+8 |
| * | | | | | | | Change function names. Add interval polling for api. Refactor functions. | Kevin Serrano | 2016-07-22 | 3 | -11/+34 |
| * | | | | | | | Add date access throughout the data flow. | Kevin Serrano | 2016-07-22 | 5 | -4/+8 |
| * | | | | | | | Provide date access. | Kevin Serrano | 2016-07-22 | 1 | -1/+8 |
| * | | | | | | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-07-22 | 18 | -39/+178 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add data field to pass up parameters up to reducer. | Kevin Serrano | 2016-07-22 | 4 | -3/+20 |
| * | | | | | | | | Add fiat actions to metamask controllere and actions. | Kevin Serrano | 2016-07-22 | 2 | -0/+24 |
| * | | | | | | | | Progress on config manager. Plus tests. | Kevin Serrano | 2016-07-21 | 2 | -1/+108 |
| | | | | | | * | | WIP: ShapeShift tx | Frankie | 2016-08-19 | 11 | -12/+314 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #544 from MetaMask/RemoveEtc | kumavis | 2016-08-15 | 7 | -33/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove ethereum classic provider | Dan Finlay | 2016-08-15 | 7 | -33/+4 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #529 from MetaMask/buyForm | kumavis | 2016-08-14 | 11 | -12/+1060 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add to change log | Frankie | 2016-08-14 | 1 | -1/+2 |
| * | | | | | | | | Add multi message capability to Qr view for market info | Frankie | 2016-08-13 | 4 | -6/+27 |
| * | | | | | | | | Add a to test faucet button | Frankie | 2016-08-13 | 1 | -1/+4 |
| * | | | | | | | | Merge branch 'buyForm' of https://github.com/MetaMask/metamask-plugin into bu... | Frankie | 2016-08-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into buyForm | Dan Finlay | 2016-08-12 | 6 | -101/+10 |
| | |\ \ \ \ \ \ \ \ |