| Commit message (Expand) | Author | Age | Files | Lines |
* | code clan up and tests | Frankie | 2017-02-02 | 1 | -16/+18 |
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-30 | 1 | -4/+4 |
|\ |
|
| * | metamask - lookup selectedAccount via keyringController | kumavis | 2017-01-30 | 1 | -3/+3 |
| * | public config - get selectedAccount from keyring controller substate | kumavis | 2017-01-30 | 1 | -1/+1 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 1 | -122/+135 |
|\| |
|
| * | metamask - subscribe metamask store to keyringController substate | kumavis | 2017-01-29 | 1 | -0/+3 |
| * | keyring - add and initialize obs-store | kumavis | 2017-01-29 | 1 | -1/+3 |
| * | metamask - adopt shapeshift txs from keyringController | kumavis | 2017-01-28 | 1 | -1/+3 |
| * | metamask - organize methods | kumavis | 2017-01-28 | 1 | -120/+126 |
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 1 | -24/+38 |
|/ |
|
* | metamask - fix setupProviderConnection | kumavis | 2017-01-27 | 1 | -1/+1 |
* | metamask controller - cleanup remote api | kumavis | 2017-01-27 | 1 | -77/+100 |
* | metamask - organize into sections | kumavis | 2017-01-27 | 1 | -49/+61 |
* | metamask - use web3-stream-provider/handler instead of manual wiring | kumavis | 2017-01-27 | 1 | -23/+8 |
* | metamask controller - adopt setup*Communication from background | kumavis | 2017-01-27 | 1 | -2/+31 |
* | metamask controller - adopt clearSeedWords from keyring controller | kumavis | 2017-01-27 | 1 | -4/+9 |
* | background - graceful publicConfigStore connection teardown | kumavis | 2017-01-27 | 1 | -1/+3 |
* | background - organize metamask instantiation | kumavis | 2017-01-27 | 1 | -34/+35 |
* | obs-store - use published module | kumavis | 2017-01-25 | 1 | -12/+17 |
* | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2 | kumavis | 2017-01-25 | 1 | -2/+20 |
|\ |
|
| * | Merge branch 'dev' into i#1048 | kumavis | 2017-01-25 | 1 | -0/+11 |
| |\ |
|
| * | | background controller - extract KeyringC.placeSeedWords to MetamaskC | kumavis | 2017-01-25 | 1 | -1/+10 |
| * | | Move the assumption of their only being one hd keyring when requesting seed w... | Frankie | 2017-01-25 | 1 | -1/+5 |
| * | | Fix issue where generating a new account would put it in loose keys | Frankie | 2017-01-25 | 1 | -1/+6 |
* | | | Merge branch 'dev' into obs-store2 | kumavis | 2017-01-22 | 1 | -36/+38 |
|\ \ \
| | |/
| |/| |
|
| * | | Added new modular private key import system | Dan Finlay | 2017-01-19 | 1 | -0/+11 |
| |/ |
|
| * | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 1 | -1/+6 |
| * | background - return txHash to provider-engine on done | kumavis | 2017-01-15 | 1 | -14/+10 |
| * | Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-s... | kumavis | 2017-01-14 | 1 | -0/+1 |
| |\ |
|
| | * | Merge branch 'dev' into bug-submitTx | kumavis | 2017-01-14 | 1 | -0/+1 |
| | |\ |
|
| | | * | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 1 | -17/+6 |
| | | |\ |
|
| | | * | | Take some of the tx Logic out of the UI and create a visble state for pending... | Frankie | 2017-01-12 | 1 | -0/+1 |
| * | | | | background - metamask controller - fix 'this' ref | kumavis | 2017-01-14 | 1 | -7/+8 |
| |/ / / |
|
| * | / | background - handle tx finalization in controllers instead of provider-engine | kumavis | 2017-01-13 | 1 | -34/+21 |
| | |/
| |/| |
|
* | | | background - move pojo migrator to outside of metamask controller | kumavis | 2017-01-12 | 1 | -3/+3 |
* | | | background - introduce ObservableStore | kumavis | 2017-01-12 | 1 | -25/+28 |
|/ / |
|
* | | rpc - fix sync account cache setting | kumavis | 2017-01-11 | 1 | -17/+1 |
* | | web3 provider - override eth_syncing and web3_clientVersion | kumavis | 2017-01-11 | 1 | -0/+5 |
|/ |
|
* | Merge branch 'dev' into TearDownOnDisconnect | kumavis | 2017-01-06 | 1 | -12/+18 |
|\ |
|
| * | Merge branch 'dev' into fixTxManager | Dan Finlay | 2017-01-06 | 1 | -1/+1 |
| |\ |
|
| * | | Combine two identical then blocks | Dan Finlay | 2017-01-06 | 1 | -4/+2 |
| * | | remove unnecessary try statments | Frankie | 2017-01-05 | 1 | -2/+1 |
| * | | Merge branch 'dev' into fixtTxManager | Frankie | 2017-01-05 | 1 | -15/+24 |
| |\ \ |
|
| * | | | Fix signing of transactions | Frankie | 2017-01-05 | 1 | -11/+19 |
* | | | | Merge branch 'dev' into TearDownOnDisconnect | kumavis | 2017-01-06 | 1 | -1/+1 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Fix dependency reference | Dan Finlay | 2017-01-05 | 1 | -1/+1 |
| | |/
| |/| |
|
* / | | MetaMask Controller - Convert to EventEmitter | Frankie | 2017-01-06 | 1 | -6/+5 |
|/ / |
|
* | | Fix sendUpdate for new promisified getState method | Dan Finlay | 2017-01-04 | 1 | -2/+6 |
* | | Update UI state on ethStore updates | Dan Finlay | 2017-01-04 | 1 | -0/+2 |
* | | Merge branch 'dev' into ShowDifferentAccounts | Dan Finlay | 2017-01-03 | 1 | -8/+27 |
|\| |
|
| * | Merge branch 'dev' into TxManager | Frankie | 2016-12-24 | 1 | -2/+78 |
| |\ |
|
| * | | fix some minor spelling mistakes and clean up code | Frankie | 2016-12-24 | 1 | -8/+2 |
| * | | fix merge | Frances Pangilinan | 2016-12-22 | 1 | -1/+1 |
| * | | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 1 | -8/+24 |
| |\ \ |
|
| * | | | Migrate all tx mutation code out of keyring controller and | Frances Pangilinan | 2016-12-22 | 1 | -2/+12 |
| * | | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 1 | -18/+20 |
| * | | | Create a TxManager | Frances Pangilinan | 2016-12-15 | 1 | -2/+14 |
* | | | | Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccounts | Dan Finlay | 2016-12-24 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Add additional migration test | Dan Finlay | 2016-12-24 | 1 | -2/+2 |
| | |_|/
| |/| | |
|
* / | | | Return keyring metadata on metamask state object | Dan Finlay | 2016-12-23 | 1 | -10/+13 |
|/ / / |
|
* | | | Break up migration function | Dan Finlay | 2016-12-23 | 1 | -24/+24 |
* | | | Don't bother changing selected accounts since accounts are recovered | Dan Finlay | 2016-12-23 | 1 | -13/+3 |
* | | | Remove logs | Dan Finlay | 2016-12-23 | 1 | -2/+2 |
* | | | Linted | Dan Finlay | 2016-12-22 | 1 | -4/+3 |
* | | | Restructured migration | Dan Finlay | 2016-12-22 | 1 | -19/+43 |
* | | | Move old keystore migration code to metamask controller | Dan Finlay | 2016-12-22 | 1 | -1/+49 |
* | | | Make notices confirmation configurable | Dan Finlay | 2016-12-21 | 1 | -1/+16 |
| |/
|/| |
|
* | | Merged master into dev | Dan Finlay | 2016-12-20 | 1 | -9/+24 |
|\ \
| |/
|/| |
|
| * | move notice code from metamask-controller + config-manager, in to notice-cont... | kumavis | 2016-12-17 | 1 | -46/+19 |
| * | Deactivate polling for now. | Kevin Serrano | 2016-12-17 | 1 | -1/+3 |
| * | Cleanup | Dan Finlay | 2016-12-17 | 1 | -3/+0 |
| * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 1 | -18/+22 |
| * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 1 | -2/+40 |
| * | Ropsten has sole access to the faucet. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| * | Add to changelog. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
* | | Ordered keyringController methods the same in metamask-controller | Dan Finlay | 2016-11-30 | 1 | -4/+4 |
* | | Fix nodeify usage | Dan Finlay | 2016-11-29 | 1 | -11/+11 |
* | | Denodeify most of KeyringController | Dan Finlay | 2016-11-29 | 1 | -11/+15 |
* | | 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 |
* | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 1 | -0/+1 |
* | | 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 or... | Kevin Serrano | 2016-10-13 | 1 | -13/+31 |
|\ \ \
| |_|/
|/| | |
|
| * | | 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 |
* | 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 |
* | 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 |
* | | Emit updates to all listeners on pending tx updates | Dan Finlay | 2016-08-24 | 1 | -5/+17 |
|/ |
|
* | 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 |
| |/
|/| |
|
* | | Implement some cross-browser practices (#473) | Dan Finlay | 2016-07-22 | 1 | -3/+4 |
|/ |
|
* | 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 |
* | 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 |