Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into AddTokenList | Dan Finlay | 2017-06-13 | 42 | -379/+552 |
|\ | |||||
| * | Version 3.7.8v3.7.8 | Dan Finlay | 2017-06-13 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1208 from MetaMask/i#1203MainNetSwitch | kumavis | 2017-06-13 | 1 | -2/+5 |
| |\ | | | | | | | Change default to mainnet | ||||
| | * | default testnet - fix typo | kumavis | 2017-06-13 | 1 | -1/+0 |
| | | | |||||
| | * | Merge branch 'master' into i#1203MainNetSwitch | kumavis | 2017-06-13 | 54 | -1182/+929 |
| | |\ | |||||
| | * \ | Merge branch 'master' into i#1203MainNetSwitch | Frankie | 2017-03-17 | 3 | -1/+97 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into i#1203MainNetSwitch | kumavis | 2017-03-15 | 3 | -3/+3 |
| | |\ \ \ | |||||
| | * | | | | Swithch the default network to mainnet | frankiebee | 2017-03-14 | 1 | -3/+6 |
| | | | | | | |||||
| * | | | | | Linting | Thomas Huang | 2017-06-13 | 2 | -3/+3 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'master' into currency-fix | Dan Finlay | 2017-06-13 | 3 | -10/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into gasupdater | Dan Finlay | 2017-06-13 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | 3.7.7 | kumavis | 2017-06-09 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Update gasblocklimit params with every block. | Kevin Serrano | 2017-06-03 | 2 | -9/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into currency-fix | Kevin Serrano | 2017-06-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Version 3.7.6v3.7.6 | Dan Finlay | 2017-06-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Version 3.7.5 | Dan Finlay | 2017-06-06 | 1 | -1/+1 |
| | |/ / / / | |||||
| * / / / / | Use new URL for currency API from cryptonator. | Kevin Serrano | 2017-06-06 | 2 | -2/+2 |
| |/ / / / | |||||
| * | | | | Version 3.7.4v3.7.4 | Dan Finlay | 2017-06-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1533 from MetaMask/i1528-gasLimitLow | kumavis | 2017-06-03 | 1 | -2/+8 |
| |\ \ \ \ | | | | | | | | | | | | | Convert gasLimit to not use muln in BN | ||||
| | * | | | | Convert gasLimit to not use muln in BN | Kevin Serrano | 2017-06-02 | 1 | -2/+8 |
| | | | | | | |||||
| * | | | | | Version 3.7.3v3.7.3 | Dan Finlay | 2017-06-02 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Version 3.7.2v3.7.2 | Dan Finlay | 2017-06-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider | Thomas Huang | 2017-05-26 | 1 | -17/+5 |
| |\ \ \ \ | | | | | | | | | | | | | Remove streaming subprovider | ||||
| | * | | | | Remove stream subprovider | Dan Finlay | 2017-05-26 | 1 | -17/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Since the polling leak seems to be coming from elsewhere, and new bugs came from this, I'm rolling back this change so that we can push the other improvements sooner and fix the bug at its true root. | ||||
| * | | | | | fix spelling | frankiebee | 2017-05-25 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into reloadDapp | frankiebee | 2017-05-25 | 2 | -2/+14 |
| |\| | | | | |||||
| | * | | | | Merge pull request #1494 from MetaMask/1472-gasceiling | Dan Finlay | 2017-05-25 | 1 | -1/+12 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Add Max GasLimit Ceiling | ||||
| | | * | | | | Add new blockGasLimit property to txMeta object. | Kevin Serrano | 2017-05-25 | 1 | -1/+12 |
| | | | | | | | |||||
| | * | | | | | inpage-provider - disable polling after first block | kumavis | 2017-05-25 | 1 | -1/+2 |
| | |/ / / / | |||||
| * / / / / | Reload the page when switching networks for sites that use web3 | frankiebee | 2017-05-25 | 3 | -41/+28 |
| |/ / / / | |||||
| * | | | | Merge pull request #1487 from MetaMask/stopPolling | kumavis | 2017-05-25 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Stop polling | ||||
| | * | | | | stop polling when switching networks | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into Version-3.7.1 | kumavis | 2017-05-24 | 9 | -125/+297 |
| |\| | | | | |||||
| | * | | | | Merge branch 'master' into networkController | Frankie | 2017-05-24 | 3 | -10/+73 |
| | |\ \ \ \ | |||||
| | | * | | | | Version 3.7.0v3.7.0 | Dan Finlay | 2017-05-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Cleanup | Dan Finlay | 2017-05-24 | 1 | -2/+3 |
| | | | | | | | |||||
| | | * | | | | Continually resubmit pending txs | Dan Finlay | 2017-05-24 | 1 | -2/+52 |
| | | | | | | | |||||
| | | * | | | | clean - remove console logs | kumavis | 2017-05-23 | 1 | -2/+0 |
| | | | | | | | |||||
| | | * | | | | deps - use stream-subprovider from provider-engine | kumavis | 2017-05-23 | 2 | -3/+3 |
| | | | | | | | |||||
| | | * | | | | Rename stream to streamSubprovider | Dan Finlay | 2017-05-23 | 1 | -4/+4 |
| | | | | | | | |||||
| | | * | | | | Use filter subprovider in-page to avoid filter leaks | Dan Finlay | 2017-05-23 | 1 | -2/+6 |
| | | | | | | | |||||
| | | * | | | | Use stream-provider v3 api | Dan Finlay | 2017-05-23 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Add new streaming subprovider but getting a loop | Dan Finlay | 2017-05-21 | 1 | -5/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regarding #1458 Uses a new streaming subprovider architecture on an experimental branch of StreamProvider: https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider | ||||
| | * | | | | | include ethQuery in txController | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Fix for tests | frankiebee | 2017-05-24 | 5 | -55/+68 |
| | | | | | | | |||||
| | * | | | | | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 5 | -126/+64 |
| | | | | | | | |||||
| | * | | | | | Add a migration for the network controller | frankiebee | 2017-05-23 | 2 | -0/+35 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 11 | -70/+123 |
| | |\| | | | | |||||
| | * | | | | | Create a network controller to manage switcing networks an updating the provider | frankiebee | 2017-05-19 | 6 | -150/+232 |
| | | | | | | | |||||
| * | | | | | | Version 3.7.1v3.7.1 | Dan Finlay | 2017-05-24 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Version 3.6.5v3.6.5 | Dan Finlay | 2017-05-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix path references | Dan Finlay | 2017-05-17 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 3 | -18/+18 |
| | | | | | | |||||
| * | | | | | migration 13 - change provider from testnet to ropsten | kumavis | 2017-05-16 | 2 | -0/+35 |
| | | | | | | |||||
| * | | | | | Remove all traces of testnet | Thomas Huang | 2017-05-16 | 3 | -18/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into i1419-rinkebydefaultnetwork | Thomas Huang | 2017-05-16 | 1 | -22/+16 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #1422 from MetaMask/drop-asyncq | Dan Finlay | 2017-05-16 | 1 | -22/+16 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | background - drop async-q in favor of async/await | ||||
| | | * | | | | | background - drop async-q in favor of async/await | kumavis | 2017-05-13 | 1 | -22/+16 |
| | | | | | | | | |||||
| * | | | | | | | Change default network to rinkeby | Thomas Huang | 2017-05-16 | 2 | -8/+8 |
| |/ / / / / / | |||||
| * | | | | | | migrator - fix typo | kumavis | 2017-05-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fixMigrator2 | kumavis | 2017-05-13 | 2 | -2/+1 |
| |\| | | | | | |||||
| | * | | | | | Trim currency list. | Kevin Serrano | 2017-05-12 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Version 3.6.4v3.6.4 | Dan Finlay | 2017-05-10 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | migrator - cleaner migration runner with es7 | kumavis | 2017-05-12 | 1 | -25/+13 |
| | | | | | | |||||
| * | | | | | use asyncQ.waterfall instead of asyncQ.eachSeries | frankiebee | 2017-05-12 | 1 | -4/+10 |
| | | | | | | |||||
| * | | | | | fix migrator | frankiebee | 2017-05-11 | 1 | -9/+8 |
| |/ / / / | |||||
| * | | | | Version 3.6.3v3.6.3 | Dan Finlay | 2017-05-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Version 3.6.2v3.6.2 | Dan Finlay | 2017-05-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | ui - remove web3, use eth-query | kumavis | 2017-05-09 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | metamask - publicConfig - fix init state | kumavis | 2017-05-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | metamask - selected accounts - dont reveal when locked | kumavis | 2017-05-05 | 1 | -15/+17 |
| | | | | | |||||
| * | | | | Minor lint | Kevin Serrano | 2017-05-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Version 3.6.1 | Dan Finlay | 2017-05-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use loglevel for more logs | Dan Finlay | 2017-05-01 | 1 | -9/+3 |
| | | | | | |||||
| * | | | | notification-manager - remove promise listener | kumavis | 2017-04-29 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seems chrome changed their API? MDN suggests that a Promise should be returned but getting `undefined` https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/windows/create Chrome docs suggest its a callback API lolwut https://developer.chrome.com/extensions/windows#method-create | ||||
| * | | | | Version 3.6.0 | Dan Finlay | 2017-04-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | t # Explicit paths specified without -i or -o; assuming --only paths... | ||||
| * | | | | Merge branch 'master' into Version-3.5.4 | Dan Finlay | 2017-04-28 | 34 | -119/+123 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into rinkeby | Dan Finlay | 2017-04-28 | 32 | -118/+111 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix linting warnings | Thomas Huang | 2017-04-27 | 32 | -119/+112 |
| | | | | | | | |||||
| | * | | | | | Add missing changes. Create unique style for rinkeby icon. | Kevin Serrano | 2017-04-26 | 2 | -2/+6 |
| | | | | | | | |||||
| | * | | | | | add rinkeby network | Nickyg | 2017-04-26 | 2 | -0/+7 |
| | |/ / / / | |||||
| * / / / / | Version 3.5.4v3.5.4 | Dan Finlay | 2017-04-26 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Version 3.5.3v3.5.3 | Dan Finlay | 2017-04-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add missing tx manager state | Dan Finlay | 2017-04-25 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | auto-faucet - only skip faucet on explicit test environment | kumavis | 2017-04-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 5 | -20/+72 |
| | | | | |||||
* | | | | Merge pull request #1307 from MetaMask/mascara | kumavis | 2017-04-05 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | Proof of Concept: Mascara | ||||
| * | | | | clean - metamask controller - remove log | kumavis | 2017-04-05 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 10 | -193/+160 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 6 | -10/+30 |
| |\ \ \ \ \ | |||||
| * | | | | | | Clean up | frankiebee | 2017-03-31 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | WIP: lost enital call from dapp to getAccounts | frankiebee | 2017-03-30 | 2 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into mascara | frankiebee | 2017-03-29 | 8 | -60/+127 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into mascara | frankiebee | 2017-03-24 | 13 | -569/+127 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | WIP: indexdb is at an err state "provider is undefined" | frankiebee | 2017-03-24 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | WIP: streams->indexdb | frankiebee | 2017-03-24 | 2 | -1/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1308 from MetaMask/FixFaucet | Kevin Serrano | 2017-04-05 | 2 | -0/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix faucet to only autoFaucet first account | ||||
| * | | | | | | | | Fix faucet to only autoFaucet first account | frankiebee | 2017-04-05 | 2 | -0/+3 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* / | | | | | | | Switch auto-faucet from XMLHttpRequest to fetch | frankiebee | 2017-04-04 | 1 | -5/+11 |
|/ / / / / / / | |||||
* | | | | | | | notification-manager - rename show -> showPoup + make getPopup private | kumavis | 2017-04-01 | 2 | -11/+11 |
| | | | | | | | |||||
* | | | | | | | ui - use global.platform for extension interaction | kumavis | 2017-04-01 | 2 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform | kumavis | 2017-04-01 | 1 | -4/+16 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | tx-manager - add eip155 support | kumavis | 2017-03-31 | 1 | -4/+16 |
| | | | | | | | |||||
* | | | | | | | ui - move popup auto-close after tx conf to ui entrypoint | kumavis | 2017-04-01 | 1 | -1/+5 |
| | | | | | | | |||||
* | | | | | | | ui - startPopup returns store after boot | kumavis | 2017-04-01 | 2 | -29/+32 |
| | | | | | | | |||||
* | | | | | | | extension - remove local extension files, we use extensionizer | kumavis | 2017-03-31 | 2 | -85/+0 |
| | | | | | | | |||||
* | | | | | | | introduce platform api and rename notifications to notification-manager | kumavis | 2017-03-31 | 6 | -79/+116 |
| | | | | | | | |||||
* | | | | | | | extension - prefer extensionizer module | kumavis | 2017-03-31 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1288 from MetaMask/i1285-FixFirefoxCurrencyChecks | Kevin Serrano | 2017-03-30 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix currency checking for firefox | ||||
| * | | | | | | Fix currency checking for firefox | Dan Finlay | 2017-03-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding cryptonator to our permitted CORS hosts. Fixes #1285. Will probably trigger additional permissions requests to our users. | ||||
* | | | | | | | Merge pull request #1293 from MetaMask/ImproveGasEstimates | Kevin Serrano | 2017-03-30 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | tx-utils - gas buffer ceiling at 90% of block gas limit | ||||
| * | | | | | | tx-utils - gas buffer ceiling at 90% of block gas limit | kumavis | 2017-03-30 | 1 | -3/+4 |
| | | | | | | | |||||
* | | | | | | | Linted | Dan Finlay | 2017-03-30 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Fix popup behavior for Firefox | Dan Finlay | 2017-03-30 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firefox does not support the `focused` parameter when opening a new window, and we don't actually require it for Chrome either, new popups are at the foreground by default already. | ||||
* | | | | | | | Add missing migration. | Kevin Serrano | 2017-03-29 | 1 | -0/+1 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Version 2.5.2v3.5.2v2.5.2 | Dan Finlay | 2017-03-29 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #1268 from MetaMask/kovan-faucet-instructions | Dan Finlay | 2017-03-29 | 1 | -0/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add Kovan faucet instructions | ||||
| * \ \ \ \ \ | Merge branch 'master' into kovan-faucet-instructions | Dan Finlay | 2017-03-29 | 5 | -46/+60 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into kovan-faucet-instructions | Kevin Serrano | 2017-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add link to kovan faucet instructions. | Kevin Serrano | 2017-03-28 | 1 | -0/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1273 from MetaMask/i1267-seedfix | Dan Finlay | 2017-03-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Assure that seed words are placed into state tree upon request. | ||||
| * | | | | | | | | Assure that seed words are placed into state tree upon request. | Kevin Serrano | 2017-03-28 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1276 from MetaMask/ImproveGasEstimates | kumavis | 2017-03-29 | 3 | -43/+44 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | Improve UI gas calculation logic | ||||
| * | | | | | | | | tx manager - emit update on new unapproved tx | kumavis | 2017-03-29 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | tx manager - add eth-query | kumavis | 2017-03-29 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | tx manager - adjust new tx flow and txMeta decorations | kumavis | 2017-03-29 | 2 | -41/+32 |
| | | | | | | | | | |||||
| * | | | | | | | | Improve UI gas calculation logic | Dan Finlay | 2017-03-29 | 1 | -0/+7 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value. | ||||
* / / / / / / / | Fix injection logic. | Kevin Serrano | 2017-03-29 | 1 | -3/+16 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'master' into master | Dan Finlay | 2017-03-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Version 3.5.1v3.5.1 | Dan Finlay | 2017-03-28 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Version 3.5.0v3.5.0 | Dan Finlay | 2017-03-28 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Allow injection in IFrames + dynamic IFrames | Stefaan Ponnet | 2017-03-26 | 2 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' into i1210-txdisappearance | Kevin Serrano | 2017-03-25 | 3 | -3/+40 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into notice-modification | Dan Finlay | 2017-03-25 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove gas limit param | Dan Finlay | 2017-03-24 | 1 | -3/+3 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | Fixes #1256 by removing redundant param. | ||||
| * | | | | | Create migration to erase body in read notices. | Kevin Serrano | 2017-03-23 | 1 | -0/+36 |
| | | | | | | |||||
| * | | | | | Remove notice body after reading. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| |/ / / / | |||||
* / / / / | Fix persistence of transactions between networks. | Kevin Serrano | 2017-03-23 | 1 | -10/+22 |
|/ / / / | |||||
* | | | | Merge branch 'master' into i238-kovan | Dan Finlay | 2017-03-23 | 1 | -9/+5 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 1 | -5/+10 |
| |\ \ \ \ \ | |||||
| * | | | | | | Modify logic for injection conditions. | Kevin Serrano | 2017-03-23 | 1 | -9/+5 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into i238-kovan | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Add current block number and hash to the state. | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Add kovan config settings to config manager. | Kevin Serrano | 2017-03-23 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Add kovan to config file. | Kevin Serrano | 2017-03-23 | 1 | -0/+2 |
|/ / / / / | |||||
* / / / / | Have better error messages | frankiebee | 2017-03-23 | 1 | -5/+10 |
|/ / / / | |||||
* | | / | Remove eth-lightwallet | Dan Finlay | 2017-03-17 | 4 | -550/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into i1165-predictive | Kevin Serrano | 2017-03-15 | 3 | -3/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Rename variables to proper currency state variables. | Kevin Serrano | 2017-03-15 | 1 | -1/+1 |
| | | | |||||
| * | | Fix description of some migrations. | Kevin Serrano | 2017-03-15 | 2 | -2/+2 |
| |/ | |||||
* | | Limit the number of addresses stored in our book. | Kevin Serrano | 2017-03-14 | 1 | -0/+4 |
| | | |||||
* | | Connect keyring controller to address book to prevent additional duplicates. | Kevin Serrano | 2017-03-11 | 2 | -9/+23 |
| | | |||||
* | | Improve duplicate checking in address book. | Kevin Serrano | 2017-03-11 | 1 | -2/+2 |
| | | |||||
* | | Add comments. | Kevin Serrano | 2017-03-11 | 1 | -4/+19 |
| | | |||||
* | | Allow for adding recently used addresses to address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+4 |
| | | |||||
* | | Rename functions for consistency. | Kevin Serrano | 2017-03-10 | 1 | -6/+6 |
| | | |||||
* | | Create persistence address book. | Kevin Serrano | 2017-03-10 | 2 | -0/+57 |
| | | |||||
* | | Create distinct labels and names for addresses. | Kevin Serrano | 2017-03-10 | 1 | -1/+3 |
|/ | |||||
* | Version 3.4.0v3.4.0 | Dan Finlay | 2017-03-09 | 1 | -1/+1 |
| | |||||
* | Modify message. | Kevin Serrano | 2017-03-09 | 1 | -1/+1 |
| | |||||
* | Add more informative message | Kevin Serrano | 2017-03-09 | 1 | -1/+3 |
| | |||||
* | Merge branch 'master' into i1065-removealert | Kevin Serrano | 2017-03-09 | 1 | -20/+22 |
|\ | |||||
| * | Merge branch 'master' into kumavis-patch-1 | Dan Finlay | 2017-03-09 | 5 | -39/+81 |
| |\ | |||||
| * | | tx-utils - add encoding utils | kumavis | 2017-03-08 | 1 | -1/+1 |
| | | | |||||
| * | | tx-utils - stricter naming type-based convention | kumavis | 2017-03-08 | 1 | -9/+15 |
| | | | |||||
| * | | tx-utils - clean and comment | kumavis | 2017-03-08 | 1 | -15/+11 |
| | | | |||||
* | | | Convert alert to a log.error | Kevin Serrano | 2017-03-09 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-09 | 2 | -6/+30 |
|\| | |||||
| * | Merge branch 'master' into i1118-IncreaseGasBuffer | Dan Finlay | 2017-03-08 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix grammar in erro message | frankiebee | 2017-03-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into i1118-IncreaseGasBuffer | jaredpereira | 2017-03-08 | 1 | -1/+22 |
| |\| | |||||
| | * | Merge branch 'master' into i#1032 | frankiebee | 2017-03-08 | 3 | -13/+19 |
| | |\ | |||||
| | * | | fix issue where account import allows for duplicates | frankiebee | 2017-03-08 | 1 | -1/+22 |
| | | | | |||||
| * | | | change BN.mul to BN.muln | Jared Pereira | 2017-03-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove constant buffer and add multiplier | Jared Pereira | 2017-03-08 | 1 | -5/+8 |
| | |/ | |/| | |||||
* | | | Nodeify and promisify calls to background. | Kevin Serrano | 2017-03-09 | 1 | -2/+4 |
| | | | |||||
* | | | Refactor of code into separate reducers and actions. | Kevin Serrano | 2017-03-08 | 2 | -5/+14 |
| | | | |||||
* | | | 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 |
| |/ | | | | | | | | | | | | | | | | | | | | | Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173 | ||||
* | | 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 |
| | | | | | | | | | | | | | | | | | | This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter. | ||||
| * | | 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 |
| | | | | | | | | | | | | Also fixed bug where signing would not close popup. | ||||
| | * | 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 |
| | | | | | | | | | | | | These external modules now have their own test coverage and build enforcement. This allowed me to somewhat more easily add good tests around our personalSign strategy (held now in [eth-sig-util](https://github.com/flyswatter/eth-sig-util), and allow each of the keyrings to import that, etc. | ||||
| * | | 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 |
| | | | | Rendering the list is still having issues, so this isn't done yet. | ||||
* | 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 |
| |