aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-043-28/+19
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch 'master' into mmnChi Kei Chan2017-09-287-175/+444
| | | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-191-3/+9
| | | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch 'master' into nmChi Kei Chan2017-09-1911-175/+250
| | | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-142-4/+15
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into NewUI-flatkumavis2017-08-093-33/+209
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-075-93/+28
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Adjust sidebar transition using @cjeria\'s feedbacksdtsui2017-08-031-0/+10
| | | | | * | | | | | | | | | | | Ensure app-header is rendered in responsive layoutsdtsui2017-08-031-1/+1
* | | | | | | | | | | | | | | | | test - tx controller - fix txGasUtil referencekumavis2018-01-181-1/+2
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Create new flag for simple sends to avoid overloading other flagDan Finlay2018-01-171-2/+2
* | | | | | | | | | | | | | | | Set gas limit to 21k for recipients with no codeDan Finlay2018-01-161-5/+22
* | | | | | | | | | | | | | | | Account for 0x/empty string address and contract creationThomas2018-01-081-0/+11
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-031-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tx-gas-utils - tx-param-validation - use more intuitive checkkumavis2018-01-031-2/+2
| * | | | | | | | | | | | | | | transactions - throw error if dapp provides txParams whos value has a decimalfrankiebee2017-12-211-2/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-291-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | transactions:pending - only check nonces of transactions who's from adress ma...frankiebee2017-12-281-1/+2
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* / | | | | | | | | | | | | | Fix some silly linting issues.Kevin Serrano2017-12-281-1/+1
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / Stop failing pending transactions after any period of timeDan Finlay2017-12-221-7/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | transactions:gas-utils - handle new type of estimateGas errorfrankiebee2017-12-151-1/+5
* | | | | | | | | | | | | dont aggresively query account datafrankiebee2017-12-141-2/+0
* | | | | | | | | | | | | tx-controller - failed state is a finished statekumavis2017-12-081-1/+1
* | | | | | | | | | | | | Add retry background method and actionDan Finlay2017-12-071-0/+4
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in...Dan2017-12-071-1/+1
* | | | | | | | | | | | Fix undefined latestBlockNumber in _resubmitTxDan2017-12-071-1/+1
* | | | | | | | | | | | Exponentional backoff on transaction retry in pending-tx-trackerDan2017-12-061-2/+14
* | | | | | | | | | | | deps - obs-store@3 + migrate stream plumbingkumavis2017-11-291-1/+3
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Fix lint warningsDaijiro Wachi2017-10-2211-26/+25
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | LintedDan Finlay2017-10-201-1/+1
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-193-27/+12
|\| | | | | | | | |
| * | | | | | | | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-193-27/+12
* | | | | | | | | | Make account tracking much more reactiveDan Finlay2017-10-191-3/+8
* | | | | | | | | | Make account tracking more reactiveDan Finlay2017-10-191-0/+18
|/ / / / / / / / /
* | | | | | | | | nonce-tracker - use blockTracker directlykumavis2017-10-121-7/+3
* | | | | | | | | util - add obj-proxykumavis2017-10-111-0/+19
* | | | | | | | | events-proxy - clean upkumavis2017-10-111-5/+5
* | | | | | | | | Merge pull request #2223 from ukstv/masterDan Finlay2017-10-101-0/+123
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Validate data format for eth_signTypedDataSergey Ukustov2017-10-071-0/+4
| * | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-072-1/+28
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into SignTypedDataDan Finlay2017-10-061-3/+5
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add signTypedData input validationsDan Finlay2017-10-061-0/+11
| * | | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-061-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-033-23/+12
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-301-0/+108
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2305 from MetaMask/nodeifyFrankie2017-10-071-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | lint fix - nodeifykumavis2017-10-071-1/+1
| * | | | | | | | | | | nodeify - allow callback to be optionalkumavis2017-10-071-2/+10
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInitkumavis2017-10-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check status of pending transactions on startupDan Finlay2017-10-071-0/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | When checking pending txs, check for successful txs with same nonce.Dan Finlay2017-10-071-0/+20
* | | | | | | | | | | Provide method for tx tracker to refer to all txsDan Finlay2017-10-071-1/+7
|/ / / / / / / / / /
* | | | | | | | | | "fix" hours for messagefrankiebee2017-10-061-1/+2
* | | | | | | | | | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-061-3/+4
|/ / / / / / / / /
* | | | | | | | | pending tx tracker - on tx:warn append error message instead of error objkumavis2017-10-031-1/+1
* | | | | | | | | pending tx tracker - tx:warning event includes err objkumavis2017-10-031-2/+2
* | | | | | | | | pending tx tracker - resubmit - warn dont error on unknown errorkumavis2017-10-031-2/+5
* | | | | | | | | pending tx tracker - dont throw on load failurekumavis2017-10-031-1/+0
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h...kumavis2017-10-031-1/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into history-notesfrankiebee2017-10-031-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTxkumavis2017-10-032-2/+3
* | | | | | | | | | tx state history - append note to first op of diffkumavis2017-10-031-2/+5
|/ / / / / / / / /
* / / / / / / / / transaction - provide notes for historyfrankiebee2017-10-031-5/+5
|/ / / / / / / /
* / / / / / / / pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-301-15/+0
|/ / / / / / /
* | | | | | | account-tracker - remove unused importkumavis2017-09-281-1/+0
* | | | | | | Merge branch 'master' into direct-block-trackerkumavis2017-09-284-37/+261
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3kumavis2017-09-283-36/+257
| |\ \ \ \ \ \ \
| | * | | | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin...frankiebee2017-09-271-2/+1
| | * | | | | | | transactions: make evnt names pretty and eaiser to readfrankiebee2017-09-271-8/+8
| | * | | | | | | transactions: lint fixes and reveal status-update event for balance controllerfrankiebee2017-09-271-6/+6
| | * | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-2711-185/+163
| | |\ \ \ \ \ \ \
| | * | | | | | | | ensure that values written to txParams are hex stringsfrankiebee2017-09-141-0/+9
| | * | | | | | | | linting && format fixingfrankiebee2017-09-131-5/+4
| | * | | | | | | | match other controller patternsfrankiebee2017-09-131-8/+13
| | * | | | | | | | fix miss typefrankiebee2017-09-091-1/+1
| | * | | | | | | | more tests and craete a getPendingTransactions functionfrankiebee2017-09-091-0/+6
| | * | | | | | | | remove unused variablefrankiebee2017-09-071-1/+0
| | * | | | | | | | fix merge and errors disaperaing on updatefrankiebee2017-09-071-2/+5
| | * | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-074-52/+136
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | add better commentsfrankiebee2017-09-061-1/+0
| | * | | | | | | | | rename tx-utils.js -> tx-gas-utils.jsfrankiebee2017-09-061-4/+0
| | * | | | | | | | | remove #buildEthTxFromParamsfrankiebee2017-09-061-17/+0
| | * | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-08-223-12/+56
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Create TxStateManagerfrankiebee2017-08-221-1/+18
| | * | | | | | | | | | Create tests for TxStateManagerfrankiebee2017-08-191-0/+201
| * | | | | | | | | | | Fix bug where block gas limit was incorrectly parsed.Dan Finlay2017-09-281-1/+3
* | | | | | | | | | | | style - small whitespace nitpickkumavis2017-09-281-1/+1
* | | | | | | | | | | | account-tracker - use new block-tracker block formatkumavis2017-09-281-4/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-282-55/+72
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Move obs store into account-tracker instead of inheritingDan Finlay2017-09-271-13/+18
| * | | | | | | | | | Restore blockGasLimit to account-trackerDan Finlay2017-09-271-0/+3
| * | | | | | | | | | Implemented feedbackDan Finlay2017-09-261-5/+3
| * | | | | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-238-124/+82
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Refactor eth-store into account-trackerDan Finlay2017-09-231-1/+1
| * | | | | | | | | | Remove dead code from eth-storeDan Finlay2017-09-231-43/+1
| * | | | | | | | | | Add computed balance to account detail viewDan Finlay2017-09-141-0/+2
| * | | | | | | | | | Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceControllerDan Finlay2017-09-121-0/+51
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | LintedDan Finlay2017-09-081-2/+1
| | * | | | | | | | | | Make tx calculations account for gas pricesDan Finlay2017-09-081-2/+8
| | * | | | | | | | | | Remove logsDan Finlay2017-09-081-8/+0
| | * | | | | | | | | | Fix balance calc testDan Finlay2017-09-081-0/+2
| | * | | | | | | | | | Add constructor commentDan Finlay2017-09-081-0/+5
| | * | | | | | | | | | Fix valueFor testDan Finlay2017-09-081-7/+8
| | * | | | | | | | | | Add basic test for valueForDan Finlay2017-09-081-4/+9
| | * | | | | | | | | | test not passingDan Finlay2017-09-081-1/+17
| | * | | | | | | | | | Check balances in parallelDan Finlay2017-09-071-1/+8
| | * | | | | | | | | | Add first passing balance calc testDan Finlay2017-09-071-0/+18
| | | |_|_|/ / / / / / | | |/| | | | | | | |
* | | | | | | | | | | wrap block tracker in events proxyfrankiebee2017-09-271-0/+31
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Do not mark a retry tx failed that has been broadcast successfullyDan Finlay2017-09-191-3/+9
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | createOriginMiddleware - fix var namekumavis2017-09-141-1/+1
* | | | | | | | | metamask controller - move middleware into seperate fileskumavis2017-09-143-0/+37
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-121-8/+12
|\| | | | | | | |
| * | | | | | | | inpage provider - define sendAsync on the prototypekumavis2017-09-091-25/+27
| |/ / / / / / /
* | | | | | | | inpage - use obj-multiplex modulekumavis2017-09-081-6/+6
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-082-24/+44
|\| | | | | | |
| * | | | | | | inpage - bug fixkumavis2017-09-061-2/+3
| * | | | | | | Make web3 deprecation notice more usefulDan Finlay2017-09-061-1/+1
| * | | | | | | Merge branch 'master' into inpage-provider-fixeskumavis2017-08-292-32/+50
| |\ \ \ \ \ \ \
| * | | | | | | | inpage - lint fixkumavis2017-08-291-1/+1
| * | | | | | | | inpage provider - autoreload - improve readabilitykumavis2017-08-241-15/+32
| * | | | | | | | inpage provider - only warn web3 usage once per sessionkumavis2017-08-241-6/+11
| * | | | | | | | inpage provider - sync rpc - default to null valueskumavis2017-08-241-3/+3
* | | | | | | | | lint - remove dead codekumavis2017-09-081-1/+0
* | | | | | | | | inpage - distinguish pump vs pipekumavis2017-09-081-4/+4
* | | | | | | | | streams - use pump and published obj-multiplexkumavis2017-09-083-73/+14
* | | | | | | | | inpage - add idRemapMiddlewarekumavis2017-09-081-1/+3
* | | | | | | | | inpage - use json-rpc-engine for inpage-providerkumavis2017-08-251-36/+10
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1973 from MetaMask/hotfix-migration019kumavis2017-08-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fall back to `latest` if blockNumber is nullfrankiebee2017-08-241-1/+1
* | | | | | | | | Fail transactions after a day of retriesDan Finlay2017-08-241-1/+7
|/ / / / / / / /
* | | | | | | | Enforce nonces as type stringDan Finlay2017-08-241-2/+10
* | | | | | | | Use toNumber methodDan Finlay2017-08-241-2/+1
* | | | | | | | Fix network nonce parsingDan Finlay2017-08-241-4/+11
* | | | | | | | Pass nonce testsDan Finlay2017-08-241-8/+7
* | | | | | | | Got all tests but one passingDan Finlay2017-08-241-0/+1
* | | | | | | | Fix new test, break an older maybe wrong oneDan Finlay2017-08-241-26/+24
* | | | | | | | LintedDan Finlay2017-08-241-1/+0
* | | | | | | | Simplify nonce calculationDan Finlay2017-08-241-4/+5
|/ / / / / / /
* | | | | | | Merge branch 'master' into useLocalNonceDan Finlay2017-08-241-0/+37
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | tx controller - tx state history various small fixeskumavis2017-08-151-1/+1
| * | | | | | introduce tx-state-history-helper and diff-based historykumavis2017-08-151-0/+37
| | |_|_|_|/ | |/| | | |
* | | | | | nonce-tracker - more debugging numbers for nonceDetailskumavis2017-08-231-10/+8
* | | | | | remove unused codekumavis2017-08-231-15/+0
* | | | | | nonce-tracker - use ethjs-querykumavis2017-08-231-11/+2
* | | | | | nonce-tracker - fix var namekumavis2017-08-231-4/+4
* | | | | | nonce-tracker - getlocalNextNonce - add entry to nonceDetailskumavis2017-08-231-1/+1
* | | | | | nonce-tracker - simplify _getlocalNextNoncekumavis2017-08-231-20/+29
* | | | | | nonce-tracker - simplify getHighestNoncekumavis2017-08-231-5/+3
* | | | | | nonce-tracker - getHighestNonce doesnt need uniqued inputkumavis2017-08-231-4/+4
* | | | | | nonce-tracker - make nonce strategy api and naming more symmeticalkumavis2017-08-231-19/+21
* | | | | | nonce-tracker - pass testsfrankiebee2017-08-221-5/+4
* | | | | | clean up codefrankiebee2017-08-221-39/+43
* | | | | | nonce-tracker - pass testsfrankiebee2017-08-221-11/+38
* | | | | | break out network nonce calc.frankiebee2017-08-191-17/+21
* | | | | | fix 0x0 nonce calc.frankiebee2017-08-191-8/+18
* | | | | | include pendingTxs in localNoncefrankiebee2017-08-191-10/+9
* | | | | | use "localNonce" when the network returns a nonce that is lower then a known ...frankiebee2017-08-191-3/+20
|/ / / / /
* | | | | fix wordingfrankiebee2017-08-121-1/+1
* | | | | add deprecation warning for web3frankiebee2017-08-121-1/+4
|/ / / /
* | | / tx utils - detect estimateGas err and set simulationFailedkumavis2017-08-091-3/+11
| |_|/ |/| |
* | | util - sufficientBalance - validate inputkumavis2017-08-091-1/+6
* | | fix getPendingTransactions function for pendingTxTrackerfrankiebee2017-08-091-1/+1
* | | fix class namesfrankiebee2017-08-092-2/+3
* | | remove logging of the message and log the errorfrankiebee2017-08-081-1/+1
* | | fix spellingfrankiebee2017-08-081-6/+3
* | | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-054-45/+15
|\ \ \ | | |/ | |/|
| * | Merge pull request #1857 from MetaMask/hotFixCancleTxkumavis2017-08-041-1/+2
| |\ \
| | * | fix cancelTransaction not reciving a callbackfrankiebee2017-08-041-1/+2
| * | | blacklist - use module eth-phishing-detectkumavis2017-08-041-23/+0
| |/ /
| * | Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-031-48/+13
| |\ \
| * | | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-031-22/+7
| * | | phishing detection - move phishing detection into contentscript and metamask ...kumavis2017-08-032-3/+6
| * | | obj-multiplex - missing name error + prefer const over varkumavis2017-08-031-6/+10
| | |/ | |/|
* | | break out tx status pendding watchersfrankiebee2017-08-051-0/+165
* | | move util functions to util.jsfrankiebee2017-08-052-32/+40
| |/ |/|
* | use async with #publishTransactionfrankiebee2017-08-031-2/+2
* | move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-031-8/+4
* | lint fixesfrankiebee2017-08-021-6/+1
* | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-022-9/+57
|\|
| * Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-271-0/+38
| * nonce-tracker - hotfix for provider proxyingkumavis2017-07-271-4/+11
| * nonce-tracker - add raw baseNonceHex to nonceDetailskumavis2017-07-271-1/+1
| * tx controller + nonce tracker - record nonce components on txMetakumavis2017-07-271-2/+5
| * nonce-tracker - validation - add validation failing value type to error messagekumavis2017-07-271-3/+3
| * nonce-tracker - validation - add validation failing value to error messagekumavis2017-07-271-3/+3
* | fix addTxDefaultsfrankiebee2017-08-021-1/+2
* | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-021-44/+17
|/
* Add stack traces both in errors and as a way to track txMetasfrankiebee2017-07-261-0/+8
* transactions - block nonce-tracker while updating pending transactionskumavis2017-07-191-14/+29
* nonce-tracker - fix lock mechanism to be a real mutexkumavis2017-07-191-11/+15
* nonce-tracker - return nonce as integerkumavis2017-07-191-1/+1
* nonce-tracker - validate nonce calc componentskumavis2017-07-191-3/+9
* turn off auto faucet and remove filefrankiebee2017-07-181-20/+0
* make publishTransaction and signTransaction async methodsfrankiebee2017-07-141-2/+7
* Fix test to match behaviorfrankiebee2017-07-131-1/+1
* use new nodeifyfrankiebee2017-07-131-21/+6
* Use txParamsfrankiebee2017-07-121-4/+4
* Merge branch 'master' into nonce-trackerfrankiebee2017-07-121-0/+9
|\
| * Improve insufficient balance checking in retry loopDan Finlay2017-07-121-0/+9
* | fix nonce calculation orderfrankiebee2017-07-061-6/+7
* | nonce-tracker: only check transactions that are not supposed to be ignoredfrankiebee2017-06-281-6/+7
* | fix nonceTrackerfrankiebee2017-06-221-8/+6
* | add a test for #getNonceLockfrankiebee2017-06-221-6/+16
* | introduce nonce-trackerkumavis2017-06-151-0/+49
|/
* LintingThomas Huang2017-06-131-2/+2
* Update gasblocklimit params with every block.Kevin Serrano2017-06-032-9/+2
* Convert gasLimit to not use muln in BNKevin Serrano2017-06-021-2/+8
* Merge pull request #1500 from MetaMask/RemoveStreamingSubproviderThomas Huang2017-05-261-17/+5
|\
| * Remove stream subproviderDan Finlay2017-05-261-17/+5
* | fix spellingfrankiebee2017-05-251-2/+2
* | Merge branch 'master' into reloadDappfrankiebee2017-05-252-2/+14
|\|
| * Merge pull request #1494 from MetaMask/1472-gasceilingDan Finlay2017-05-251-1/+12
| |\
| | * Add new blockGasLimit property to txMeta object.Kevin Serrano2017-05-251-1/+12
| * | inpage-provider - disable polling after first blockkumavis2017-05-251-1/+2
| |/
* / Reload the page when switching networks for sites that use web3frankiebee2017-05-251-22/+25
|/
* Merge branch 'master' into networkControllerFrankie2017-05-241-5/+17
|\
| * clean - remove console logskumavis2017-05-231-2/+0
| * deps - use stream-subprovider from provider-enginekumavis2017-05-231-1/+1
| * Rename stream to streamSubproviderDan Finlay2017-05-231-4/+4
| * Use filter subprovider in-page to avoid filter leaksDan Finlay2017-05-231-2/+6
| * Add new streaming subprovider but getting a loopDan Finlay2017-05-211-5/+15
* | Fix for testsfrankiebee2017-05-241-0/+29
* | Wrap the provider in a proxyfrankiebee2017-05-231-3/+2
* | Merge branch 'master' into networkControllerfrankiebee2017-05-232-20/+47
|\|
| * Remove all traces of testnetThomas Huang2017-05-161-10/+5
| * Change default network to rinkebyThomas Huang2017-05-161-5/+5
| * migrator - fix typokumavis2017-05-131-1/+1
| * migrator - cleaner migration runner with es7kumavis2017-05-121-25/+13
| * use asyncQ.waterfall instead of asyncQ.eachSeriesfrankiebee2017-05-121-4/+10
| * fix migratorfrankiebee2017-05-111-9/+8
* | Create a network controller to manage switcing networks an updating the providerfrankiebee2017-05-192-72/+3
|/
* Minor lintKevin Serrano2017-05-031-1/+1
* notification-manager - remove promise listenerkumavis2017-04-291-3/+0
* Merge branch 'master' into rinkebyDan Finlay2017-04-288-21/+21
|\
| * Fix linting warningsThomas Huang2017-04-278-22/+22
* | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-261-1/+5
* | add rinkeby networkNickyg2017-04-261-0/+5
|/
* auto-faucet - only skip faucet on explicit test environmentkumavis2017-04-051-1/+1
* add platforms to mascara + move buyEther window open to uikumavis2017-04-052-3/+24
* Switch auto-faucet from XMLHttpRequest to fetchfrankiebee2017-04-041-5/+11
* notification-manager - rename show -> showPoup + make getPopup privatekumavis2017-04-011-10/+10
* extension - remove local extension files, we use extensionizerkumavis2017-03-312-85/+0
* introduce platform api and rename notifications to notification-managerkumavis2017-03-312-67/+74
* Merge pull request #1293 from MetaMask/ImproveGasEstimatesKevin Serrano2017-03-301-3/+4
|\
| * tx-utils - gas buffer ceiling at 90% of block gas limitkumavis2017-03-301-3/+4
* | LintedDan Finlay2017-03-301-1/+1
* | Fix popup behavior for FirefoxDan Finlay2017-03-302-2/+7
|/
* tx manager - adjust new tx flow and txMeta decorationskumavis2017-03-291-17/+15
* Improve UI gas calculation logicDan Finlay2017-03-291-0/+7
* Remove gas limit paramDan Finlay2017-03-241-3/+3