aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Adding Account Dropdown V2Chi Kei Chan2017-10-134-24/+57
* UI for send screen container without form rows.Dan2017-10-091-1/+4
* Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-049-86/+90
|\
| * Merge pull request #2250 from interfect/masterFrankie2017-10-041-1/+0
| |\
| | * Don't pass origin as an HTTP headerAdam Novak2017-10-021-1/+0
| * | 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-032-2/+4
| |\ \
| | * \ Merge branch 'master' into history-notesfrankiebee2017-10-032-2/+4
| | |\ \
| | | * | tx state history - fix bug where initial snapshot was mutated on updateTxkumavis2017-10-032-2/+3
| | | * | Merge pull request #2138 from sunify/fix-firefox-corsThomas Huang2017-10-031-1/+2
| | | |\ \ | | | | |/ | | | |/|
| | | | * Update manifest.jsonKevin Serrano2017-10-031-2/+1
| | | | * Wildcard for infura.io permissions, added permission for cryptonator apiAlex Lunyov2017-09-221-4/+2
| | | | * Fix CORS issues in FireFoxAlex Lunyov2017-09-211-1/+5
| * | | | tx state history - append note to first op of diffkumavis2017-10-031-2/+5
| |/ / /
| * / / transaction - provide notes for historyfrankiebee2017-10-032-12/+14
| |/ /
| * | Version 3.10.8 - Fix Currency Conversionv3.10.8Dan Finlay2017-09-302-2/+2
| * | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactionskumavis2017-09-303-26/+1
| |\ \
| | * | pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-303-26/+1
| * | | Merge pull request #2239 from MetaMask/network-controller-contdFrankie2017-09-301-2/+3
| |\ \ \
| | * | | network - make network controller internal network switching explicitkumavis2017-09-301-2/+3
| * | | | Merge pull request #2237 from MetaMask/network-controller-contdFrankie2017-09-303-36/+47
| |\| | |
| | * | | network - convert localhost from custom rpc to network typekumavis2017-09-303-7/+3
| | * | | network controller - small refactorkumavis2017-09-302-35/+50
| | |/ /
| * / / Version 3.10.7v3.10.7Dan Finlay2017-09-301-1/+1
| |/ /
| * | Ensure selected account is always set if possibleDan Finlay2017-09-301-0/+9
* | | Enables remove token and ensures add/remove update the list without need for ...Dan2017-10-042-1/+13
* | | Merge branch 'master' into mmnChi Kei Chan2017-09-2820-1119/+751
|\| |
| * | Merge pull request #2124 from MetaMask/breakout-mascarakumavis2017-09-281-1/+0
| |\ \
| | * | re-enabled x-metamask-origin for mascarafrankiebee2017-09-282-5/+1
| | * | platforms: put context for extension in platform extension classfrankiebee2017-09-223-2/+4
| | * | Merge branch 'master' into breakout-mascarafrankiebee2017-09-202-4/+10
| | |\|
| | * | add context to platform to not have X-Metamask-Origin in mascarafrankiebee2017-09-202-1/+2
| * | | Merge branch 'master' into new-currency-testkumavis2017-09-2818-1114/+746
| |\ \ \
| | * \ \ Merge pull request #2194 from MetaMask/network-controller-refactorkumavis2017-09-282-33/+34
| | |\ \ \
| | | * | | network controller - move _setProvider to bottomkumavis2017-09-281-18/+18
| | | * | | network controller - refactor to use _setProviderkumavis2017-09-281-17/+28
| | | * | | network - remove getter/setterkumavis2017-09-281-23/+14
| | | * | | metamask - improve commentkumavis2017-09-281-2/+1
| | * | | | Version 3.10.6Dan Finlay2017-09-281-1/+1
| | * | | | Commit to the eth-keyring-controller moduleDan Finlay2017-09-281-599/+0
| | * | | | Remove dead referenceDan Finlay2017-09-281-1/+0
| | * | | | Fix Account SelectionDan Finlay2017-09-282-3/+7
| | * | | | account-tracker - remove unused importkumavis2017-09-281-1/+0
| | * | | | Merge branch 'master' into direct-block-trackerkumavis2017-09-289-323/+363
| | |\ \ \ \
| | | * \ \ \ Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3kumavis2017-09-286-319/+356
| | | |\ \ \ \
| | | | * | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin...frankiebee2017-09-272-2/+6
| | | | * | | | transactions: reveal #getFilteredTxList from txStateManage and fix accountTra...frankiebee2017-09-271-1/+5
| | | | * | | | transactions: make evnt names pretty and eaiser to readfrankiebee2017-09-272-11/+11
| | | | * | | | transactions: lint fixes and reveal status-update event for balance controllerfrankiebee2017-09-275-13/+23
| | | | * | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-2719-254/+430
| | | | |\ \ \ \
| | | | * | | | | ensure that values written to txParams are hex stringsfrankiebee2017-09-142-1/+10
| | | | * | | | | linting && format fixingfrankiebee2017-09-132-12/+7
| | | | * | | | | match other controller patternsfrankiebee2017-09-133-23/+22
| | | | * | | | | fix miss typefrankiebee2017-09-091-1/+1
| | | | * | | | | more tests and craete a getPendingTransactions functionfrankiebee2017-09-092-11/+10
| | | | * | | | | fix messy mergefrankiebee2017-09-071-4/+4
| | | | * | | | | remove unused variablefrankiebee2017-09-071-1/+0
| | | | * | | | | fix merge and errors disaperaing on updatefrankiebee2017-09-072-3/+6
| | | | * | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-078-54/+233
| | | | |\ \ \ \ \
| | | | * | | | | | add better commentsfrankiebee2017-09-062-32/+41
| | | | * | | | | | rename tx-utils.js -> tx-gas-utils.jsfrankiebee2017-09-061-4/+0
| | | | * | | | | | remove #buildEthTxFromParamsfrankiebee2017-09-061-17/+0
| | | | * | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-08-227-14/+111
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Create TxStateManagerfrankiebee2017-08-223-47/+47
| | | | * | | | | | | Create tests for TxStateManagerfrankiebee2017-08-192-192/+218
| | | * | | | | | | | Fix accountTracker store referencesDan Finlay2017-09-282-2/+2
| | | * | | | | | | | Version 3.10.5Dan Finlay2017-09-281-1/+1
| | | * | | | | | | | 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
| | |/ / / / / / /
| | * | | | | | | Version 3.10.4v3.10.4Dan Finlay2017-09-281-1/+1
| | * | | | | | | Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-289-74/+242
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut...kumavis2017-09-277-40/+642
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | Remove duplicate instantiation of account-trackerDan Finlay2017-09-271-5/+1
| | | | * | | | | | Move obs store into account-tracker instead of inheritingDan Finlay2017-09-274-20/+25
| | | | * | | | | | Restore blockGasLimit to account-trackerDan Finlay2017-09-271-0/+3
| | | | * | | | | | Pass blocktracker to balances controllerDan Finlay2017-09-271-0/+1
| | | | * | | | | | Make encryptor configurable for keyring-controllerDan Finlay2017-09-261-1/+1
| | | | * | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-261-1/+1
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Make blockTracker an independent paramDan Finlay2017-09-262-3/+6
| | | | * | | | | | | Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin in...Dan Finlay2017-09-262-0/+2
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-262-0/+2
| | | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | | Implemented feedbackDan Finlay2017-09-262-7/+5
| | | | |/ / / / / / / /
| | | | * | | | | | | | Made some requested changesDan Finlay2017-09-261-7/+7
| | | * | | | | | | | | Remove keyring controller from projectDan Finlay2017-09-233-596/+2
| | | * | | | | | | | | Merge branch 'AddBalanceController' into BreakOutKeyringControllerDan Finlay2017-09-237-58/+217
| | | |\| | | | | | | |
| | | | * | | | | | | | Fix accont-tracker merge bugDan Finlay2017-09-231-0/+4
| | | | * | | | | | | | Fix account-tracker referencesDan Finlay2017-09-233-13/+13
| | | | * | | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-2312-172/+178
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | |
| | | | * | | | | | | | Fix computed-balances controller referenceDan Finlay2017-09-231-1/+1
| | | | * | | | | | | | Refactor eth-store into account-trackerDan Finlay2017-09-234-16/+22
| | | | * | | | | | | | Remove dead code from eth-storeDan Finlay2017-09-231-43/+1
| | | | * | | | | | | | Add computed balance to account detail viewDan Finlay2017-09-144-7/+17
| | | | * | | | | | | | Got pending balance updating correctlyDan Finlay2017-09-143-81/+69
| | | | * | | | | | | | Add state-labeled events to allow subscribing to any transaction's state changeDan Finlay2017-09-141-0/+1
| | | | * | | | | | | | Some progressDan Finlay2017-09-133-1/+143
| | | | * | | | | | | | 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
| | | * | | | | | | | | | Allow metamaskController to define keyring typesDan Finlay2017-09-231-1/+1
| | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | network contoller - clean up unused codefrankiebee2017-09-271-6/+0
| | * | | | | | | | | | listen for the blocke event on the block tracker instead of rawBlock on the p...frankiebee2017-09-272-2/+1
| | * | | | | | | | | | wrap block tracker in events proxyfrankiebee2017-09-272-14/+39
| | * | | | | | | | | | metamask - use provider-engines block trackerkumavis2017-09-231-1/+1
| | * | | | | | | | | | bug - fix event emitter mem leak warningkumavis2017-09-221-3/+8
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-273-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #2143 from MetaMask/Version-3.10.3kumavis2017-09-261-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Version 3.10.3Dan Finlay2017-09-221-1/+1
| | | |/ / / / / / /
| | * | | | | | | | Define encryptor in constructor params instead of platform objectDan Finlay2017-09-231-1/+1
| | * | | | | | | | Merge branch 'master' into ConfigurableEncryptionDan Finlay2017-09-221-1/+1
| | |\| | | | | | |
| | * | | | | | | | Allow custom encryptor to be passed to MetaMaskController and KeyringControll...Dan Finlay2017-09-222-2/+3
| | |/ / / / / / /
| * | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-212-4/+10
| |\| | | | | | |
| | * | | | | | | v3.10.2kumavis2017-09-191-1/+1
| * | | | | | | | Comply with current currency API and add additional styling.Kevin Serrano2017-09-191-2/+2
| * | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-1910-169/+169
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into new-currency-testKevin Serrano2017-09-144-30/+33
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-08-302-22/+44
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | integrate infura currencyKevin Serrano2017-08-302-4/+4
* | | | | | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-192-4/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Do not mark a retry tx failed that has been broadcast successfullyDan Finlay2017-09-191-3/+9
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Version 3.10.1v3.10.1Dan Finlay2017-09-191-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into nmChi Kei Chan2017-09-1920-245/+519
|\| | | | | | | |
| * | | | | | | | createOriginMiddleware - fix var namekumavis2017-09-141-1/+1
| * | | | | | | | metamask controller - destroy filter polyfill on disconnectkumavis2017-09-141-4/+10
| * | | | | | | | metamask controller - move middleware into seperate fileskumavis2017-09-144-34/+44
| * | | | | | | | debug - prefer logger over consolekumavis2017-09-142-9/+9
| * | | | | | | | metamask cont - standardize multiplex stream namingkumavis2017-09-141-8/+8
| * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-131-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Version 3.10.0v3.10.0Dan Finlay2017-09-121-1/+1
| * | | | | | | | contentscript - fix obj-multiplex instantiation and use pump for streamskumavis2017-09-121-12/+33
| * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-122-12/+15
| |\| | | | | | |
| | * | | | | | | Merge pull request #2049 from MetaMask/i1938-removecryptopermissionsKevin Serrano2017-09-111-3/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove cryptonator from chrome permissions.Kevin Serrano2017-09-081-3/+2
| | * | | | | | | | Merge pull request #2057 from MetaMask/Version-3.9.13kumavis2017-09-092-26/+28
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Version 3.9.13v3.9.13Dan Finlay2017-09-091-1/+1
| | | * | | | | | | 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-084-26/+47
| |\| | | | | | |
| | * | | | | | | Merge branch 'master' into readd-looseKevin Serrano2017-09-072-3/+4
| | |\| | | | | |
| | | * | | | | | Version 3.9.12v3.9.12Dan Finlay2017-09-071-1/+1
| | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | inpage - bug fixkumavis2017-09-061-2/+3
| | * | | | | | Properly update keyring state on new account addition.Kevin Serrano2017-09-071-1/+2
| | |/ / / / /
| | * | / / / Make web3 deprecation notice more usefulDan Finlay2017-09-061-1/+1
| | | |/ / / | | |/| | |
| | * | | | Merge branch 'master' into inpage-provider-fixeskumavis2017-08-296-34/+140
| | |\| | |
| | * | | | 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
| * | | | | metamask - add jsonrpc filter middleware on per-connection enginekumavis2017-09-081-2/+8
| * | | | | inpage - distinguish pump vs pipekumavis2017-09-081-4/+4
| * | | | | streams - use pump and published obj-multiplexkumavis2017-09-084-80/+41
| * | | | | inpage - add idRemapMiddlewarekumavis2017-09-081-1/+3
| * | | | | inpage - use json-rpc-engine for inpage-providerkumavis2017-08-252-46/+42
| | |/ / / | |/| | |
| * | | | Version 3.9.11v3.9.11Dan Finlay2017-08-241-1/+1
| * | | | Merge pull request #1973 from MetaMask/hotfix-migration019kumavis2017-08-243-1/+85
| |\ \ \ \
| | * | | | fall back to `latest` if blockNumber is nullfrankiebee2017-08-241-1/+1
| | * | | | Make method return a numberDan Finlay2017-08-241-1/+1
| | * | | | Only cancel pending txs with non continuously high noncesDan Finlay2017-08-241-1/+24
| | * | | | fix descriptionfrankiebee2017-08-241-2/+2
| | * | | | hotfix - fail submitted txs whos nonce is out of boundfrankiebee2017-08-242-0/+61
| * | | | | Fail transactions after a day of retriesDan Finlay2017-08-242-2/+12
| |/ / / /
| * | | | 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
| |/ / /
| * | | Version 3.9.10Dan Finlay2017-08-241-1/+1
| * | | Merge branch 'master' into useLocalNonceDan Finlay2017-08-245-17/+110
| |\ \ \ | | | |/ | | |/|
| | * | Version 3.9.9v3.9.9Dan Finlay2017-08-191-1/+1
| | * | Merge pull request #1914 from MetaMask/history-diffDan Finlay2017-08-194-16/+109
| | |\ \
| | | * | migration 18 - activatekumavis2017-08-151-0/+1
| | | * | migration 18 - fix an oopskumavis2017-08-151-1/+1
| | | * | tx controller - tx state history various small fixeskumavis2017-08-153-3/+2
| | | * | migration 18 - move to diff-based historykumavis2017-08-151-0/+52
| | | * | introduce tx-state-history-helper and diff-based historykumavis2017-08-152-15/+56
| * | | | 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-192-3/+27
| |/ / /
| * | | Version 3.9.8v3.9.8Dan Finlay2017-08-171-1/+1
| * | | v3.9.7kumavis2017-08-161-1/+1
| |/ /
* | | Improve styling in Confirmation Screen; Show decoded send token dataChi Kei Chan2017-09-131-1/+0
* | | Added signTokenTx; Adding token confirmation screenChi Kei Chan2017-09-121-0/+3
* | | Fix html heightChi Kei Chan2017-09-061-2/+2
* | | Replace Avenir Next with alternative.Dan2017-08-3011-0/+93
* | | Add bolt and info icon vector imagessdtsui2017-08-232-0/+22
* | | Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-144-5/+21
|\| |
| * | fix wordingfrankiebee2017-08-121-1/+1
| * | add deprecation warning for web3frankiebee2017-08-121-1/+4
| |/
| * 3.9.6kumavis2017-08-101-1/+1
| * Merge pull request #1883 from MetaMask/estimateGas-fixThomas Huang2017-08-101-3/+11
| |\
| | * tx utils - detect estimateGas err and set simulationFailedkumavis2017-08-091-3/+11
| * | ui - buy eth - formatting and moved network names to configkumavis2017-08-101-0/+5
| |/
* | Merge branch 'master' into NewUI-flatkumavis2017-08-095-189/+253
|\|
| * tx controller - fix error serializationkumavis2017-08-091-2/+5
| * tx controller - fix getBalance fnkumavis2017-08-091-1/+1
| * util - sufficientBalance - validate inputkumavis2017-08-091-1/+6
| * Merge pull request #1880 from MetaMask/pendingFixFrankie2017-08-092-3/+4
| |\
| | * filter by network for pending txsfrankiebee2017-08-091-0/+2
| | * fix getPendingTransactions function for pendingTxTrackerfrankiebee2017-08-092-3/+2
| * | Merge branch 'master' into greenkeeper/initialkumavis2017-08-094-186/+241
| |\|
| | * fix class namesfrankiebee2017-08-093-18/+25
| | * fix the bind on pending tx watchersfrankiebee2017-08-081-3/+3
| | * Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-084-5/+19
| | |\
| | * | remove logging of the message and log the errorfrankiebee2017-08-081-1/+1
| | * | remove unnecessary if statment for error messagefrankiebee2017-08-081-1/+0
| | * | fix spellingfrankiebee2017-08-082-15/+12
| | * | rename PendingTransactionUtils -> PendingTransactionWatchersfrankiebee2017-08-051-8/+8
| | * | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-0512-125/+118
| | |\ \
| | * | | break out tx status pendding watchersfrankiebee2017-08-052-145/+192
| | * | | move util functions to util.jsfrankiebee2017-08-052-32/+40
| | * | | use error for #approveTransaction when setting failedfrankiebee2017-08-031-5/+2
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-085-6/+21
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' into NewUIkumavis2017-08-052-3/+4
| | |\ \ \
| | * \ \ \ Merge branch 'master' into NewUIkumavis2017-08-041-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into NewUIkumavis2017-08-044-35/+21
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUIKevin Serrano2017-08-042-2/+15
| | |\ \ \ \ \
| * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-0415-289/+351
| * | | | | | | lint fixeskumavis2017-08-041-1/+1
* | | | | | | | Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-0713-370/+308
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | v3.9.5kumavis2017-08-051-1/+1
| * | | | | | | blacklist - update phishing on boot and speed up polling to 4 minkumavis2017-08-051-2/+3
| | |_|_|_|/ / | |/| | | | |
| * | | | | | v3.9.4kumavis2017-08-041-1/+1
| | |_|_|/ / | |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 06:03:10 +0800