Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove log | Dan Finlay | 2016-09-11 | 1 | -1/+0 |
| | |||||
* | Add more bip44 assertions | Dan Finlay | 2016-09-11 | 1 | -1/+9 |
| | |||||
* | Made bip44 assertions easier to add to | Dan Finlay | 2016-09-11 | 1 | -27/+36 |
| | |||||
* | Clean up tests | Dan Finlay | 2016-09-11 | 1 | -18/+17 |
| | |||||
* | Correctly clear ethStore cache on new vault restore | Dan Finlay | 2016-09-11 | 2 | -13/+38 |
| | |||||
* | Captured #640 in failing test | Dan Finlay | 2016-09-11 | 2 | -1/+17 |
| | |||||
* | Camelcase dataset key for react | Dan Finlay | 2016-09-11 | 3 | -8/+8 |
| | |||||
* | Bump changelog | Dan Finlay | 2016-09-10 | 1 | -0/+1 |
| | |||||
* | Add new eth-lightwallet salting to vault. | Dan Finlay | 2016-09-10 | 2 | -58/+46 |
| | | | | | | | | | | eth-lightwallet was previously not salting vault passwords, potentially making it easier to crack them once obtained. This branch incorporates the API changes to allow us to take advantage of the new salting logic. This is still throwing deprecation warnings, but that's actually a bug in eth-lightwallet I wrote, [I've submitted a PR for that here](https://github.com/ConsenSys/eth-lightwallet/pull/116). Fixes #555 | ||||
* | Merge pull request #636 from MetaMask/how-it-works-bug | Kevin Serrano | 2016-09-10 | 2 | -3/+5 |
|\ | | | | | How it works now displays only on install | ||||
| * | Update changelog | Kevin Serrano | 2016-09-10 | 1 | -1/+1 |
| | | |||||
| * | Do not trigger how-to-video on anything but install. | Kevin Serrano | 2016-09-10 | 1 | -2/+4 |
|/ | |||||
* | Merge pull request #630 from MetaMask/i610-InitOneWalletOnly | Kevin Serrano | 2016-09-10 | 2 | -1/+2 |
|\ | | | | | Only init one wallet on restore | ||||
| * | Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin ↵ | Kevin Serrano | 2016-09-10 | 2 | -1/+2 |
|/| | | | | | | | into i610-InitOneWalletOnly | ||||
| * | Bump changelog | Dan Finlay | 2016-09-09 | 1 | -0/+1 |
| | | |||||
| * | Only init one wallet on restore | Dan Finlay | 2016-09-09 | 1 | -1/+1 |
| | | | | | | | | Fixes #610 | ||||
* | | Merge pull request #632 from MetaMask/FixLogoPasswordFollow | Kevin Serrano | 2016-09-10 | 2 | -3/+2 |
|\ \ | | | | | | | Fix fox logo password following | ||||
| * \ | Merge branch 'master' into FixLogoPasswordFollow | Kevin Serrano | 2016-09-10 | 2 | -0/+3 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #631 from MetaMask/i599-LoginLoadingIndication | Kevin Serrano | 2016-09-10 | 2 | -0/+3 |
|\ \ \ | |_|/ |/| | | Show loading indication during unlocking. | ||||
| * | | Show loading indication during unlocking. | Dan Finlay | 2016-09-09 | 2 | -0/+3 |
|/ / | |||||
| * | Fix fox logo password following | Dan Finlay | 2016-09-09 | 2 | -3/+2 |
|/ | | | | | | | | The new lightweight svg logo was not following text quite right. The new `lookAt` method was not using the same logic the module was using internally on mouse movement. I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like. | ||||
* | Merge pull request #629 from MetaMask/FixLogoLeak | Frankie | 2016-09-09 | 3 | -5/+8 |
|\ | | | | | Fix new logo related errors | ||||
| * | Merge branch 'master' into FixLogoLeak | Dan Finlay | 2016-09-09 | 7 | -9/+17 |
| |\ | |/ |/| | |||||
* | | Merge pull request #627 from MetaMask/i#589pendingTxsIssue | Dan Finlay | 2016-09-09 | 7 | -9/+17 |
|\ \ | | | | | | | I#589pending txs issue | ||||
| * \ | Merge branch 'i#589pendingTxsIssue' of ↵ | Frankie | 2016-09-09 | 7 | -177/+29 |
| |\ \ | | | | | | | | | | | | | https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue | ||||
| | * \ | Merge branch 'master' into i#589pendingTxsIssue | Frankie | 2016-09-09 | 7 | -177/+29 |
| | |\ \ | |_|/ / |/| | | | |||||
| * | | | Fix wording in changelog and bug | Frankie | 2016-09-09 | 2 | -2/+2 |
| |/ / | |||||
| * | | Remove console.log | Frankie | 2016-09-09 | 1 | -1/+0 |
| | | | |||||
| * | | Add to CHANGELOG.md and Remove unnecessary catch | Frankie | 2016-09-09 | 2 | -9/+1 |
| | | | |||||
| * | | Merge branch 'master' into i#589pendingTxsIssue | Frankie | 2016-09-09 | 15 | -178/+206 |
| |\ \ | |||||
| * | | | Add network checks for unconfirmed Txs | Frankie | 2016-09-09 | 5 | -8/+25 |
| | | | | |||||
| * | | | Filter out pending txs based on network from tx history | Frankie | 2016-09-08 | 1 | -1/+1 |
| | | | | |||||
| | | * | Fix new logo related errors | Dan Finlay | 2016-09-09 | 3 | -5/+8 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method. Also tuned up the logo to more closely resemble the old behavior. - Overlaps the title text - Points nose at cursor, not just front of eyes - Cursor is more "distant" from fox, to avoid extreme angles on edges. | ||||
* | | | Merge pull request #625 from MetaMask/AddNewLogo | Kevin Serrano | 2016-09-09 | 7 | -177/+29 |
|\ \ \ | |_|/ |/| | | Add new lightweight logo | ||||
| * | | Bump changelog | Dan Finlay | 2016-09-09 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into AddNewLogo | Dan Finlay | 2016-09-09 | 12 | -175/+111 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #615 from MetaMask/ModularFiatBalance | Kevin Serrano | 2016-09-09 | 14 | -177/+205 |
|\ \ \ | | | | | | | | | Add fiat conversion to tx confirmation view | ||||
| * | | | Restore broken variable reference | Dan Finlay | 2016-09-09 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin ↵ | Dan Finlay | 2016-09-09 | 2 | -2/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | into ModularFiatBalance | ||||
| | * \ \ | Merge branch 'master' into ModularFiatBalance | Dan Finlay | 2016-09-09 | 2 | -2/+1 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix double tooltip | Dan Finlay | 2016-09-09 | 1 | -10/+1 |
| |/ / / | |||||
| * | | | Merge branch 'master' into ModularFiatBalance | Dan Finlay | 2016-09-07 | 6 | -8/+16 |
| |\ \ \ | |||||
| * | | | | Bump changelog | Dan Finlay | 2016-09-07 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Linted | Dan Finlay | 2016-09-07 | 1 | -23/+22 |
| | | | | | |||||
| * | | | | Add fiat balances to tx conf view | Dan Finlay | 2016-09-07 | 2 | -9/+7 |
| | | | | | |||||
| * | | | | Add fiat conversion to pending tx development state | Dan Finlay | 2016-09-07 | 2 | -2/+94 |
| | | | | | |||||
| * | | | | Got basic fiat display modularized | Dan Finlay | 2016-09-07 | 3 | -22/+26 |
| | | | | | |||||
| * | | | | Fix fiat-value | Dan Finlay | 2016-09-07 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Nearly finished factoring fiat value into eth-balance | Dan Finlay | 2016-09-07 | 9 | -109/+19 |
| | | | | | |||||
| * | | | | Merge branch 'master' into ModularFiatBalance | Dan Finlay | 2016-09-07 | 8 | -28/+187 |
| |\ \ \ \ | |||||
| * | | | | | Continuing fiat balance modularization | Dan Finlay | 2016-09-04 | 3 | -73/+106 |
| | | | | | | |||||
| | | | * | | Remove npm i again because apparently that worked | Dan Finlay | 2016-09-09 | 1 | -1/+0 |
| | | | | | | |||||
| | | | * | | Remove deps added for older ubuntu | Dan Finlay | 2016-09-09 | 1 | -6/+1 |
| | | | | | | |||||
| | | | * | | Remove npm i to check if cache held | Dan Finlay | 2016-09-09 | 1 | -1/+0 |
| | | | | | | |||||
| | | | * | | Try adding npm i to circle.yml | Dan Finlay | 2016-09-09 | 1 | -0/+1 |
| | | | | | | |||||
| | | | * | | Fix logo usage for metamask-logo v2.0.0 | Dan Finlay | 2016-09-09 | 2 | -15/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No longer need to check for webGL compliance (svg rendered!) - logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element. Otherwise, worked with very little effort!! Fixes #624 | ||||
| | | | * | | Update locked state | Dan Finlay | 2016-09-09 | 2 | -63/+23 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #619 from johnweldon/master | Dan Finlay | 2016-09-08 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix minor typo | ||||
| * | | | | Fix typo | John Weldon | 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 | ||||
| * | | | Reverting memory leak fix | Dan Finlay | 2016-09-07 | 1 | -1/+0 |
|/ / / | | | | | | | | | | | | | | | | This wasn't a good enough fix, and had other repercussions. Looking for a way to properly detect EOS, and tear down the correct stream accordingly. | ||||
* | | | Merge pull request #617 from MetaMask/i616-FixListenerLeak | Kevin Serrano | 2016-09-07 | 3 | -1/+3 |
|\ \ \ | | | | | | | | | I616 fix listener leak | ||||
| * | | | Bump changelog | Dan Finlay | 2016-09-07 | 2 | -25/+1 |
| | | | | |||||
| * | | | Ensure listener is cleaned up | Dan Finlay | 2016-09-07 | 3 | -1/+27 |
|/ / / | | | | | | | | | | Also fixed bug when validating a tx with no value. | ||||
* | | | Merge pull request #612 from MetaMask/first-time | Dan Finlay | 2016-09-07 | 5 | -7/+14 |
|\ \ \ | |_|/ |/| | | Open Introduction Video tab on install | ||||
| * | | 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 | ||||
| * | | | 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 |
|\ \ | | | | | | | Error message more helpful | ||||
| * | | 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 |
|\ \ | | | | | | | Add ability to disable livereload | ||||
| * | | 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 | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | notif - use standard err-first callback style | ||||
| * \ \ | 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 |
|\ \ \ \ | |_|_|/ |/| | | | Version 2.10.1 | ||||
| | * | | 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 |
|\ | | | | | Don't show popup when sending tx from within metamask | ||||
| * | 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 | ||||
| * | | 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 | ||||
| * | Add metamask route to infura urls | Dan Finlay | 2016-09-01 | 1 | -2/+2 |
|/ | | | | | | Fixes #597 Allows metamask-specific RPC metrics. | ||||
* | Merge pull request #596 from MetaMask/EdgeCompatibility | kumavis | 2016-08-30 | 9 | -28/+76 |
|\ | | | | | Edge compatibility | ||||
| * | 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 |
| | | | | | | | | Microsoft edge does not support console.error.bind, nor is that call necessary here. | ||||
| * | 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 |
|\ \ | | | | | | | Allow selecting custom rpc from menu even when custom rpc is selected | ||||
| * | | 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 | ||||
| * | | 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 | ||||
| * | | 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 |
|\ \ | | | | | | | Add a back button for Lock screen | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | Replace chrome notifications with windows.create | ||||
| * \ \ | 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 |
|\ \ \ \ | | | | | | | | | | | Persist form state when closing popup | ||||
| * \ \ \ | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the metamask controller only supported a single UI event listener, which wasn't useful for having a separate notification UI open at the same time. Also reduced the notification's complexity down to a single method, which is heavily re-used. Still has an outstanding bug where if the plugin ui dismisses the last tx, it does not close the notification popup. | ||||
| | * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both. In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways: - Hide the menu bar - Hide the back button from the notifications view. - When confirming the last tx, close the window. | ||||
| | * | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | CI - fix chrome version | ||||
| * | | | | | | | | | | | Merge pull request #586 from MetaMask/kumavis-patch-2 | kumavis | 2016-08-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | CI - add lsb-base dep | ||||
| | * | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Fixed prohibited shortcut combination. | ||||
| * | | | | | | | | | | 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 | ||||
| * | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix bug where unconfirmed message sig is lost when locked. | ||||
| * \ \ \ \ \ \ \ \ \ | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Api test fix | ||||
| * \ \ \ \ \ \ \ \ \ \ | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | Fix empty sign bug | ||||
| * | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | Shortcut to open MetaMask | ||||
| * | | | | | | | | | 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 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #484 Adds unsigned messages to the in-memory message list before showing the unlock message. | ||||
* | | | | | | | | Merge pull request #574 from MetaMask/fox-sub | Dan Finlay | 2016-08-24 | 5 | -9/+17 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Sub static fox image when WebGL isn't supported | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | inpage - cleanContextForImports fix | ||||
| * \ \ \ \ \ \ \ | 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 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Enforce transaction log limit | ||||
| * \ \ \ \ \ \ \ \ | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that. | ||||
| * | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message. | ||||
| * | | | | | | | | | | Enforce tx history limit | Dan Finlay | 2016-08-19 | 2 | -0/+17 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| | | | * | | | | | | inpage - cleanContextForImports fix | kumavis | 2016-08-23 | 1 | -1/+1 |
| |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | set to undefined instead of deleting updates #447 | ||||
* | | | | | | | | | Merge pull request #572 from MetaMask/i479 | kumavis | 2016-08-23 | 1 | -2/+28 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | inpage provider - reassign incomming ids | ||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | Chinese and Spanish localization | ||||
| * | | | | | | | | 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 | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fix issue where a given balance does not need to be parsed | ||||
| * | | | | | 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 ↵ | Frankie | 2016-08-20 | 3 | -7/+10 |
|/ / / / / | | | | | | | | | | | | | | | | be parsed | ||||
* | | | | | Merge pull request #559 from MetaMask/shapeshiftTx | Dan Finlay | 2016-08-19 | 18 | -16/+513 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Shapeshift tx | ||||
| * | | | | 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 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix rounding issues. | ||||
| * | | | | 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 |
| | | | |