| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 3 | -13/+19 |
|\ |
|
| * | Merge branch 'master' into i1173-ShowPersonalMessage | Dan Finlay | 2017-03-07 | 2 | -5/+5 |
| |\ |
|
| | * | Fix issue where old txMeta object was being used to pass the txHash to the cb | Frankie | 2017-03-07 | 2 | -5/+5 |
| * | | Fix normalizeMsgData function to always return hex prefixed | Dan Finlay | 2017-03-07 | 1 | -1/+1 |
| * | | Render personal_sign messages as utf-8 text | Dan Finlay | 2017-03-07 | 1 | -8/+14 |
| |/ |
|
* | | More conflict resolution. | Kevin Serrano | 2017-03-02 | 4 | -4/+4 |
|\ \ |
|
| * | | add controllers to root scripts folder | Dan Finlay | 2017-02-28 | 4 | -3/+3 |
| * | | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 12 | -281/+252 |
| |\ \ |
|
* | \ \ | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 14 | -327/+267 |
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| * | | Add a couple more debug logs | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| * | | Use correct action to update and submit tx | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| * | | Linted | Dan Finlay | 2017-03-01 | 1 | -1/+0 |
| * | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 6 | -44/+4 |
| * | | Fixed bug that made send screen sometimes transition to account detail | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| * | | Add background method for updating and approving a tx in one call | Dan Finlay | 2017-02-28 | 1 | -2/+9 |
| * | | Merge branch 'master' into i765-gaslimits | Dan Finlay | 2017-02-28 | 12 | -281/+251 |
| |\| |
|
| | * | Removed redundant personal_recover logic | Dan Finlay | 2017-02-25 | 2 | -18/+0 |
| | * | Mostly fix personal_recover | Dan Finlay | 2017-02-25 | 2 | -6/+6 |
| | * | Fix cancel msg signing behavior. | Dan Finlay | 2017-02-24 | 1 | -6/+25 |
| | * | Got personal_sign working | Dan Finlay | 2017-02-24 | 3 | -21/+42 |
| | * | Add alternate UI for pending personal_sign messages | Dan Finlay | 2017-02-24 | 2 | -1/+3 |
| | * | Add personal sign actions and template | Dan Finlay | 2017-02-23 | 1 | -0/+5 |
| | * | Allow provider to init before keyringController | Dan Finlay | 2017-02-22 | 1 | -2/+6 |
| | * | Fix reference | Dan Finlay | 2017-02-22 | 1 | -1/+1 |
| | * | Point metamask-controller personalSignRecover method to keyring-controller | Dan Finlay | 2017-02-22 | 1 | -9/+5 |
| | * | Move sigUtil and keyrings to external modules | Dan Finlay | 2017-02-22 | 10 | -261/+202 |
| * | | Make gasPrice accessible to the UI. | Kevin Serrano | 2017-02-25 | 1 | -0/+1 |
| |/ |
|
* | | Tested against code to play nice with unit tests. | Kevin Serrano | 2017-02-24 | 2 | -3/+12 |
* | | Implemented functionality for displaying recent custom RPCs | Kevin Serrano | 2017-02-23 | 1 | -14/+15 |
* | | Fix naming | Kevin Serrano | 2017-02-22 | 2 | -3/+3 |
* | | Basic infrasture for RPC list added. | Kevin Serrano | 2017-02-22 | 2 | -3/+24 |
|/ |
|
* | Version 3.3.0v3.3.0 | Dan Finlay | 2017-02-21 | 1 | -1/+1 |
* | Add memstore update after adding new keyring | Dan Finlay | 2017-02-16 | 1 | -0/+1 |
* | keyring controller - update memStore after restoreKeyring | kumavis | 2017-02-16 | 1 | -0/+1 |
* | Merge branch 'master' into dev | Dan Finlay | 2017-02-16 | 3 | -5/+30 |
|\ |
|
| * | got hash test passing | Dan Finlay | 2017-02-14 | 2 | -2/+5 |
| * | Version 3.2.2v3.2.2 | Dan Finlay | 2017-02-10 | 1 | -1/+1 |
| * | Revert old style message sighing | Frankie | 2017-02-10 | 2 | -2/+24 |
* | | Made migrations non-destructive; fixed currency migration. | Kevin Serrano | 2017-02-16 | 10 | -22/+49 |
* | | Add migrations for removing terms of use data. | Kevin Serrano | 2017-02-15 | 2 | -0/+31 |
* | | Merge branch 'dev' into disclaimer-notify | Kevin Serrano | 2017-02-10 | 2 | -1/+7 |
|\ \ |
|
| * | | Merge branch 'dev' into i1085-synchronousnet | kumavis | 2017-02-10 | 1 | -1/+1 |
| |\| |
|
| * | | Allowed net_version to be called synchronously | Kevin Serrano | 2017-02-09 | 2 | -1/+7 |
* | | | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 4 | -73/+0 |
* | | | Fix bugs with notice. Add disclaimer notice. | Kevin Serrano | 2017-02-10 | 1 | -3/+3 |
| |/
|/| |
|
* | | Version 3.2.1v3.2.1 | Dan Finlay | 2017-02-09 | 1 | -1/+1 |
|/ |
|
* | Version 3.2.0v3.2.0 | Dan Finlay | 2017-02-08 | 1 | -1/+1 |
* | Fix typo | Dan Finlay | 2017-02-05 | 1 | -1/+1 |
* | Remove shapeshift tx list from idStore | Dan Finlay | 2017-02-05 | 1 | -2/+1 |
* | Stop removing old shapeshift txs | Dan Finlay | 2017-02-05 | 1 | -16/+0 |
* | Do not remove completed shapeshift deposits | Dan Finlay | 2017-02-04 | 1 | -1/+2 |
* | Fix bug when clearing old shapeshift txs | Dan Finlay | 2017-02-04 | 1 | -1/+3 |
* | Automatically remove shapeshift txs over 11 minutes old with no payment | Dan Finlay | 2017-02-04 | 1 | -0/+22 |
* | Add migration to index | Dan Finlay | 2017-02-04 | 1 | -1/+2 |
* | Got ShapeShiftController back to working | Dan Finlay | 2017-02-04 | 2 | -12/+43 |
* | Mostly got shapeshift tx management into its own controller | Dan Finlay | 2017-02-04 | 3 | -37/+112 |
* | eth-store - update store state after manipulating | kumavis | 2017-02-04 | 1 | -0/+2 |
* | id mgmt - update to latest eth_sign spec | kumavis | 2017-02-04 | 4 | -34/+55 |
* | migrations - fix migration #9 and add safety checks to migrator | kumavis | 2017-02-04 | 2 | -3/+14 |
* | eths-store - eagerly set current block | kumavis | 2017-02-04 | 1 | -0/+2 |
* | metamask - add missing diskState and memState subscriptions | kumavis | 2017-02-03 | 1 | -6/+11 |
* | migration #9 - break out CurrencyController substate | kumavis | 2017-02-03 | 6 | -75/+133 |
* | eth-store - cbs default to noop | kumavis | 2017-02-03 | 1 | -5/+5 |
* | migration #8 - break out NoticeController substate | kumavis | 2017-02-03 | 4 | -28/+63 |
* | eth-store - convert to obs-store subclass | kumavis | 2017-02-03 | 2 | -118/+103 |
* | txManager - depend on preferencesStore | kumavis | 2017-02-03 | 2 | -4/+8 |
* | metamask - introduce networkStore | kumavis | 2017-02-03 | 2 | -35/+50 |
* | migration 7 - break off TransactionManager substate | kumavis | 2017-02-03 | 4 | -25/+89 |
* | messageManager - move view state to obs-store | kumavis | 2017-02-03 | 2 | -38/+28 |
* | keyring - replace getState with memStore | kumavis | 2017-02-03 | 2 | -30/+2 |
* | keyring - manage isUnlocked in memStore | kumavis | 2017-02-03 | 1 | -1/+7 |
* | keyring - rm config dep | kumavis | 2017-02-03 | 2 | -5/+2 |
* | Merge branch 'dev' into notice-management | Kevin Serrano | 2017-02-03 | 3 | -1/+2 |
|\ |
|
| * | metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ... | kumavis | 2017-02-02 | 2 | -1/+1 |
| * | emit a update badge | Frankie | 2017-02-02 | 1 | -1/+1 |
| * | put updateBadge back in | Frankie | 2017-02-02 | 1 | -0/+1 |
* | | Change filepath for new location of notices. | Kevin Serrano | 2017-02-03 | 1 | -1/+1 |
|/ |
|
* | swap out set state for updateState | Frankie | 2017-02-02 | 1 | -4/+1 |
* | Fix messy merge | Frankie | 2017-02-02 | 1 | -14/+2 |
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 2 | -50/+69 |
|\ |
|
| * | metamask - adopt isInitialized from keyring controller | kumavis | 2017-02-01 | 2 | -4/+8 |
| * | keyring - move identities into memStore | kumavis | 2017-02-01 | 1 | -7/+15 |
| * | keyring - add keyringtypes to memStore | kumavis | 2017-02-01 | 1 | -3/+3 |
| * | metamask - inherit some configManager state from keyring controller | kumavis | 2017-02-01 | 2 | -10/+13 |
| * | keyring - synchronous getState | kumavis | 2017-02-01 | 2 | -46/+47 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 8 | -47/+110 |
|\| |
|
| * | migration #6 - fix selectedAddress data source | kumavis | 2017-01-31 | 1 | -2/+2 |
| * | inpage - set web3.eth.defaultAccount correctly | kumavis | 2017-01-31 | 2 | -2/+2 |
| * | continue rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 4 | -13/+13 |
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 4 | -10/+13 |
| * | metamask - rename getSelectedAccount to getSelectedAddress | kumavis | 2017-01-31 | 2 | -5/+5 |
| * | migration #6 - move selectedAccount from keyringController to preferencesCont... | kumavis | 2017-01-31 | 2 | -0/+42 |
| * | metamask - move selectedAccount set/get to preferencesController | kumavis | 2017-01-31 | 2 | -33/+12 |
| * | preferences - introduce preferences controller | kumavis | 2017-01-31 | 2 | -0/+39 |
* | | code clan up and tests | Frankie | 2017-02-02 | 3 | -41/+39 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-30 | 2 | -4/+13 |
|\| |
|
| * | metamask - lookup selectedAccount via keyringController | kumavis | 2017-01-30 | 2 | -3/+12 |
| * | public config - get selectedAccount from keyring controller substate | kumavis | 2017-01-30 | 1 | -1/+1 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 5 | -174/+236 |
|\| |
|
| * | metamask - subscribe metamask store to keyringController substate | kumavis | 2017-01-29 | 1 | -0/+3 |
| * | migration 5 - move keyring controller state to substate | kumavis | 2017-01-29 | 3 | -67/+95 |
| * | keyring - add and initialize obs-store | kumavis | 2017-01-29 | 2 | -6/+36 |
| * | metamask - adopt shapeshift txs from keyringController | kumavis | 2017-01-28 | 2 | -2/+3 |
| * | tests - remove persistence and start with initial state | kumavis | 2017-01-28 | 1 | -9/+1 |
| * | metamask - organize methods | kumavis | 2017-01-28 | 1 | -120/+126 |
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 5 | -126/+129 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-28 | 4 | -194/+205 |
|\| |
|
| * | metamask - fix setupProviderConnection | kumavis | 2017-01-27 | 1 | -1/+1 |
| * | keymanager - small clean | kumavis | 2017-01-27 | 1 | -2/+2 |
| * | 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 | 2 | -44/+41 |
| * | background - stream disconnection fix | kumavis | 2017-01-27 | 2 | -8/+8 |
| * | metamask controller - adopt clearSeedWords from keyring controller | kumavis | 2017-01-27 | 2 | -15/+9 |
* | | Rewrite message controller to fit controller pattern | Frankie | 2017-01-28 | 1 | -48/+45 |
|/ |
|
* | background - graceful publicConfigStore connection teardown | kumavis | 2017-01-27 | 1 | -1/+3 |
* | background - organize metamask instantiation | kumavis | 2017-01-27 | 3 | -47/+37 |
* | obs-store - use published module | kumavis | 2017-01-25 | 10 | -295/+85 |
* | migrations - rename 005 to stubbed _multi-keyring | kumavis | 2017-01-25 | 1 | -0/+7 |
* | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2 | kumavis | 2017-01-25 | 3 | -32/+34 |
|\ |
|
| * | Merge branch 'dev' into i#1048 | kumavis | 2017-01-25 | 2 | -0/+56 |
| |\ |
|
| | * | Merge pull request #1051 from MetaMask/hotfix1048 | Frankie | 2017-01-25 | 1 | -3/+5 |
| | |\ |
|
| * | | | background controller - extract KeyringC.placeSeedWords to MetamaskC | kumavis | 2017-01-25 | 2 | -22/+16 |
| * | | | merge master hotfix into dev | kumavis | 2017-01-25 | 1 | -1/+1 |
| |\ \ \ |
|
| | * | | | 3.1.2 | kumavis | 2017-01-25 | 1 | -1/+1 |
| | | |/
| | |/| |
|
| | * | | hotfix - dont assume hd keyring position | kumavis | 2017-01-25 | 1 | -3/+5 |
| * | | | keyring-controller - cleanup | kumavis | 2017-01-25 | 1 | -2/+3 |
| * | | | keyring-controller - cleanup | kumavis | 2017-01-25 | 1 | -5/+3 |
| * | | | Move the assumption of their only being one hd keyring when requesting seed w... | Frankie | 2017-01-25 | 2 | -7/+8 |
| * | | | Fix issue where generating a new account would put it in loose keys | Frankie | 2017-01-25 | 2 | -4/+12 |
| |/ / |
|
* | | | Merge branch 'dev' into obs-store2 | kumavis | 2017-01-22 | 11 | -136/+329 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' into upToDate | Frankie | 2017-01-21 | 1 | -1/+1 |
| |\| |
|
| | * | 3.1.1 | kumavis | 2017-01-21 | 1 | -1/+1 |
| * | | Merge branch 'master' into upToDate | Frankie | 2017-01-21 | 1 | -1/+3 |
| |\| |
|
| | * | keyring controller - placeSeedWords should use first hdKeyring | kumavis | 2017-01-21 | 1 | -1/+3 |
| * | | Merge branch 'dev' into i715-AddJsonImport | Dan Finlay | 2017-01-19 | 2 | -2/+2 |
| |\| |
|
| | * | Merge branch 'master' into Version-3.1.0 | Dan Finlay | 2017-01-19 | 1 | -1/+1 |
| | |\ |
|
| | | * | Merge branch 'master' into fixSignedVsSubmitted | Frankie | 2017-01-19 | 2 | -4/+7 |
| | | |\ |
|
| | | * | | Fix the dissplay for submitted transactions and the listner wating to hear wh... | Frankie | 2017-01-19 | 1 | -1/+1 |
| | * | | | Version 3.1.0 | Dan Finlay | 2017-01-19 | 1 | -1/+1 |
| * | | | | Add ability to import v3 JSON wallets | Dan Finlay | 2017-01-19 | 1 | -5/+13 |
| * | | | | Added new modular private key import system | Dan Finlay | 2017-01-19 | 2 | -0/+48 |
| |/ / / |
|
| * | | | Merge branch 'dev' into i715-AddImportMenu | kumavis | 2017-01-19 | 1 | -6/+5 |
| |\ \ \ |
|
| | * | | | tx-manager - use rpc-specified txHash | kumavis | 2017-01-19 | 1 | -6/+5 |
| * | | | | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 3 | -8/+22 |
| |/ / / |
|
| * | | | Merge branch 'dev' into conversion-api-err | Dan Finlay | 2017-01-18 | 10 | -131/+250 |
| |\ \ \ |
|
| | * | | | Version 3.0.1 | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| | * | | | Fix bug where signed messages were not dismissed | Dan Finlay | 2017-01-17 | 1 | -0/+1 |
| | * | | | Fix removeHexPrefix to stripHexPrefix | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| | * | | | Wrote fix for eth.sign | Dan Finlay | 2017-01-17 | 1 | -2/+1 |
| | | |/
| | |/| |
|
| | * | | Fix manifest version | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| | * | | Version 3.0.0 | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| | * | | keyring - simple - throw error if wallet not found for address | kumavis | 2017-01-17 | 1 | -1/+4 |
| | * | | keyring - simple - fix address generation | kumavis | 2017-01-17 | 1 | -3/+3 |
| | |/ |
|
| | * | eth-store - emit update on new account add | kumavis | 2017-01-15 | 1 | -1/+3 |
| | * | background - txManager - filter txs by network | kumavis | 2017-01-15 | 2 | -4/+6 |
| | * | background - return txHash to provider-engine on done | kumavis | 2017-01-15 | 2 | -14/+13 |
| | * | Fix the inclusion of the txFee in the meta tx object | Frankie | 2017-01-15 | 1 | -3/+5 |
| | * | fix for linting | Frankie | 2017-01-14 | 1 | -0/+1 |
| | * | Satisfy review needs: | Frankie | 2017-01-14 | 2 | -21/+23 |
| | * | fix the maxcost not being included in txMeta | Frankie | 2017-01-14 | 1 | -3/+7 |
| | * | Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-s... | kumavis | 2017-01-14 | 4 | -13/+38 |
| | |\ |
|
| | | * | Merge branch 'dev' into bug-submitTx | kumavis | 2017-01-14 | 4 | -13/+38 |
| | | |\ |
|
| | | | * | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-14 | 1 | -2/+2 |
| | | | |\ |
|
| | | | * | | Clean up code | Frankie | 2017-01-14 | 1 | -1/+2 |
| | | | * | | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 1 | -1/+1 |
| | | | |\ \ |
|
| | | | * | | | Fix wording and icon of failed txs | Frankie | 2017-01-12 | 2 | -15/+16 |
| | | | * | | | Add to CHANGELOG | Frankie | 2017-01-12 | 1 | -2/+8 |
| | | | * | | | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 3 | -36/+11 |
| | | | |\ \ \ |
|
| | | | * | | | | Take some of the tx Logic out of the UI and create a visble state for pending... | Frankie | 2017-01-12 | 4 | -9/+28 |
| | * | | | | | | 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 | 4 | -108/+186 |
| | | |_|_|/
| | |/| | | |
|
| * | | | | | currency conversion - less noisy error | kumavis | 2017-01-12 | 1 | -1/+1 |
| | |_|/ /
| |/| | | |
|
* | | | | | background - fix metamaskController store -> diskStore persistence | kumavis | 2017-01-13 | 1 | -1/+6 |
* | | | | | migrations - wip - 005 multivault migration | kumavis | 2017-01-12 | 7 | -31/+82 |
* | | | | | migrations - introduce promise-based migrator | kumavis | 2017-01-12 | 5 | -112/+179 |
* | | | | | background - move pojo migrator to outside of metamask controller | kumavis | 2017-01-12 | 11 | -104/+159 |
* | | | | | background - introduce ObservableStore | kumavis | 2017-01-12 | 9 | -166/+204 |
| |/ / /
|/| | | |
|
* | | | | bugfix - portstream - dont wrap cb in try catch | kumavis | 2017-01-12 | 1 | -2/+2 |
| |_|/
|/| | |
|
* | | | Send update to UI when changing selected account | Dan Finlay | 2017-01-12 | 1 | -1/+1 |
|/ / |
|
* | | 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 |
* | | Remove erroneous OOG estimation logic. | Dan Finlay | 2017-01-11 | 1 | -15/+2 |
* | | deps - replace promise-request with fetch | kumavis | 2017-01-11 | 1 | -4/+3 |
|/ |
|
* | Merge branch 'dev' into TearDownOnDisconnect | kumavis | 2017-01-06 | 3 | -31/+33 |
|\ |
|
| * | Merge branch 'dev' into fixTxManager | Dan Finlay | 2017-01-06 | 2 | -1/+145 |
| |\ |
|
| * | | Combine two identical then blocks | Dan Finlay | 2017-01-06 | 1 | -4/+2 |
| * | | remove unnecessary try statments | Frankie | 2017-01-05 | 3 | -37/+24 |
| * | | clean up | Frankie | 2017-01-05 | 1 | -1/+1 |
| * | | Merge branch 'dev' into fixtTxManager | Frankie | 2017-01-05 | 4 | -37/+68 |
| |\ \ |
|
| * | | | Fix signing of transactions | Frankie | 2017-01-05 | 3 | -46/+62 |
* | | | | Merge branch 'dev' into TearDownOnDisconnect | kumavis | 2017-01-06 | 2 | -1/+145 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Fixed bugs with sanity-checking | Dan Finlay | 2017-01-05 | 1 | -12/+10 |
| * | | | Fix dependency reference | Dan Finlay | 2017-01-05 | 1 | -1/+1 |
| * | | | Caught typo | Dan Finlay | 2017-01-05 | 1 | -2/+3 |
| * | | | Add descriptive comment | Dan Finlay | 2017-01-05 | 1 | -0/+9 |
| * | | | Linted | Dan Finlay | 2017-01-05 | 1 | -22/+17 |
| * | | | Removed reliance on eth-store internal custom eth-query | Dan Finlay | 2017-01-05 | 1 | -6/+15 |
| * | | | Move eth-store@1.1.0 into local repo. | Dan Finlay | 2017-01-05 | 1 | -0/+132 |
| | |/
| |/| |
|
* / | | MetaMask Controller - Convert to EventEmitter | Frankie | 2017-01-06 | 2 | -12/+8 |
|/ / |
|
* | | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev | Kevin Serrano | 2017-01-04 | 1 | -2/+8 |
|\ \ |
|
| * | | 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 |
* | | | Take out unneeded permissions from the app. | Kevin Serrano | 2017-01-04 | 1 | -2/+0 |
|/ / |
|
* | | Make single letter variables more verbose | Dan Finlay | 2017-01-03 | 2 | -5/+5 |
* | | Merge branch 'dev' into ShowDifferentAccounts | Dan Finlay | 2017-01-03 | 8 | -519/+421 |
|\| |
|
| * | inpage-provider - add isMetaMask | kumavis | 2017-01-03 | 1 | -0/+2 |
| * | Merge branch 'dev' into TxManager | Frankie | 2016-12-24 | 6 | -53/+94 |
| |\ |
|
| * | | fix some minor spelling mistakes and clean up code | Frankie | 2016-12-24 | 3 | -28/+26 |
| * | | fix merge | Frances Pangilinan | 2016-12-22 | 1 | -1/+1 |
| * | | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 10 | -192/+191 |
| |\ \ |
|
| * | | | Remove txManager in keyring controller | Frances Pangilinan | 2016-12-22 | 1 | -2/+0 |
| * | | | Migrate all tx mutation code out of keyring controller and | Frances Pangilinan | 2016-12-22 | 4 | -54/+71 |
| * | | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 7 | -511/+184 |
| * | | | Clean up and comment functions | Frances Pangilinan | 2016-12-15 | 2 | -10/+31 |
| * | | | Create a TxManager | Frances Pangilinan | 2016-12-15 | 7 | -159/+350 |
* | | | | Add tolerance for hex prefixed private keys to simple keychain | Dan Finlay | 2017-01-03 | 1 | -3/+4 |
* | | | | 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 | 2 | -29/+55 |
|/ / / |
|
* | | | Remove log | Dan Finlay | 2016-12-23 | 1 | -1/+0 |
* | | | Merge pull request #948 from MetaMask/RecoverLostAccounts | Dan Finlay | 2016-12-23 | 5 | -51/+92 |
|\ \ \ |
|
| * | | | 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 | 3 | -21/+51 |
| * | | | Return undefined when vault is uninitialized | Dan Finlay | 2016-12-22 | 1 | -1/+1 |
| * | | | Added error when trying to unlock uninitialized vault | Dan Finlay | 2016-12-22 | 1 | -0/+4 |
| * | | | Move old keystore migration code to metamask controller | Dan Finlay | 2016-12-22 | 2 | -46/+50 |
| * | | | Make notices confirmation configurable | Dan Finlay | 2016-12-21 | 2 | -2/+16 |
* | | | | Fix account injection bug | Dan Finlay | 2016-12-23 | 1 | -2/+3 |
| |_|/
|/| | |
|
* | | | Lint. | Kevin Serrano | 2016-12-21 | 1 | -11/+11 |
|/ / |
|
* | | Merge pull request #916 from MetaMask/i894-DetectBadAccounts | Dan Finlay | 2016-12-21 | 4 | -16/+57 |
|\ \ |
|
| * | | Made changes according to feedback. | Dan Finlay | 2016-12-20 | 3 | -13/+12 |
| * | | Got bad account detection working and added to state | Dan Finlay | 2016-12-10 | 3 | -31/+8 |
| * | | Mostly added bad account detection | Dan Finlay | 2016-12-09 | 4 | -9/+74 |
| |/ |
|
* | | Merge pull request #939 from MetaMask/BrowserPassworder | Dan Finlay | 2016-12-21 | 2 | -157/+2 |
|\ \ |
|
| * | | Remove encryptor in favor of external browser-passworder | Dan Finlay | 2016-12-20 | 2 | -157/+2 |
* | | | Merge pull request #942 from MetaMask/Version-2.14.1 | Dan Finlay | 2016-12-21 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Version 2.14.12.14.1 | Dan Finlay | 2016-12-21 | 1 | -1/+1 |
* | | | Merge pull request #937 from MetaMask/i900-forgot-password-flow | Dan Finlay | 2016-12-20 | 2 | -4/+3 |
|\ \ \ |
|
| * | | | Lint. | Kevin Serrano | 2016-12-20 | 2 | -4/+3 |
| | |/
| |/| |
|
* | | | Merged master into dev | Dan Finlay | 2016-12-20 | 5 | -20/+132 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | changelog - inf reload detection hotfix | kumavis | 2016-12-20 | 1 | -1/+1 |
| * | inpage - temporarily disable ping stream | kumavis | 2016-12-20 | 1 | -8/+9 |
| * | move notice code from metamask-controller + config-manager, in to notice-cont... | kumavis | 2016-12-17 | 3 | -111/+98 |
| * | Deactivate polling for now. | Kevin Serrano | 2016-12-17 | 1 | -1/+3 |
| * | Cleanup | Dan Finlay | 2016-12-17 | 1 | -3/+0 |