Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into dev-cleanup | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
|\ | |||||
| * | Make ropsten faucet button point at the correct url. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| | | |||||
* | | Change fauceting to become a response of an emit. | Kevin Serrano | 2016-11-22 | 1 | -0/+6 |
| | | |||||
* | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 1 | -5/+5 |
|/ | |||||
* | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 1 | -1/+0 |
|\ | |||||
| * | First attempt at fixing errors in confirmation screen. | Kevin Serrano | 2016-11-15 | 1 | -1/+0 |
| | | |||||
* | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 1 | -2/+2 |
| | | |||||
* | | Linting to the max. | Kevin Serrano | 2016-11-12 | 1 | -21/+2 |
| | | |||||
* | | fix tx data so it has the network id | Frankie | 2016-11-11 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 1 | -1/+0 |
|\| | |||||
| * | Fix bug for increasing gas by 20 percent. | Kevin Serrano | 2016-11-10 | 1 | -1/+0 |
| | | |||||
* | | Add reveal of seed words. | Kevin Serrano | 2016-11-02 | 1 | -0/+1 |
| | | |||||
* | | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 1 | -3/+2 |
| | | |||||
* | | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues. | ||||
* | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 1 | -0/+1 |
| | | | | | | | | | | Remove logs. Move HD render files to ui/app. | ||||
* | | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 1 | -0/+1 |
| | | |||||
* | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 1 | -10/+0 |
| | | |||||
* | | Added tx & msg managing functionality to new KeyringController | Dan Finlay | 2016-10-22 | 1 | -1/+2 |
| | | |||||
* | | Added tx and msg signing to keychain & controller | Dan Finlay | 2016-10-21 | 1 | -34/+34 |
| | | |||||
* | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 1 | -0/+2 |
| | | |||||
* | | Git merge resolution. | Kevin Serrano | 2016-10-20 | 1 | -0/+9 |
|\| | |||||
| * | Fix for linting | Frankie | 2016-10-14 | 1 | -1/+1 |
| | | |||||
| * | Create callback and Clean-up details | Frankie | 2016-10-14 | 1 | -2/+7 |
| | | |||||
| * | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-14 | 1 | -2/+2 |
| |\ | |||||
| * | | Fix gasPrice range | Frankie | 2016-10-14 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-13 | 1 | -13/+31 |
|\ \ \ | |_|/ |/| | | | | | origin/i328-MultiVault | ||||
| * | | Add minimal method signatures to new keyring controller | Dan Finlay | 2016-10-13 | 1 | -13/+31 |
| |/ | |||||
* | | Remove logs. | Kevin Serrano | 2016-10-13 | 1 | -2/+0 |
| | | |||||
* | | Fix misnamed variable. | Kevin Serrano | 2016-10-13 | 1 | -2/+4 |
|/ | |||||
* | Cleanup. | Kevin Serrano | 2016-10-12 | 1 | -2/+0 |
| | |||||
* | lint | Kevin Serrano | 2016-10-12 | 1 | -2/+1 |
| | |||||
* | Move tos hash comparison logic from background to mm controller. | Kevin Serrano | 2016-10-12 | 1 | -10/+15 |
| | |||||
* | Fix linting and guarantees set TOS hash. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | |||||
* | Fix retention of terms of service hash across reloads of plugin. | Kevin Serrano | 2016-10-07 | 1 | -1/+1 |
| | |||||
* | Add controller functions for storing and checking TOS hashes. | Kevin Serrano | 2016-10-06 | 1 | -1/+34 |
| | |||||
* | Improve popup behavior for parity errors | Dan Finlay | 2016-10-04 | 1 | -17/+5 |
| | | | | When we receive an invalid params error, instead of opening the popup and showing no tx, we now just forward that tx back to the UI code. | ||||
* | Fix for readability | Frankie | 2016-10-02 | 1 | -1/+1 |
| | |||||
* | Fix issue #688 where fiat conversion does not persist when switching networks | Frankie | 2016-10-01 | 1 | -1/+2 |
| | |||||
* | Drop origin key from requests for Parity compatibility | Dan Finlay | 2016-09-19 | 1 | -0/+5 |
| | |||||
* | Change Testfaucet url | Frankie | 2016-09-16 | 1 | -1/+1 |
| | |||||
* | Ensure listener is cleaned up | Dan Finlay | 2016-09-07 | 1 | -1/+1 |
| | | | | Also fixed bug when validating a tx with no value. | ||||
* | Add negative value validation to tx approval | Dan Finlay | 2016-09-07 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' into PopupNotifications | 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. | ||||
* | | Emit updates to all listeners on pending tx updates | Dan Finlay | 2016-08-24 | 1 | -5/+17 |
|/ | | | | | | | | 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. | ||||
* | Create a ShapeShift tx in tx History | Frankie | 2016-08-19 | 1 | -3/+2 |
| | |||||
* | Merge branch 'master' into shapeshiftTx | Frankie | 2016-08-19 | 1 | -0/+30 |
|\ | |||||
| * | Fix uncalled fn. | Kevin Serrano | 2016-08-17 | 1 | -1/+1 |
| | | |||||
| * | Remove logging. Clean up duplicate entries in currency list. | Kevin Serrano | 2016-08-17 | 1 | -1/+0 |
| | | |||||
| * | Merge master. | Kevin Serrano | 2016-08-16 | 1 | -3/+7 |
| |\ | |||||
| * | | Did not previously call functions before! | Kevin Serrano | 2016-08-10 | 1 | -3/+3 |
| | | | |||||
| * | | Fix default value. Add loading indication for async. | Kevin Serrano | 2016-08-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-08-05 | 1 | -0/+1 |
| |\ \ | |||||
| * \ \ | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load. | Kevin Serrano | 2016-07-23 | 1 | -5/+34 |
| |\ \ \ | |||||
| * | | | | Linting! | Kevin Serrano | 2016-07-23 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | Change function names. Add interval polling for api. Refactor functions. | Kevin Serrano | 2016-07-22 | 1 | -1/+13 |
| | | | | | |||||
| * | | | | Add date access throughout the data flow. | Kevin Serrano | 2016-07-22 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-07-22 | 1 | -3/+4 |
| |\ \ \ \ | |||||
| * | | | | | Add data field to pass up parameters up to reducer. | Kevin Serrano | 2016-07-22 | 1 | -1/+6 |
| | | | | | | |||||
| * | | | | | Add fiat actions to metamask controllere and actions. | Kevin Serrano | 2016-07-22 | 1 | -0/+10 |
| | | | | | | |||||
* | | | | | | WIP: ShapeShift tx | Frankie | 2016-08-19 | 1 | -0/+6 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Add global var for background. | Kevin Serrano | 2016-08-12 | 1 | -2/+6 |
| | | | | | |||||
* | | | | | Create global variable that changes ui logging. | Kevin Serrano | 2016-08-12 | 1 | -7/+2 |
| | | | | | |||||
* | | | | | Separate developmentMode conditional to only wrap log. | Kevin Serrano | 2016-08-12 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Merge branch 'master' into logging-fix | Kevin Serrano | 2016-08-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix ether warning checkbox. | Kevin Serrano | 2016-08-11 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* / | | | | Add ability to hide logging messages in production. | Kevin Serrano | 2016-08-12 | 1 | -2/+5 |
|/ / / / | |||||
* | | / | Fix account selection updating | Dan Finlay | 2016-07-30 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | Buy button (#474) | Frankie | 2016-07-22 | 1 | -0/+28 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension | ||||
* | | Implement some cross-browser practices (#473) | Dan Finlay | 2016-07-22 | 1 | -3/+4 |
|/ | | | | | | | | | | | | * Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests | ||||
* | Fix bug where rejected tx would not call back | Dan Finlay | 2016-07-08 | 1 | -8/+7 |
| | |||||
* | Simplify error log | Dan Finlay | 2016-07-06 | 1 | -2/+1 |
| | |||||
* | Improve metamask-controller error logging | Dan Finlay | 2016-07-06 | 1 | -2/+5 |
| | | | | Fixes #384 | ||||
* | fix typo | kumavis | 2016-07-01 | 1 | -1/+1 |
| | |||||
* | Debugged by using a real dapp | Dan Finlay | 2016-06-25 | 1 | -3/+4 |
| | |||||
* | Manually debugged refactor | Dan Finlay | 2016-06-25 | 1 | -9/+9 |
| | |||||
* | Fixed tests | Dan Finlay | 2016-06-25 | 1 | -11/+12 |
| | |||||
* | Rename background-controller metamask-controller | Dan Finlay | 2016-06-25 | 1 | -0/+255 |