Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
| | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | ||||||
| | | | | | | | | | * | | | 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 | |
| | | | | |_|_|_|_|/ / / | | | | |/| | | | | | | | ||||||
| | | | | | | | | | * | | Add Edge build to gulp config | Dan Finlay | 2016-08-08 | 1 | -3/+14 | |
| | | | | | | | | | * | | Add MSFT Edge keys to manifest.json | Dan Finlay | 2016-08-08 | 1 | -1/+3 | |
| | | | | | | | | | | * | Merge branch 'library' of github.com:MetaMask/metamask-plugin into library | kumavis | 2016-09-01 | 1 | -5/+5 | |
| | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | * | Add a port log to server start | Dan Finlay | 2016-08-27 | 1 | -5/+5 | |
| | | | | | | | | | | * | | various things | kumavis | 2016-09-01 | 5 | -21/+10 | |
| | | | | | | | | | | |/ | ||||||
| | | | | | | | | | | * | library - basic test server + partial safari fixes | kumavis | 2016-08-27 | 10 | -8/+114 | |
| | | | | | | | | | | * | library - popup handler demo | kumavis | 2016-08-27 | 10 | -0/+241 | |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | 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 | |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | ||||||
* | | | | | | 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 | |
|/ / / / / / | ||||||
| | | * | | | 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 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | 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 | |
| | |\ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ | Merge branch 'master' into buyForm | Frankie | 2016-08-13 | 18 | -140/+230 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #538 from MetaMask/i512 | Kevin Serrano | 2016-08-13 | 3 | -25/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | deps - extracted ensnare to module | kumavis | 2016-08-13 | 3 | -25/+2 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #535 from MetaMask/CustomRpcLoadingBug | kumavis | 2016-08-12 | 5 | -2/+194 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into CustomRpcLoadingBug | kumavis | 2016-08-12 | 5 | -12/+24 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #532 from MetaMask/logging-fix | kumavis | 2016-08-12 | 5 | -12/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add global var for background. | Kevin Serrano | 2016-08-12 | 4 | -5/+15 | |
| * | | | | | | | | | | Merge github.com:MetaMask/metamask-plugin into logging-fix | Kevin Serrano | 2016-08-12 | 6 | -101/+10 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | UI logging supressed for production. | Kevin Serrano | 2016-08-12 | 2 | -6/+1 | |
| * | | | | | | | | | | Create global variable that changes ui logging. | Kevin Serrano | 2016-08-12 | 4 | -15/+13 | |
| * | | | | | | | | | | Setting defaults to production. | Kevin Serrano | 2016-08-12 | 2 | -3/+1 | |
| * | | | | | | | | | | Separate developmentMode conditional to only wrap log. | Kevin Serrano | 2016-08-12 | 1 | -2/+4 | |
| * | | | | | | | | | | Cosmetic difference. | Kevin Serrano | 2016-08-12 | 1 | -2/+1 | |
| * | | | | | | | | | | Remove stray console.log | Kevin Serrano | 2016-08-12 | 1 | -1/+0 | |
| * | | | | | | | | | | Take out unused dependency. | Kevin Serrano | 2016-08-12 | 2 | -4/+1 | |
| * | | | | | | | | | | Remove comments. | Kevin Serrano | 2016-08-12 | 1 | -12/+0 | |
| * | | | | | | | | | | Merge branch 'master' into logging-fix | Kevin Serrano | 2016-08-12 | 3 | -4/+9 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Lint | Kevin Serrano | 2016-08-12 | 2 | -3/+3 | |
| * | | | | | | | | | | | Add ability to hide logging messages in production. | Kevin Serrano | 2016-08-12 | 4 | -8/+34 | |
| | | * | | | | | | | | | Add state selector to mock-dev server used by UI tests | Dan Finlay | 2016-08-12 | 1 | -0/+3 | |
| | | * | | | | | | | | | Added buggy state file to states folder | Dan Finlay | 2016-08-12 | 2 | -1/+1 | |
| | | * | | | | | | | | | Add network indicator class to loading image | Dan Finlay | 2016-08-12 | 2 | -1/+190 | |
| |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #533 from MetaMask/inpage-fixes | kumavis | 2016-08-12 | 6 | -101/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | changelog - add note about web3-provider-stream fix | kumavis | 2016-08-12 | 1 | -0/+1 | |
| * | | | | | | | | | | inpage-prov - sync error - fix link | kumavis | 2016-08-12 | 1 | -1/+1 | |
| * | | | | | | | | | | deps - bump web3-stream-provider | kumavis | 2016-08-12 | 1 | -1/+1 | |
| * | | | | | | | | | | deps - local-message-stream extracted as module post-message-stream | kumavis | 2016-08-12 | 4 | -58/+3 | |
| * | | | | | | | | | | clean -formatting | kumavis | 2016-08-12 | 1 | -2/+2 | |
| * | | | | | | | | | | inpage-provider - remove createSyncProvider, just fail | kumavis | 2016-08-12 | 1 | -40/+3 | |
|/ / / / / / / / / / | ||||||
| | * | | | | | | | | Change buy forms so that they are their own view and add Qr-code | Frankie | 2016-08-13 | 9 | -184/+256 | |
| | * | | | | | | | | Even out some of the margins | Frankie | 2016-08-11 | 1 | -2/+4 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Fix typo for copyButton | Frankie | 2016-08-11 | 1 | -1/+1 | |
| | * | | | | | | | Fix merge mess | Frankie | 2016-08-11 | 4 | -14/+108 | |
| | * | | | | | | | Merge branch 'master' into buyForm | Frankie | 2016-08-11 | 53 | -127/+852 | |
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #528 from MetaMask/checkout-fix | Frankie | 2016-08-11 | 3 | -4/+9 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into checkout-fix | Kevin Serrano | 2016-08-11 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #527 from MetaMask/tests | kumavis | 2016-08-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | Add testem to devDependencies | Frankie | 2016-08-11 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
| * / / / / / / | Fix ether warning checkbox. | Kevin Serrano | 2016-08-11 | 3 | -4/+9 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #518 from MetaMask/typo-fix | Kevin Serrano | 2016-08-05 | 3 | -2/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add to changelog. | Kevin Serrano | 2016-08-05 | 1 | -0/+2 | |
| * | | | | | | | Fix typos with missing apostrophe | Kevin Serrano | 2016-08-05 | 2 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #517 from MetaMask/i#516 | Frankie | 2016-08-04 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix issue with dropdown menu | Frankie | 2016-08-04 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #508 from MetaMask/FixAccountSelectionBug | Dan Finlay | 2016-07-30 | 3 | -1/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Version 2.7.3 | Dan Finlay | 2016-07-30 | 1 | -1/+1 | |
| * | | | | | | | Bump changelog | Dan Finlay | 2016-07-30 | 1 | -0/+4 | |
| * | | | | | | | Fix account selection updating | Dan Finlay | 2016-07-30 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #507 from MetaMask/Version2.7.2Version2.7.2 | Dan Finlay | 2016-07-30 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Version 2.7.2 | Dan Finlay | 2016-07-30 | 2 | -1/+3 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #506 from MetaMask/FixNetworkReference | Dan Finlay | 2016-07-30 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix reference in drop menu item | Dan Finlay | 2016-07-30 | 1 | -2/+3 | |
| * | | | | | | | Fix network name reference | Dan Finlay | 2016-07-30 | 1 | -1/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #498 from MetaMask/AddEthClassic | kumavis | 2016-07-29 | 10 | -10/+52 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into AddEthClassic | Dan Finlay | 2016-07-29 | 2 | -1/+2 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #500 from MetaMask/FixRemoteStoreBug | Dan Finlay | 2016-07-29 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into FixRemoteStoreBug | Dan Finlay | 2016-07-29 | 2 | -19/+32 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix broken reference to host store.didUpdate | Dan Finlay | 2016-07-29 | 2 | -1/+3 | |
| | * | | | | | | | Merge branch 'master' into AddEthClassic | Dan Finlay | 2016-07-29 | 2 | -19/+32 | |
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #502 from MetaMask/ParallelCopyTasks | Dan Finlay | 2016-07-29 | 1 | -18/+31 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix some gulp task issues | Dan Finlay | 2016-07-29 | 1 | -18/+31 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #501 from MetaMask/UpdateNodeDependency | Dan Finlay | 2016-07-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update readme node version | Dan Finlay | 2016-07-29 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
| * | | | | | | | Merge branch 'master' into AddEthClassic | Dan Finlay | 2016-07-29 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #499 from MetaMask/FixDevScripts | Dan Finlay | 2016-07-29 | 1 | -10/+15 | |
|\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Linted | Dan Finlay | 2016-07-29 | 1 | -1/+1 | |
| | * | | | | | | | Add missing reference for provider | Dan Finlay | 2016-07-29 | 1 | -1/+1 | |
| | * | | | | | | | Bump changelog | Dan Finlay | 2016-07-29 | 1 | -0/+2 | |
| | * | | | | | | | Fix margin on provider checkmarks | Dan Finlay | 2016-07-29 | 1 | -0/+1 | |
| | * | | | | | | | Add eth classic to provider menu | Dan Finlay | 2016-07-29 | 8 | -10/+50 | |
| |/ / / / / / / | ||||||
| * / / / / / / | Fix dev tasks for multi browser copying | Dan Finlay | 2016-07-29 | 1 | -10/+15 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #497 from MetaMask/FixBuild | Dan Finlay | 2016-07-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix nondeterministic build | Dan Finlay | 2016-07-28 | 1 | -1/+1 | |
|/ / / / / / / |