aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into NewUIkumavis2017-08-041-1/+1
|\
| * v3.9.4kumavis2017-08-041-1/+1
| |
* | Merge branch 'master' into NewUIkumavis2017-08-044-35/+21
|\|
| * Merge pull request #1857 from MetaMask/hotFixCancleTxkumavis2017-08-041-1/+2
| |\ | | | | | | fix cancelTransaction not receiving a callback
| | * fix cancelTransaction not reciving a callbackfrankiebee2017-08-041-1/+2
| | |
| * | v3.9.3kumavis2017-08-041-1/+1
| | |
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-08-041-3/+0
| |\ \ | | | | | | | | | | | | blacklist-refactor2
| * | | blacklist - use module eth-phishing-detectkumavis2017-08-042-33/+18
| | |/ | |/|
* | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUIKevin Serrano2017-08-042-2/+15
|\ \ \ | |_|/ |/| |
| * | Create distinct responsive 'home.html' file, hard-code popup.html sizeDan Finlay2017-07-292-1/+13
| | | | | | | | | | | | Because firefox was having inconsistent sizing, made a second html file for forcing the view to a certain size. Still allows us to develop a responsive interface via the `home.html` file, which shares all the same react JS & CSS as popup.html.
| * | Correct viewport paramDan Finlay2017-07-281-1/+1
| | |
| * | Merge branch 'master' into NewUIDan Finlay2017-07-286-40/+95
| |\ \
| * \ \ Merge branch 'master' into NewUIDan Finlay2017-07-286-34/+104
| |\ \ \
| * | | | Disable user zoom in mobile modeDan Finlay2017-07-281-1/+1
| | | | |
| * | | | Fix viewport width to 1Dan Finlay2017-07-281-1/+1
| | | | |
| * | | | Adjust mobile scale for smaller devicesDan Finlay2017-07-271-1/+1
| | | | |
| * | | | Set initial scale for mobile.Dan Finlay2017-07-271-1/+2
| | | | |
| * | | | Replace ui with responsive-uiDan Finlay2017-07-253-95/+0
| | | | |
| * | | | Merge branch 'master' into NewUIDan Finlay2017-07-2112-156/+364
| |\ \ \ \
| * | | | | Move responsive ui into its own folder for easier mergesDan Finlay2017-07-214-4/+4
| | | | | |
| * | | | | Merge branch 'master' into NewUIDan Finlay2017-07-062-3/+10
| |\ \ \ \ \
| * | | | | | Get duplicate UI template workingDan Finlay2017-07-042-6/+3
| | | | | | |
| * | | | | | Make folder for responsive UIDan Finlay2017-07-044-3/+57
| | | | | | |
| * | | | | | Began creating new UI templateDan Finlay2017-07-043-1/+46
| | | | | | |
* | | | | | | remove stack from txsfrankiebee2017-08-041-3/+0
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-034-247/+191
|\ \ \ \ \ \ | | | | | | | | | | | | | | Transaction controller refractor part 1: promises for everyone and more tests!
| * | | | | | use async with #publishTransactionfrankiebee2017-08-031-2/+2
| | | | | | |
| * | | | | | move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-034-51/+49
| | | | | | |
| * | | | | | lint fixesfrankiebee2017-08-023-11/+4
| | | | | | |
| * | | | | | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-028-21/+126
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | fix spelling mistakefrankiebee2017-08-021-1/+1
| | | | | | |
| * | | | | | fix addTxDefaultsfrankiebee2017-08-022-2/+3
| | | | | | |
| * | | | | | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-023-218/+168
| | | | | | |
* | | | | | | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-034-47/+67
| | | | | | |
* | | | | | | phishing detection - move phishing detection into contentscript and metamask ↵kumavis2017-08-037-64/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | controller
* | | | | | | obj-multiplex - missing name error + prefer const over varkumavis2017-08-031-6/+10
| |/ / / / / |/| | | | |
* | | | | | Do not blacklist filesDan Finlay2017-07-281-1/+0
| | | | | |
* | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-272-2/+41
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #1837 from MetaMask/i1833-levencheckDan Finlay2017-07-271-8/+36
| |\ \ \ \ \ | | | | | | | | | | | | | | Levenshtein Checking Logic Added To Blacklist
| | * | | | | Give credit where it is dueKevin Serrano2017-07-271-0/+4
| | | | | | |
| | * | | | | Add levenshtein logic to blacklister.Kevin Serrano2017-07-271-8/+32
| | | | | | |
* | | | | | | Live update blacklist from InfuraDan Finlay2017-07-274-13/+15
| | | | | | |
* | | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-273-7/+13
|\| | | | | |
| * | | | | | Version 3.9.2v3.9.2Dan Finlay2017-07-271-1/+1
| |/ / / / /
| * | | | | nonce-tracker - hotfix for provider proxyingkumavis2017-07-272-5/+11
| | | | | |
| * | | | | nonce-tracker - add raw baseNonceHex to nonceDetailskumavis2017-07-271-1/+1
| | | | | |
* | | | | | Begin implementing live-updating blacklist, not working yetDan Finlay2017-07-273-8/+52
|/ / / / /
* | | | | tx cont - dont recursively store historykumavis2017-07-271-3/+9
| | | | |
* | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-07-271-1/+1
|\| | | | | | | | | | | | | | | | | | | betterErrorsOnTx
| * | | | Merge branch 'betterErrorsOnTx' of ↵frankiebee2017-07-262-7/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into betterErrorsOnTx
| * | | | | fix typofrankiebee2017-07-261-1/+1
| | | | | |
* | | | | | tx controller + nonce tracker - record nonce components on txMetakumavis2017-07-272-2/+9
| | | | | |
* | | | | | 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
| |/ / / / |/| | | |
* | | | | Merge branch 'master' into betterErrorsOnTxFrankie2017-07-262-7/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | tx cont - add argument for provider constructorkumavis2017-07-261-2/+3
| | | | |
| * | | | tx cont - remove old cb from async fnkumavis2017-07-261-5/+5
| | |_|/ | |/| |
* | | | fix stack wordingfrankiebee2017-07-261-2/+2
| | | |
* | | | use clonefrankiebee2017-07-261-1/+1
| | | |
* | | | remove line numbersfrankiebee2017-07-261-3/+3
| | | |
* | | | Add stack traces both in errors and as a way to track txMetasfrankiebee2017-07-262-8/+30
|/ / /
* | | Version 3.9.1v3.9.1Dan Finlay2017-07-201-1/+1
| | |
* | | transactions - block nonce-tracker while updating pending transactionskumavis2017-07-192-14/+32
| | |
* | | nonce-tracker - fix lock mechanism to be a real mutexkumavis2017-07-191-11/+15
| | |
* | | transaction - promisify _checkPendingTxskumavis2017-07-191-27/+41
| | |
* | | 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-182-24/+0
| | |
* | | Infura Network response teststmashuang2017-07-151-0/+1
| | |
* | | Merge pull request #1617 from MetaMask/nonce-trackerFrankie2017-07-145-96/+149
|\ \ \ | | | | | | | | transaction controller - use nonce-tracker
| * | | make publishTransaction and signTransaction async methodsfrankiebee2017-07-142-21/+19
| | | |
| * | | Merge branch 'master' into nonce-trackerfrankiebee2017-07-132-2/+2
| |\ \ \
| * | | | Fix test to match behaviorfrankiebee2017-07-131-1/+1
| | | | |
| * | | | mv updateAndApproveTx to txControllerfrankiebee2017-07-131-3/+7
| | | | |
| * | | | use new nodeifyfrankiebee2017-07-132-44/+21
| | | | |
| * | | | Use txParamsfrankiebee2017-07-121-4/+4
| | | | |
| * | | | Merge branch 'master' into nonce-trackerfrankiebee2017-07-125-21/+68
| |\ \ \ \
| * \ \ \ \ Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin ↵frankiebee2017-07-126-26/+121
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into nonce-tracker
| | * \ \ \ \ Merge branch 'master' into nonce-trackerkumavis2017-07-086-26/+121
| | |\ \ \ \ \
| * | | | | | | remove irrelevan codefrankiebee2017-07-121-1/+0
| |/ / / / / /
| * | | | | | clean up unused code from old noncelockfrankiebee2017-07-061-2/+0
| | | | | | |
| * | | | | | fix nonce calculation orderfrankiebee2017-07-061-6/+7
| | | | | | |
| * | | | | | nonce-tracker: only check transactions that are not supposed to be ignoredfrankiebee2017-06-282-7/+15
| | | | | | |
| * | | | | | calculate nonce based on local pending txs w/o error state.frankiebee2017-06-281-1/+10
| | | | | | |
| * | | | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-285-2/+67
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into nonce-trackerfrankiebee2017-06-221-1/+3
| |\ \ \ \ \ \ \
| * | | | | | | | fix nonceTrackerfrankiebee2017-06-222-46/+19
| | | | | | | | |
| * | | | | | | | add a test for #getNonceLockfrankiebee2017-06-221-6/+16
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-172-36/+74
| |\ \ \ \ \ \ \ \
| * | | | | | | | | transaction controller - use nonce-trackerkumavis2017-06-152-33/+59
| | | | | | | | | |
| * | | | | | | | | introduce nonce-trackerkumavis2017-06-151-0/+49
| | | | | | | | | |
* | | | | | | | | | Redirect from malicious sites fasterDan Finlay2017-07-141-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1771 from MetaMask/addNonceErrToErrLIstkumavis2017-07-133-0/+42
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add nonce err to err list
| * | | | | | | | | | limit the range for retryCountfrankiebee2017-07-131-1/+1
| | | | | | | | | | |
| * | | | | | | | | | write a migration for resubmit tx's to get put back into a submitted statefrankiebee2017-07-132-0/+41
| | | | | | | | | | |
| * | | | | | | | | | add "nonce too low" to the ignored errs list for tx retrysfrankiebee2017-07-131-0/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Remove css referencev3.9.0Dan Finlay2017-07-131-2/+1
| | | | | | | | | |
* | | | | | | | | | Version 3.9.0Dan Finlay2017-07-131-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into Version-3.8.6Dan Finlay2017-07-132-0/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add first version of phishing site warningDan Finlay2017-07-132-0/+19
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Links to my own blacklist for now, since I added a package.json for easy importing. We can point at the main 408H repository once this is merged: https://github.com/409H/EtherAddressLookup/pull/24 Redirects detected phishing sites [here](https://metamask.io/phishing.html).
* / / / / / / / / / Version 3.8.6v3.8.6Dan Finlay2017-07-121-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' into 3.8.5Dan Finlay2017-07-125-21/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | metamask - on rpc err show whole error bodykumavis2017-07-121-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge pull request #1762 from MetaMask/ImproveRetryLogickumavis2017-07-122-12/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve retry logic
| | * | | | | | | | Improve insufficient balance checking in retry loopDan Finlay2017-07-122-4/+10
| | | | | | | | | |
| | * | | | | | | | Remove local nonce error setting.Dan Finlay2017-07-121-8/+0
| | | | | | | | | |
| * | | | | | | | | use .includesfrankiebee2017-07-121-3/+3
| | | | | | | | | |
| * | | | | | | | | add "Gateway timeout" to ignored errors when resubmiting and use .includes ↵frankiebee2017-07-121-1/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | over .startsWith
| * | | | | | | | migration 16 - move resubmit warning back to submitted statekumavis2017-07-082-0/+42
| | | | | | | | |
| * | | | | | | | tx controller - resubmit - correctly set error on bad nonce/balancekumavis2017-07-081-2/+2
| | | | | | | | |
| * | | | | | | | tx controller - correctly set error message on resubmit errorkumavis2017-07-081-4/+8
| | | | | | | | |
| * | | | | | | | tx controller - resubmit - recognize parity known hash messagekumavis2017-07-081-0/+1
| | | | | | | | |
* | | | | | | | | 3.8.5kumavis2017-07-081-1/+1
|/ / / / / / / /
* | | | | / / / Version 3.8.4v3.8.4Dan Finlay2017-07-081-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | fail transactions that fail in resubmitfrankiebee2017-07-071-25/+22
| | | | | | |
* | | | | | | tx controller - clean codekumavis2017-07-071-13/+14
| | | | | | |
* | | | | | | tx controller - move commentskumavis2017-07-071-3/+7
| | | | | | |
* | | | | | | add commentfrankiebee2017-07-071-5/+11
| | | | | | |
* | | | | | | if an error happens during a tx publication set tx status to failfrankiebee2017-07-071-1/+10
| | | | | | |
* | | | | | | Version 3.8.3v3.8.3Dan Finlay2017-07-071-1/+1
| | | | | | |
* | | | | | | Fix failing testDan Finlay2017-07-061-12/+6
| | | | | | |
* | | | | | | Fail pending txs with low balance or invalid nonceDan Finlay2017-07-061-4/+22
| |_|_|_|_|/ |/| | | | |
* | | | | | metamask - append dapp origin domain to rpc requestkumavis2017-07-051-2/+9
| | | | | |
* | | | | | Version 3.8.2v3.8.2Dan Finlay2017-07-041-1/+1
| |_|_|_|/ |/| | | |
* | | | | Version 3.8.1v3.8.1Dan Finlay2017-07-011-1/+1
| | | | |
* | | | | Version 3.8.0v3.8.0Dan Finlay2017-06-291-1/+1
| | | | |
* | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-292-4/+26
|\ \ \ \ \ | | | | | | | | | | | | Add ability to add tokens to token list
| * \ \ \ \ Merge branch 'master' into i1616-AddTokenAddingDan Finlay2017-06-231-1/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-202-36/+74
| |\ \ \ \ \ \
| * | | | | | | Add ability to add tokens to token listDan Finlay2017-06-162-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fiex #1616
* | | | | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPriceDan Finlay2017-06-281-7/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | I1473 dapp default gas price
| * \ \ \ \ \ \ \ Merge branch 'master' into i1473-dappDefaultGasPriceThomas Huang2017-06-286-4/+70
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Keeps dapp gas price if setThomas Huang2017-06-201-7/+9
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #1685 from MetaMask/setFailedDan Finlay2017-06-282-0/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Migration #015 set txs Failed
| * | | | | | | | Create a migration for setting tx's with the message 'Gave up submitting ↵frankiebee2017-06-282-0/+39
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | tx.' as failed
* / | | | | | | dont stop retrying brodcasting txsfrankiebee2017-06-281-4/+0
|/ / / / / / /
* | | | | | | Fix error message for invalid seed words.Kevin Serrano2017-06-271-1/+1
| | | | | | |
* | | | | | | Merge pull request #1663 from MetaMask/infura-statusThomas Huang2017-06-272-1/+56
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Add Infura Status Information to UI State
| * | | | | | Add infura network status to our UI state.Kevin Serrano2017-06-231-1/+1
| | | | | | |
| * | | | | | Add infura network status to our UI state.Kevin Serrano2017-06-232-1/+56
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1603 from MetaMask/AddTokenListKevin Serrano2017-06-233-1/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | Add popular token list
| * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-06-203-1/+10
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / AddTokenList
| | * | Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-161-10/+5
| | |\|
| | * | Refresh token balance on network changeDan Finlay2017-06-151-1/+0
| | | |
| | * | Persist selected account tabDan Finlay2017-06-152-0/+9
| | | | | | | | | | | | | | | | Also improve error handling with token balances.
| | * | Merge branch 'master' into AddTokenListDan Finlay2017-06-1342-379/+552
| | |\ \
| | * | | Add missing tx manager stateDan Finlay2017-04-251-0/+1
| | | | |
* | | | | Fix badge number to include personal_signKevin Serrano2017-06-211-1/+3
|/ / / /
* | | | Merge branch 'master' into i1567-FixInaccurateErrorFrankie2017-06-171-3/+2
|\ \ \ \
| * \ \ \ Merge pull request #1623 from MetaMask/checkTxsFrankie2017-06-171-3/+2
| |\ \ \ \ | | | | | | | | | | | | Check txs
| | * | | | put the block listeners back on the providerfrankiebee2017-06-171-3/+2
| | | | | |
* | | | | | put event back on the "blockTracker:/provider"frankiebee2017-06-171-1/+1
| | | | | |
* | | | | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-171-1/+5
|\| | | | |
| * | | | | Debounce background updatesDan Finlay2017-06-161-1/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our background sometimes emits absurd quantities of updates very quickly. This PR reduces the amount of inter-process traffic by ensuring the `sendUpdate` method does not fire more than every 200 ms. Fixes #1621
* | | | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-161-16/+52
|\| | | |
| * | | | Merge pull request #1611 from MetaMask/checkTxsOnSynckumavis2017-06-161-0/+46
| |\ \ \ \ | | | | | | | | | | | | add a check for weather a tx is included in a block when jumping blocks
| | * | | | transactions controller - add commentskumavis2017-06-161-0/+5
| | | | | |
| | * | | | add a check for weather a tx is included in a block when jumping blocksfrankiebee2017-06-151-0/+41
| | | |_|/ | | |/| |
| * / | | check for the tx in the block that provider engine gives usfrankiebee2017-06-151-15/+5
| |/ / /
* | | | check nonce and balance when resubmiting txfrankiebee2017-06-162-11/+17
| | | |
* | | | remove unnecessary logfrankiebee2017-06-151-4/+1
| | | |
* | | | Do not mark slowly mined txs as failed.Dan Finlay2017-06-151-8/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | Fixes #1567 Also seems to fix #1556 Also improves resubmit performance by only resubmitting on `latest`.
* | | Merge pull request #1598 from MetaMask/txRetryDan Finlay2017-06-141-9/+4
|\ \ \ | | | | | | | | put tx resubmission on the block event
| * | | rename continuallyResubmitPendingTxs to resubmitPendingTxsfrankiebee2017-06-141-2/+2
| | | |
| * | | put tx resubmission on the block eventfrankiebee2017-06-131-8/+3
| | | |
* | | | Fix networkState in chain idThomas Huang2017-06-131-1/+1
| |_|/ |/| |
* | | Version 3.7.8v3.7.8Dan Finlay2017-06-131-1/+1
|/ /
* | Merge pull request #1208 from MetaMask/i#1203MainNetSwitchkumavis2017-06-131-2/+5
|\ \ | | | | | | Change default to mainnet
| * | default testnet - fix typokumavis2017-06-131-1/+0
| | |
| * | Merge branch 'master' into i#1203MainNetSwitchkumavis2017-06-1354-1182/+929
| |\ \
| * \ \ Merge branch 'master' into i#1203MainNetSwitchFrankie2017-03-173-1/+97
| |\ \ \
| * \ \ \ Merge branch 'master' into i#1203MainNetSwitchkumavis2017-03-153-3/+3
| |\ \ \ \
| * | | | | Swithch the default network to mainnetfrankiebee2017-03-141-3/+6
| | | | | |
* | | | | | LintingThomas Huang2017-06-132-3/+3
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' into currency-fixDan Finlay2017-06-133-10/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into gasupdaterDan Finlay2017-06-131-1/+1
| |\ \ \ \ \
| | * | | | | 3.7.7kumavis2017-06-091-1/+1
| | | | | | |
| * | | | | | Update gasblocklimit params with every block.Kevin Serrano2017-06-032-9/+2
| | | | | | |
* | | | | | | Merge branch 'master' into currency-fixKevin Serrano2017-06-061-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Version 3.7.6v3.7.6Dan Finlay2017-06-061-1/+1
| | | | | | |
| * | | | | | Version 3.7.5Dan Finlay2017-06-061-1/+1
| |/ / / / /
* / / / / / Use new URL for currency API from cryptonator.Kevin Serrano2017-06-062-2/+2
|/ / / / /
* | | | | Version 3.7.4v3.7.4Dan Finlay2017-06-031-1/+1
| | | | |
* | | | | Merge pull request #1533 from MetaMask/i1528-gasLimitLowkumavis2017-06-031-2/+8
|\ \ \ \ \ | | | | | | | | | | | | Convert gasLimit to not use muln in BN
| * | | | | Convert gasLimit to not use muln in BNKevin Serrano2017-06-021-2/+8
| | | | | |
* | | | | | Version 3.7.3v3.7.3Dan Finlay2017-06-021-1/+1
|/ / / / /
* | | | | Version 3.7.2v3.7.2Dan Finlay2017-06-011-1/+1
| | | | |
* | | | | Merge pull request #1500 from MetaMask/RemoveStreamingSubproviderThomas Huang2017-05-261-17/+5
|\ \ \ \ \ | | | | | | | | | | | | Remove streaming subprovider
| * | | | | Remove stream subproviderDan Finlay2017-05-261-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 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 Max GasLimit Ceiling
| | * | | | | 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-253-41/+28
|/ / / / /
* | | | | Merge pull request #1487 from MetaMask/stopPollingkumavis2017-05-251-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Stop polling
| * | | | | stop polling when switching networksfrankiebee2017-05-241-0/+1
| | | | | |
* | | | | | Merge branch 'master' into Version-3.7.1kumavis2017-05-249-125/+297
|\| | | | |
| * | | | | Merge branch 'master' into networkControllerFrankie2017-05-243-10/+73
| |\ \ \ \ \
| | * | | | | Version 3.7.0v3.7.0Dan Finlay2017-05-241-1/+1
| | | | | | |
| | * | | | | CleanupDan Finlay2017-05-241-2/+3
| | | | | | |
| | * | | | | Continually resubmit pending txsDan Finlay2017-05-241-2/+52
| | | | | | |
| | * | | | | clean - remove console logskumavis2017-05-231-2/+0
| | | | | | |
| | * | | | | deps - use stream-subprovider from provider-enginekumavis2017-05-232-3/+3
| | | | | | |
| | * | | | | Rename stream to streamSubproviderDan Finlay2017-05-231-4/+4
| | | | | | |
| | * | | | | Use filter subprovider in-page to avoid filter leaksDan Finlay2017-05-231-2/+6
| | | | | | |
| | * | | | | Use stream-provider v3 apiDan Finlay2017-05-231-2/+2
| | | | | | |
| | * | | | | Add new streaming subprovider but getting a loopDan Finlay2017-05-211-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 txControllerfrankiebee2017-05-241-0/+1
| | | | | | |
| * | | | | | Fix for testsfrankiebee2017-05-245-55/+68
| | | | | | |
| * | | | | | Wrap the provider in a proxyfrankiebee2017-05-235-126/+64
| | | | | | |
| * | | | | | Add a migration for the network controllerfrankiebee2017-05-232-0/+35
| | | | | | |
| * | | | | | Merge branch 'master' into networkControllerfrankiebee2017-05-2311-70/+123
| |\| | | | |
| * | | | | | Create a network controller to manage switcing networks an updating the providerfrankiebee2017-05-196-150/+232
| | | | | | |
* | | | | | | Version 3.7.1v3.7.1Dan Finlay2017-05-241-1/+1
| |/ / / / / |/| | | | |
* | | | | | Version 3.6.5v3.6.5Dan Finlay2017-05-181-1/+1
| | | | | |
* | | | | | Fix path referencesDan Finlay2017-05-171-2/+2
| | | | | |
* | | | | | Rename tx manager to tx controllerDan Finlay2017-05-173-18/+18
| | | | | |
* | | | | | migration 13 - change provider from testnet to ropstenkumavis2017-05-162-0/+35
| | | | | |
* | | | | | Remove all traces of testnetThomas Huang2017-05-163-18/+10
| | | | | |
* | | | | | Merge branch 'master' into i1419-rinkebydefaultnetworkThomas Huang2017-05-161-22/+16
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #1422 from MetaMask/drop-asyncqDan Finlay2017-05-161-22/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | background - drop async-q in favor of async/await
| | * | | | | | background - drop async-q in favor of async/awaitkumavis2017-05-131-22/+16
| | | | | | | |
* | | | | | | | Change default network to rinkebyThomas Huang2017-05-162-8/+8
|/ / / / / / /
* | | | | | | migrator - fix typokumavis2017-05-131-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fixMigrator2kumavis2017-05-132-2/+1
|\| | | | | |
| * | | | | | Trim currency list.Kevin Serrano2017-05-121-1/+0
| | | | | | |
| * | | | | | Version 3.6.4v3.6.4Dan Finlay2017-05-101-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
|/ / / / /
* | | | | Version 3.6.3v3.6.3Dan Finlay2017-05-091-1/+1
| | | | |
* | | | | Version 3.6.2v3.6.2Dan Finlay2017-05-091-1/+1
| | | | |
* | | | | ui - remove web3, use eth-querykumavis2017-05-091-2/+3
| | | | |
* | | | | metamask - publicConfig - fix init statekumavis2017-05-051-1/+1
| | | | |
* | | | | metamask - selected accounts - dont reveal when lockedkumavis2017-05-051-15/+17
| | | | |
* | | | | Minor lintKevin Serrano2017-05-031-1/+1
| | | | |
* | | | | Version 3.6.1Dan Finlay2017-05-011-1/+1
| | | | |
* | | | | Use loglevel for more logsDan Finlay2017-05-011-9/+3
| | | | |
* | | | | notification-manager - remove promise listenerkumavis2017-04-291-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.0Dan Finlay2017-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | t # Explicit paths specified without -i or -o; assuming --only paths...
* | | | | Merge branch 'master' into Version-3.5.4Dan Finlay2017-04-2834-119/+123
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into rinkebyDan Finlay2017-04-2832-118/+111
| |\ \ \ \ \
| | * | | | | Fix linting warningsThomas Huang2017-04-2732-119/+112
| | | | | | |
| * | | | | | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-262-2/+6
| | | | | | |
| * | | | | | add rinkeby networkNickyg2017-04-262-0/+7
| |/ / / / /
* / / / / / Version 3.5.4v3.5.4Dan Finlay2017-04-261-1/+1
|/ / / / /
* | | | / Version 3.5.3v3.5.3Dan Finlay2017-04-251-1/+1
| |_|_|/ |/| | |
* | | | auto-faucet - only skip faucet on explicit test environmentkumavis2017-04-051-1/+1
| | | |
* | | | add platforms to mascara + move buyEther window open to uikumavis2017-04-055-20/+72
| | | |