Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Mostly got shapeshift tx management into its own controller | Dan Finlay | 2017-02-04 | 4 | -38/+114 |
* | Merge pull request #1087 from MetaMask/kumavis-refactor7 | Kevin Serrano | 2017-02-04 | 1 | -0/+2 |
|\ | |||||
| * | eth-store - update store state after manipulating | kumavis | 2017-02-04 | 1 | -0/+2 |
* | | Merge pull request #1086 from MetaMask/kumavis-refactor7 | kumavis | 2017-02-04 | 10 | -42/+77 |
|\| | |||||
| * | test - skip eth_sign tests until we have test data | kumavis | 2017-02-04 | 2 | -2/+2 |
| * | id mgmt - update to latest eth_sign spec | kumavis | 2017-02-04 | 5 | -36/+58 |
| * | migrations - fix migration #9 and add safety checks to migrator | kumavis | 2017-02-04 | 3 | -4/+15 |
| * | eths-store - eagerly set current block | kumavis | 2017-02-04 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #1083 from MetaMask/kumavis-refactor6 | kumavis | 2017-02-03 | 20 | -516/+696 |
|\ | |||||
| * | metamask - add missing diskState and memState subscriptions | kumavis | 2017-02-03 | 1 | -6/+11 |
| * | migration #9 - break out CurrencyController substate | kumavis | 2017-02-03 | 10 | -152/+227 |
| * | 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 | 3 | -121/+106 |
| * | txManager - depend on preferencesStore | kumavis | 2017-02-03 | 3 | -5/+8 |
| * | metamask - introduce networkStore | kumavis | 2017-02-03 | 3 | -47/+53 |
| * | migration 7 - break off TransactionManager substate | kumavis | 2017-02-03 | 7 | -79/+179 |
| * | messageManager - move view state to obs-store | kumavis | 2017-02-03 | 3 | -51/+32 |
| * | 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 |
| * | actions - dont expect background to provide newState, manually update | kumavis | 2017-02-03 | 1 | -12/+27 |
|/ | |||||
* | Merge pull request #1082 from MetaMask/notice-management | kumavis | 2017-02-03 | 7 | -8/+47 |
|\ | |||||
| * | Merge branch 'dev' into notice-management | Kevin Serrano | 2017-02-03 | 5 | -21/+23 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1079 from MetaMask/kumavis-refactor5 | Kevin Serrano | 2017-02-02 | 5 | -22/+23 |
|\ \ | |||||
| * | | test - first-time - re-add terms header check | kumavis | 2017-02-02 | 1 | -0/+2 |
| * | | metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ... | kumavis | 2017-02-02 | 2 | -1/+1 |
| * | | test - mock-dev - expose metamaskController for debugging | kumavis | 2017-02-02 | 1 | -0/+1 |
| * | | tests - mockDev - fix first-time flow | kumavis | 2017-02-02 | 2 | -21/+19 |
|/ / | |||||
* | | Merge pull request #1078 from MetaMask/messageManagerCleanUp | Frankie | 2017-02-02 | 1 | -0/+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 |
| | * | modification of notices. | Kevin Serrano | 2017-02-03 | 7 | -8/+47 |
| |/ |/| | |||||
* | | Merge pull request #1076 from MetaMask/messageManagerCleanUp | kumavis | 2017-02-02 | 22 | -216/+306 |
|\| | |||||
| * | 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 | 6 | -82/+75 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1077 from MetaMask/i#1075 | Kevin Serrano | 2017-02-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | default a return of an empty array | Frankie | 2017-02-02 | 1 | -1/+1 |
| * | | linting | Frankie | 2017-02-02 | 1 | -1/+1 |
| * | | fix transactions not showing up in history | Frankie | 2017-02-02 | 1 | -1/+1 |
* | | | Merge pull request #1073 from MetaMask/kumavis-refactor4 | Frankie | 2017-02-02 | 5 | -84/+74 |
|\ \ \ | |/ / |/| | | |||||
| * | | metamask - adopt isInitialized from keyring controller | kumavis | 2017-02-01 | 3 | -13/+8 |
| * | | keyring - move identities into memStore | kumavis | 2017-02-01 | 2 | -9/+19 |
| * | | keyring - add keyringtypes to memStore | kumavis | 2017-02-01 | 1 | -3/+3 |
| * | | tests - mock-dev - remove persistence | kumavis | 2017-02-01 | 1 | -15/+1 |
| * | | metamask - inherit some configManager state from keyring controller | kumavis | 2017-02-01 | 2 | -10/+13 |
| * | | keyring - synchronous getState | kumavis | 2017-02-01 | 3 | -55/+51 |
|/ / | |||||
| * | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 49 | -128/+170 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1069 from MetaMask/i1066 | Frankie | 2017-01-31 | 49 | -128/+170 |
|\ \ | |||||
| * | | 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 | 32 | -55/+51 |
| * | | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 17 | -49/+35 |
| * | | 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 |
|/ / | |||||
| * | Add to CHANGELOG | Frankie | 2017-02-02 | 1 | -0/+1 |
| * | code clan up and tests | Frankie | 2017-02-02 | 5 | -44/+140 |
| * | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-30 | 2 | -4/+13 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1068 from MetaMask/kumavis-refactor3 | 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 | 12 | -334/+274 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #1062 from MetaMask/kumavis-refactor3 | kumavis | 2017-01-29 | 12 | -339/+277 |
|\| | | |||||
| * | | 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 | 9 | -112/+122 |
| * | | 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 | 3 | -124/+12 |
| * | | metamask - organize methods | kumavis | 2017-01-28 | 1 | -120/+126 |
|/ / | |||||
| * | Clean up message manger includes: | Frankie | 2017-01-29 | 20 | -179/+185 |
| * | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-28 | 7 | -198/+208 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1058 from MetaMask/kumavis-refactor2 | Frankie | 2017-01-28 | 7 | -198/+208 |
|\ \ | |||||
| * | | metamask - fix setupProviderConnection | kumavis | 2017-01-27 | 1 | -1/+1 |
| * | | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2 | kumavis | 2017-01-27 | 1 | -2/+0 |
| |\ \ | |/ / |/| | | |||||
| * | | keymanager - small clean | kumavis | 2017-01-27 | 1 | -2/+2 |
| * | | lint -ignore extra spaces before values in obj expression | kumavis | 2017-01-27 | 1 | -1/+1 |
| * | | metamask controller - cleanup remote api | kumavis | 2017-01-27 | 2 | -79/+101 |
| * | | 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 |
| * | | test - lint first | kumavis | 2017-01-27 | 1 | -1/+1 |
| * | | 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 |
| |/ |/| | |||||
* | | Merge pull request #1056 from MetaMask/i#1006 | kumavis | 2017-01-27 | 1 | -2/+0 |
|\ \ | |/ |/| | |||||
| * | Fix ui overlap | Frankie | 2017-01-27 | 1 | -2/+0 |
* | | Merge pull request #1057 from MetaMask/kumavis-refactor1 | kumavis | 2017-01-27 | 4 | -62/+44 |
|\ \ | |/ |/| | |||||
| * | background - graceful publicConfigStore connection teardown | kumavis | 2017-01-27 | 1 | -1/+3 |
| * | config-manager - default to USD for currentFiat | kumavis | 2017-01-27 | 1 | -14/+4 |
| * | background - organize metamask instantiation | kumavis | 2017-01-27 | 3 | -47/+37 |
|/ | |||||
* | Merge pull request #999 from MetaMask/obs-store2 | kumavis | 2017-01-25 | 21 | -562/+508 |
|\ | |||||
| * | mock-dev - cleanup missing polyfill | kumavis | 2017-01-25 | 1 | -3/+0 |
| * | obs-store - use published module | kumavis | 2017-01-25 | 16 | -327/+113 |
| * | 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 | 8 | -36/+62 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1054 from MetaMask/i#1048 | Frankie | 2017-01-25 | 7 | -35/+58 |
|\ \ | |||||
| * \ | Merge branch 'dev' into i#1048 | kumavis | 2017-01-25 | 12 | -12/+166 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic | kumavis | 2017-01-25 | 2 | -1/+2 |
|\ \ \ | |||||
| * | | | fix base | Frankie | 2017-01-25 | 1 | -2/+2 |
| * | | | add to CHANGELOG | Frankie | 2017-01-25 | 1 | -0/+1 |
| * | | | Fix issue where ConfTx view lets you approve txs when the account has insuffi... | Frankie | 2017-01-25 | 1 | -1/+1 |
* | | | | Merge pull request #1051 from MetaMask/hotfix1048 | Frankie | 2017-01-25 | 2 | -5/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| | * | | background controller - extract KeyringC.placeSeedWords to MetamaskC | kumavis | 2017-01-25 | 4 | -23/+34 |
| | * | | merge master hotfix into dev | kumavis | 2017-01-25 | 2 | -2/+5 |
| | |\ \ | |||||
| | | * \ | Merge pull request #1053 from MetaMask/3.1.2v3.1.2 | kumavis | 2017-01-25 | 2 | -1/+6 |
| | | |\ \ | |||||
| | | | * | | 3.1.2 | kumavis | 2017-01-25 | 2 | -1/+6 |
| | | |/ / | |||||
| | | * | | Merge pull request #1052 from MetaMask/hotfix1048 | kumavis | 2017-01-25 | 2 | -5/+7 |
| | | |\ \ | | |_|/ / | |/| | | | |||||
| * | | | | hotfix - dont assume hd keyring position | kumavis | 2017-01-25 | 2 | -5/+7 |
| | |/ / | |/| | | |||||
| | * | | keyring-controller - cleanup | kumavis | 2017-01-25 | 1 | -2/+3 |
| | * | | keyring-controller - cleanup | kumavis | 2017-01-25 | 1 | -5/+3 |
| | * | | add to CHANGELOG | Frankie | 2017-01-25 | 1 | -0/+2 |
| | * | | 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 | 4 | -6/+15 |
| |/ / | |||||
| | * | Merge branch 'dev' into obs-store2 | kumavis | 2017-01-22 | 49 | -308/+1406 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #1042 from MetaMask/upToDate | kumavis | 2017-01-21 | 2 | -1/+4 |
|\ \ \ | |||||
| * | | | Merge branch 'master' into upToDate | Frankie | 2017-01-21 | 2 | -1/+4 |
|/| | | | |/ / | |||||
| * | | Merge pull request #1040 from MetaMask/3.1.1v3.1.1 | kumavis | 2017-01-21 | 2 | -1/+5 |
| |\ \ | |||||
| | * | | 3.1.1 | kumavis | 2017-01-21 | 2 | -1/+5 |
| |/ / | |||||
* | | | Merge pull request #1039 from MetaMask/upToDate | kumavis | 2017-01-21 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Merge branch 'master' into upToDate | Frankie | 2017-01-21 | 1 | -1/+3 |
|/| | | | |/ / | |||||
| * | | Merge pull request #1037 from MetaMask/i1034-seed-export | Frankie | 2017-01-21 | 1 | -1/+3 |
| |\ \ | |||||
| | * | | keyring controller - placeSeedWords should use first hdKeyring | kumavis | 2017-01-21 | 1 | -1/+3 |
| |/ / | |||||
* | | | Merge pull request #1029 from MetaMask/i715-AddJsonImport | Kevin Serrano | 2017-01-20 | 11 | -11/+165 |
|\ \ \ | |||||
| * | | | Bump changelog | Dan Finlay | 2017-01-19 | 1 | -0/+2 |
| * | | | Merge branch 'dev' into i715-AddJsonImport | Dan Finlay | 2017-01-19 | 4 | -3/+6 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1030 from MetaMask/master | kumavis | 2017-01-19 | 4 | -3/+6 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #1027 from MetaMask/Version-3.1.0v3.1.0 | Dan Finlay | 2017-01-19 | 33 | -79/+875 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into Version-3.1.0 | Dan Finlay | 2017-01-19 | 3 | -2/+3 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #1024 from MetaMask/fixSignedVsSubmitted | Dan Finlay | 2017-01-19 | 3 | -2/+4 |
| |\ \ \ \ | |||||
| | * | | | | Add to CHANGELOG | Frankie | 2017-01-19 | 1 | -0/+2 |
| | * | | | | Merge branch 'master' into fixSignedVsSubmitted | Frankie | 2017-01-19 | 10 | -21/+28 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Fix the dissplay for submitted transactions and the listner wating to hear wh... | Frankie | 2017-01-19 | 2 | -2/+2 |
| | | * | | | Version 3.1.0 | Dan Finlay | 2017-01-19 | 2 | -1/+3 |
| |_|/ / / |/| | | | | |||||
| | | * | | Add ability to import v3 JSON wallets | Dan Finlay | 2017-01-19 | 5 | -10/+27 |
| | | * | | Implement naieve JSON file importing | Dan Finlay | 2017-01-19 | 3 | -5/+77 |
| | | * | | Added new modular private key import system | Dan Finlay | 2017-01-19 | 4 | -2/+65 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #1022 from MetaMask/i715-AddImportMenu | kumavis | 2017-01-19 | 26 | -49/+828 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'dev' into i715-AddImportMenu | kumavis | 2017-01-19 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1026 from MetaMask/i1023-badTxHash | Dan Finlay | 2017-01-19 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Bump changelog | Dan Finlay | 2017-01-19 | 1 | -0/+2 |
| | * | | | | Merge branch 'dev' into i715-AddImportMenu | kumavis | 2017-01-19 | 1 | -6/+5 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1025 from MetaMask/i1023-badTxHash | Dan Finlay | 2017-01-19 | 1 | -6/+5 |
|\| | | | | | |||||
| * | | | | | tx-manager - use rpc-specified txHash | kumavis | 2017-01-19 | 1 | -6/+5 |
|/ / / / / | |||||
| * | | | | Fix test to log out despite number of menu items | Dan Finlay | 2017-01-18 | 2 | -2/+3 |
| * | | | | Bump changelog | Dan Finlay | 2017-01-18 | 1 | -0/+2 |
| * | | | | Remove outdated reference | Dan Finlay | 2017-01-18 | 1 | -4/+0 |
| * | | | | Remove unused UI files | Dan Finlay | 2017-01-18 | 2 | -109/+0 |
| * | | | | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 10 | -16/+357 |
| * | | | | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu | Dan Finlay | 2017-01-18 | 19 | -74/+560 |
| |\ \ \ \ | |||||
| | * | | | | Develop import subviews | Dan Finlay | 2016-11-05 | 6 | -17/+87 |
| | * | | | | Add import account placeholder template | Dan Finlay | 2016-11-05 | 4 | -30/+72 |
| | * | | | | Add babelify to gulp build | Dan Finlay | 2016-11-05 | 1 | -0/+4 |
| | * | | | | Linted | Dan Finlay | 2016-11-05 | 3 | -12/+8 |
| | * | | | | Add account adding subview placeholders | Dan Finlay | 2016-11-05 | 4 | -39/+121 |
| | * | | | | Merge branch 'i328-MultiVault' into i328-MultiVault-v1 | Dan Finlay | 2016-11-05 | 1 | -21/+1 |
| | |\ \ \ \ | |||||
| | * | | | | | Remove unused class | Dan Finlay | 2016-11-05 | 1 | -1/+1 |
| | * | | | | | Convert buy subview to new tab bar component | Dan Finlay | 2016-11-05 | 1 | -36/+47 |
| | * | | | | | Scaffold new account view | Dan Finlay | 2016-11-05 | 9 | -2/+192 |
| * | | | | | | Add "import account" menu item + template view | Dan Finlay | 2017-01-18 | 4 | -0/+63 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1017 from MetaMask/conversion-api-err | Dan Finlay | 2017-01-18 | 2 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into conversion-api-err | Dan Finlay | 2017-01-18 | 28 | -261/+413 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1019 from MetaMask/i1014-FixSigning | Dan Finlay | 2017-01-18 | 5 | -7/+17 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dev' into i1014-FixSigning | kumavis | 2017-01-17 | 1 | -12/+0 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1016 from MetaMask/i1014-FixSigning | kumavis | 2017-01-17 | 2 | -2/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into i1014-FixSigning | kumavis | 2017-01-17 | 1 | -12/+0 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1012 from MetaMask/RemoveOldNotice | kumavis | 2017-01-17 | 1 | -12/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove old notice | Dan Finlay | 2017-01-17 | 1 | -12/+0 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | | * | | | | | | Version 3.0.1 | Dan Finlay | 2017-01-17 | 2 | -1/+3 |
| | | * | | | | | | 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 |
| | | * | | | | | | Fix message signing UI rendering | Dan Finlay | 2017-01-17 | 1 | -5/+10 |
| | | * | | | | | | Bump changelog | Dan Finlay | 2017-01-17 | 1 | -0/+2 |
| | |/ / / / / / | |||||
| | * | | | | | | Wrote fix for eth.sign | Dan Finlay | 2017-01-17 | 1 | -2/+1 |
| | * | | | | | | Wrote failing test for eth.sign | Dan Finlay | 2017-01-17 | 1 | -0/+18 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1011 from MetaMask/dev | kumavis | 2017-01-17 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1010 from MetaMask/master | kumavis | 2017-01-17 | 1 | -1/+1 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #1009 from MetaMask/FixManifest | kumavis | 2017-01-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into FixManifest | kumavis | 2017-01-17 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #1005 from MetaMask/dev | kumavis | 2017-01-17 | 132 | -1609/+10269 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| | * | | | | | | Fix manifest version | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1008 from MetaMask/Version-3.0.0v3.0.0 | Dan Finlay | 2017-01-17 | 2 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Version 3.0.0 | Dan Finlay | 2017-01-17 | 2 | -1/+3 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1007 from MetaMask/simple-keystore-fix | Dan Finlay | 2017-01-17 | 2 | -9/+9 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dev' into simple-keystore-fix | kumavis | 2017-01-17 | 6 | -9/+11 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Bump changelog to mention BIP44 fix | Dan Finlay | 2017-01-17 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'master' into dev | Dan Finlay | 2017-01-17 | 6 | -9/+10 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #984 from MetaMask/correctCoinbaseInfo | Dan Finlay | 2017-01-11 | 3 | -5/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | add to CHANGELOG | Frankie | 2017-01-11 | 1 | -0/+1 |
| | * | | | | | | | update coinbase info and view | Frankie | 2017-01-11 | 2 | -5/+5 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #943 from MetaMask/fixExplorerLink | Dan Finlay | 2016-12-21 | 4 | -4/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | make CHANGELOG more human readable | Frankie | 2016-12-21 | 1 | -1/+1 |
| | * | | | | | | | Add to CHANGELOG.md | Frances Pangilinan | 2016-12-21 | 1 | -0/+1 |
| | * | | | | | | | remove network Id 2 from explorer link and Add network Id 3 | Frances Pangilinan | 2016-12-21 | 3 | -4/+3 |
| |/ / / / / / / | |||||
| | * | | | | | | test - keyring - simple - fix fixture data | kumavis | 2017-01-17 | 1 | -6/+3 |
| | * | | | | | | 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 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1004 from MetaMask/doubleRenderIssue | Dan Finlay | 2017-01-17 | 2 | -2/+5 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | add to CHANGELOG | Frankie | 2017-01-15 | 1 | -0/+1 |
| * | | | | | | Dont render conf-tx if their are no txParams to show | Frankie | 2017-01-15 | 1 | -2/+4 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1002 from MetaMask/bug-submitTx | Frankie | 2017-01-15 | 10 | -160/+258 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test - clear localStorage on test start | kumavis | 2017-01-15 | 1 | -3/+3 |
| * | | | | | | test - clear localStorage in case CI caches it (?) | kumavis | 2017-01-15 | 1 | -0/+1 |
| * | | | | | | test - txManager - add network to all txs | kumavis | 2017-01-15 | 1 | -18/+19 |
| * | | | | | | tests - txManager - add getNetwork fn to fixture txManager | kumavis | 2017-01-15 | 1 | -0/+1 |
| * | | | | | | 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 | 2 | -2/+3 |
| * | | | | | | 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 | 11 | -65/+96 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'dev' into bug-submitTx | kumavis | 2017-01-14 | 11 | -65/+96 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #997 from MetaMask/integrateTxManagerUI | kumavis | 2017-01-14 | 11 | -66/+99 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | remove orphaned comment | Frankie | 2017-01-14 | 1 | -1/+0 |
| * | | | | | | | | lint | Frankie | 2017-01-14 | 1 | -1/+1 |
| * | | | | | | | | Clean up code | Frankie | 2017-01-14 | 4 | -34/+39 |
| * | | | | | | | | Fix sorting and instances where something could be undefined | Frankie | 2017-01-12 | 3 | -4/+5 |
| * | | | | | | | | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 2 | -6/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix wording and icon of failed txs | Frankie | 2017-01-12 | 3 | -15/+22 |
| * | | | | | | | | | Add to CHANGELOG | Frankie | 2017-01-12 | 2 | -2/+9 |
| * | | | | | | | | | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 8 | -78/+102 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Take some of the tx Logic out of the UI and create a visble state for pending... | Frankie | 2017-01-12 | 10 | -54/+68 |
| | | | * | | | | | | | 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 | 7 | -131/+215 |
| |_|_|/ / / / / / |/| | | | | | | | | |||||
| | | | | * | | | | lint - warn on unhandled err | kumavis | 2017-01-12 | 1 | -2/+2 |
| | | | | * | | | | 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 | 7 | -136/+204 |
| | | | | | | * | background - move pojo migrator to outside of metamask controller | kumavis | 2017-01-12 | 15 | -244/+231 |
| | | | | | | * | test - fix tests from obs-store | kumavis | 2017-01-12 | 3 | -8/+13 |
| | | | | | | * | background - introduce ObservableStore | kumavis | 2017-01-12 | 11 | -187/+224 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #998 from MetaMask/i960-port-stream-err | kumavis | 2017-01-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | bugfix - portstream - dont wrap cb in try catch | kumavis | 2017-01-12 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #996 from MetaMask/i981-UpdateOnAccountChange | kumavis | 2017-01-12 | 2 | -6/+5 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Send update to UI when changing selected account | Dan Finlay | 2017-01-12 | 2 | -6/+5 |
|/ / / / / | |||||
* | | | | | Merge pull request #990 from MetaMask/sync-accounts | Dan Finlay | 2017-01-12 | 1 | -17/+1 |
|\ \ \ \ \ | |||||
| * | | | | | rpc - fix sync account cache setting | kumavis | 2017-01-11 | 1 | -17/+1 |
* | | | | | | Merge pull request #988 from MetaMask/eth_syncing | kumavis | 2017-01-11 | 2 | -0/+7 |
|\| | | | | | |||||
| * | | | | | changelog - add note on rpc overrides | kumavis | 2017-01-11 | 1 | -0/+2 |
| * | | | | | web3 provider - override eth_syncing and web3_clientVersion | kumavis | 2017-01-11 | 1 | -0/+5 |
|/ / / / / | |||||
* | | | | | Merge pull request #987 from MetaMask/kumavis-patch-1 | kumavis | 2017-01-11 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | deps - bump provider engine | kumavis | 2017-01-11 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #985 from MetaMask/gulp1 | kumavis | 2017-01-11 | 3 | -39/+83 |
|\ \ \ \ \ |