aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* development - fix ui devkumavis2017-09-302-66/+69
* Merge pull request #2124 from MetaMask/breakout-mascarakumavis2017-09-2810-144/+27
|\
| * re-enabled x-metamask-origin for mascarafrankiebee2017-09-282-5/+1
| * bump metamascara versionfrankiebee2017-09-231-1/+1
| * platforms: put context for extension in platform extension classfrankiebee2017-09-223-2/+4
| * mascara: turn off backgroundfrankiebee2017-09-202-3/+2
| * update metamascarafrankiebee2017-09-201-1/+1
| * stub platformfrankiebee2017-09-202-0/+2
| * Merge branch 'master' into breakout-mascarafrankiebee2017-09-205-6/+18
| |\
| * | add context to platform to not have X-Metamask-Origin in mascarafrankiebee2017-09-202-1/+2
| * | require metamascarafrankiebee2017-09-196-140/+23
* | | Merge pull request #2177 from MetaMask/new-currency-testkumavis2017-09-287-225/+678
|\ \ \
| * \ \ Merge branch 'master' into new-currency-testkumavis2017-09-2833-1532/+1362
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2194 from MetaMask/network-controller-refactorkumavis2017-09-283-36/+37
|\ \ \ \
| * | | | network controller - move _setProvider to bottomkumavis2017-09-281-18/+18
| * | | | network controller - refactor to use _setProviderkumavis2017-09-282-20/+31
| * | | | network - remove getter/setterkumavis2017-09-281-23/+14
| * | | | metamask - improve commentkumavis2017-09-281-2/+1
* | | | | Merge pull request #2193 from MetaMask/FixAccountSelectionThomas Huang2017-09-284-598/+7
|\ \ \ \ \
| * | | | | Version 3.10.6Dan Finlay2017-09-282-1/+3
| * | | | | Commit to the eth-keyring-controller moduleDan Finlay2017-09-282-600/+1
| * | | | | Remove dead referenceDan Finlay2017-09-281-1/+0
| * | | | | Bump changelogDan Finlay2017-09-281-0/+3
| * | | | | Fix Account SelectionDan Finlay2017-09-282-3/+7
* | | | | | Merge pull request #2196 from MetaMask/express-bumpDan Finlay2017-09-281-1/+1
|\ \ \ \ \ \
| * | | | | | deps - bump express for security fixkumavis2017-09-281-1/+1
| |/ / / / /
* | | | | | Merge pull request #2195 from MetaMask/greenkeeper/eth-keyring-controller-2.0.0Thomas Huang2017-09-281-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix(package): update eth-keyring-controller to version 2.0.0greenkeeper[bot]2017-09-281-1/+1
|/ / / / /
* | | | | Merge pull request #2191 from MetaMask/direct-block-trackerv3.10.5Dan Finlay2017-09-283-8/+6
|\ \ \ \ \
| * | | | | account-tracker - remove unused importkumavis2017-09-281-1/+0
| * | | | | Merge branch 'master' into direct-block-trackerkumavis2017-09-2815-556/+838
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3kumavis2017-09-2811-552/+827
|\ \ \ \ \ \
| * | | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin...frankiebee2017-09-273-3/+7
| * | | | | | fix testsfrankiebee2017-09-271-2/+2
| * | | | | | Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMa...frankiebee2017-09-271-14/+153
| |\ \ \ \ \ \
| | * | | | | | Clean up transactionController teststmashuang2017-09-261-71/+53
| | * | | | | | Remove pending updateAndApprovedTransaction testtmashuang2017-09-261-10/+0
| | * | | | | | Most of transaction controller teststmashuang2017-09-231-12/+180
| * | | | | | | transactions: reveal #getFilteredTxList from txStateManage and fix accountTra...frankiebee2017-09-271-1/+5
| * | | | | | | transactions: make evnt names pretty and eaiser to readfrankiebee2017-09-273-20/+20
| * | | | | | | transactions: lint fixes and reveal status-update event for balance controllerfrankiebee2017-09-276-14/+24
| * | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-2770-705/+1240
| |\ \ \ \ \ \ \
| * | | | | | | | ensure that values written to txParams are hex stringsfrankiebee2017-09-142-1/+10
| | |/ / / / / / | |/| | | | | |
| * | | | | | | add test for pendingTxCountfrankiebee2017-09-141-0/+13
| * | | | | | | linting && format fixingfrankiebee2017-09-132-12/+7
| * | | | | | | match other controller patternsfrankiebee2017-09-134-24/+23
| * | | | | | | fix miss typefrankiebee2017-09-091-1/+1
| * | | | | | | more tests and craete a getPendingTransactions functionfrankiebee2017-09-094-12/+34
| * | | | | | | 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-0723-115/+527
| |\ \ \ \ \ \ \
| * | | | | | | | add better commentsfrankiebee2017-09-063-34/+43
| * | | | | | | | rename tx-utils.js -> tx-gas-utils.jsfrankiebee2017-09-062-5/+1
| * | | | | | | | remove #buildEthTxFromParamsfrankiebee2017-09-062-18/+3
| * | | | | | | | fix testsfrankiebee2017-08-221-4/+7
| * | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-08-2221-157/+3280
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Create TxStateManagerfrankiebee2017-08-223-47/+47
| * | | | | | | | | Create tests for TxStateManagerfrankiebee2017-08-194-388/+471
* | | | | | | | | | Merge pull request #2190 from MetaMask/Version-3.10.5kumavis2017-09-285-4/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Fix accountTracker store referencesDan Finlay2017-09-282-2/+2
| * | | | | | | | | Version 3.10.5Dan Finlay2017-09-282-1/+3
| * | | | | | | | | Fix bug where block gas limit was incorrectly parsed.Dan Finlay2017-09-282-1/+5
|/ / / / / / / / /
| | | | | * | | | style - small whitespace nitpickkumavis2017-09-282-4/+4
| | | | | * | | | account-tracker - use new block-tracker block formatkumavis2017-09-281-4/+2
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #2189 from MetaMask/Version-3.10.4Dan Finlay2017-09-282-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Version 3.10.4v3.10.4Dan Finlay2017-09-282-1/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #2155 from MetaMask/filter-fixes-moarDan Finlay2017-09-287-28/+56
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-2821-260/+397
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #2153 from MetaMask/BreakOutKeyringControllerkumavis2017-09-284-169/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut...kumavis2017-09-2712-56/+663
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #2183 from MetaMask/Fix2094Kevin Serrano2017-09-274-24/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2094 from MetaMask/AddBalanceControllerDan Finlay2017-09-2716-69/+338
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pass blocktracker to balances controllerDan Finlay2017-09-271-0/+1
| * | | | | | | | | Add computed balance to mock stateDan Finlay2017-09-271-1/+3
| * | | | | | | | | Make encryptor configurable for keyring-controllerDan Finlay2017-09-261-1/+1
| * | | | | | | | | Add mock random value generatorDan Finlay2017-09-261-0/+4
| * | | | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-262-1/+3
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make blockTracker an independent paramDan Finlay2017-09-262-3/+6
| * | | | | | | | | | Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin in...Dan Finlay2017-09-265-9/+35
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-265-9/+35
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implemented feedbackDan Finlay2017-09-263-20/+12
| |/ / / / / / / / / / /
| * | | | | | | | | | | Made some requested changesDan Finlay2017-09-261-7/+7
* | | | | | | | | | | | Merge pull request #2174 from MetaMask/i2162-TokenPrecisionThomas Huang2017-09-272-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix token precision bugDan Finlay2017-09-272-1/+3
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | | | * | | | | | | | Remove keyring controller from projectDan Finlay2017-09-235-764/+3
| | | | * | | | | | | | Merge branch 'AddBalanceController' into BreakOutKeyringControllerDan Finlay2017-09-2314-68/+333
| | | | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix test referencesDan Finlay2017-09-232-3/+3
| | * | | | | | | | | | 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-2339-433/+434
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | 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
| | * | | | | | | | | | | Fix testDan Finlay2017-09-141-0/+5
| | * | | | | | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-1414-166/+292
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add computed balance to account detail viewDan Finlay2017-09-146-10/+20
| | * | | | | | | | | | | | Use computed balance for tx confirmationDan Finlay2017-09-142-4/+6
| | * | | | | | | | | | | | 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-134-1/+144
| | * | | | | | | | | | | | Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceControllerDan Finlay2017-09-122-0/+149
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | LintedDan Finlay2017-09-081-2/+1
| | | * | | | | | | | | | | | Improve test nameDan Finlay2017-09-081-1/+1
| | | * | | | | | | | | | | | Make tx calculations account for gas pricesDan Finlay2017-09-081-2/+8
| | | * | | | | | | | | | | | Add test for computing gas priceDan Finlay2017-09-081-0/+16
| | | * | | | | | | | | | | | Remove logsDan Finlay2017-09-082-13/+0
| | | * | | | | | | | | | | | Fix balance calc testDan Finlay2017-09-082-1/+3
| | | * | | | | | | | | | | | Add constructor commentDan Finlay2017-09-081-0/+5
| | | * | | | | | | | | | | | Fix valueFor testDan Finlay2017-09-082-11/+13
| | | * | | | | | | | | | | | Add basic test for valueForDan Finlay2017-09-082-7/+31
| | | * | | | | | | | | | | | test not passingDan Finlay2017-09-082-4/+49
| | | * | | | | | | | | | | | Check balances in parallelDan Finlay2017-09-071-1/+8
| | | * | | | | | | | | | | | Add first passing balance calc testDan Finlay2017-09-072-7/+26
| | | * | | | | | | | | | | | Add test templateDan Finlay2017-09-071-0/+37
| | | | | | | * | | | | | | | Allow metamaskController to define keyring typesDan Finlay2017-09-231-1/+1
| | | | | | | | * | | | | | | Merge pull request #2180 from MetaMask/proxy-blockTrackerkumavis2017-09-274-22/+41
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * | | | | | | network contoller - clean up unused codefrankiebee2017-09-271-6/+0
| | | | | | | | | * | | | | | | fix testfrankiebee2017-09-271-1/+1
| | | | | | | | | * | | | | | | 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-273-14/+40
| | | | | | | | |/ / / / / / /
| | | | | | | | * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f...kumavis2017-09-232-0/+66
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / | | | | | |/| | | | | | | | |
| | | | | | | | * | | | | | | deps - bump filter deps and add random missing depskumavis2017-09-231-2/+4
| | | | | | | | * | | | | | | metamask - use provider-engines block trackerkumavis2017-09-231-1/+1
| | | | | | | | * | | | | | | deps - bump provider engine for block trackerkumavis2017-09-231-1/+1
| | | | | | | | * | | | | | | deps - bump eth-block-trackerkumavis2017-09-231-0/+1
| | | | | | | | * | | | | | | bug - fix event emitter mem leak warningkumavis2017-09-221-3/+8
| | | | | | | | | | | | * | | Add AUD, HKD, SGD, IDR, PHP to currency conversion listtmashuang2017-09-282-0/+57
| | | | | | | | | | | | * | | Remove old conversion list.Kevin Serrano2017-09-271-207/+0
| | | | | | | | | | | | * | | Polish names on currency list.Kevin Serrano2017-09-271-7/+7
| | | | | | | | | | | | * | | Account for undefined currencies.Kevin Serrano2017-09-271-1/+2
| | | | | | | | | | | | * | | Modify tests for new API.Kevin Serrano2017-09-271-10/+10
| | | | | | | | | | | | * | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-278-8/+101
| | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #2170 from MetaMask/greenkeeper/sinon-4.0.0kumavis2017-09-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | chore(package): update sinon to version 4.0.0greenkeeper[bot]2017-09-261-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #2143 from MetaMask/Version-3.10.3kumavis2017-09-262-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Version 3.10.3Dan Finlay2017-09-222-1/+3
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2145 from MetaMask/ConfigurableEncryptionkumavis2017-09-265-11/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Define encryptor in constructor params instead of platform objectDan Finlay2017-09-232-5/+11
| * | | | | | | | | | | Patch security updateDan Finlay2017-09-231-1/+1
| * | | | | | | | | | | Add platform docs including encryptor paramDan Finlay2017-09-221-4/+25
| * | | | | | | | | | | Merge branch 'master' into ConfigurableEncryptionDan Finlay2017-09-223-1/+67
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2104 from MetaMask/AddPlatformGuidekumavis2017-09-222-0/+66
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add guide to porting to new platformsDan Finlay2017-09-152-0/+66
| | * | | | | | | | | | Allow custom encryptor to be passed to MetaMaskController and KeyringControll...Dan Finlay2017-09-223-6/+4
| |/ / / / / / / / / / |/| | | | | | | | | |
| | | | | | | | * | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-2122-237/+149
| | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #2129 from MetaMask/json-rpc-engine-bumpv3.10.3Frankie2017-09-202-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | changelog - add note on filter fixeskumavis2017-09-201-0/+1
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-en...kumavis2017-09-2026-262/+191
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #2126 from MetaMask/v3.10.2-1Frankie2017-09-202-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | v3.10.2 - changelogkumavis2017-09-191-0/+4
| * | | | | | | | | | | v3.10.2kumavis2017-09-191-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2121 from MetaMask/i2115-DoNotFailOnRetriesv3.10.2Frankie2017-09-192-3/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bump changelogDan Finlay2017-09-191-0/+2
| * | | | | | | | | | | Do not mark a retry tx failed that has been broadcast successfullyDan Finlay2017-09-191-3/+9
* | | | | | | | | | | | Merge pull request #2119 from MetaMask/mascara-tests2Frankie2017-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tests - integration - re-add mascara to normal runkumavis2017-09-191-1/+1
* | | | | | | | | | | | | Merge pull request #2118 from MetaMask/mascara-testskumavis2017-09-191-1/+1
|\| | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | test - integration - bump timeoutkumavis2017-09-191-1/+1
* | | | | | | | | | | | Merge pull request #2098 from MetaMask/mascara-testsFrankie2017-09-1917-229/+114
|\| | | | | | | | | | | | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | tests - integration - remove failing mascara integration tests from normal ru...kumavis2017-09-191-1/+1
| * | | | | | | | | | tests - mascara - increase timeout before test startskumavis2017-09-161-1/+1
| * | | | | | | | | | test - mascara - move skip reload test flagkumavis2017-09-162-1/+1
| * | | | | | | | | | mascara - proxy - small cleanupkumavis2017-09-161-2/+1
| * | | | | | | | | | tests - integration - add mascara to integration test runkumavis2017-09-161-1/+1
| * | | | | | | | | | tests - integration - mascara - small cleanup and timeout adjustmentskumavis2017-09-162-9/+5
| * | | | | | | | | | set time if platform is mascarafrankiebee2017-09-162-2/+5
| * | | | | | | | | | remove testem filesfrankiebee2017-09-163-35/+1
| * | | | | | | | | | dont reload on initial download and wait before passing sw to uifrankiebee2017-09-163-18/+28
| * | | | | | | | | | tests - integration - get flat and mascara tests closer to compatiblekumavis2017-09-149-142/+18
| * | | | | | | | | | tests - refactor and rename npm scriptskumavis2017-09-143-24/+25
| * | | | | | | | | | tests - mascara - move temp build files into dist/mascarakumavis2017-09-142-10/+10
| * | | | | | | | | | tests - start migrating mascara tests to karmakumavis2017-09-148-17/+50
| * | | | | | | | | | tests - break out coveralls npm scriptkumavis2017-09-141-1/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2117 from MetaMask/Version-3.10.1kumavis2017-09-192-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Version 3.10.1v3.10.1Dan Finlay2017-09-192-1/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2075 from MetaMask/mixed-caseDan Finlay2017-09-193-0/+13
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mixed-caseDan Finlay2017-09-1914-196/+218
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check if all lower or upper before doing checksum.Kevin Serrano2017-09-131-1/+1
| * | | | | | | | | | | Changelogaroo.Kevin Serrano2017-09-131-0/+1
| * | | | | | | | | | | Add specific error message for failed address checksum.Kevin Serrano2017-09-132-0/+12
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | | | * | | | | | | deps - bump json-rpc-middleware-streamkumavis2017-09-201-1/+1
| | | | * | | | | | | deps - bump json-rpc-enginekumavis2017-09-201-2/+1
| | | | | | | | | | * Comply with current currency API and add additional styling.Kevin Serrano2017-09-193-4/+4
| | | | | | | | | | * Fix the property query for new currencies.Kevin Serrano2017-09-191-2/+2
| | | | | | | | | | * Fix the changelog again.Kevin Serrano2017-09-191-3/+2
| | | | | | | | | | * Add additional attribution to changelog.Kevin Serrano2017-09-191-0/+3
| | | | | | | | | | * Another merge conflict resolved.Roman Rodov2017-09-191-4/+4
| | | | | | | | | | * Resolve merge conflicts for currency sort merge.Roman Rodov2017-09-191-1/+3
| | | | | | | | | | * Merge branch 'master' into new-currency-testKevin Serrano2017-09-1916-198/+220
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #2080 from MetaMask/fix-tooltipDan Finlay2017-09-194-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into fix-tooltipDan Finlay2017-09-1913-195/+216
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #2093 from MetaMask/max-validationDan Finlay2017-09-192-25/+41
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Haha silly me, only when gas is estimated and not explicit.Kevin Serrano2017-09-141-1/+1
| * | | | | | | | | | Bump changelog.Kevin Serrano2017-09-141-0/+1
| * | | | | | | | | | Lower warning threshold for high tx fee to account for fluctuating blockGasLi...Kevin Serrano2017-09-141-1/+2
| * | | | | | | | | | Add warning of higher failure risk since app proposed gasLimit.Kevin Serrano2017-09-141-25/+39
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2070 from MetaMask/filter-leak-fix3Dan Finlay2017-09-1512-170/+175
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'filter-leak-fix3' of github.com:MetaMask/metamask-extension int...kumavis2017-09-142-1/+2
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into filter-leak-fix3kumavis2017-09-142-1/+2
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | createOriginMiddleware - fix var namekumavis2017-09-141-1/+1
| |/ / / / / / / / /
| * | | | | | | | | changelog - add note of filter memory leak fixkumavis2017-09-141-0/+1
| * | | | | | | | | metamask controller - destroy filter polyfill on disconnectkumavis2017-09-141-4/+10
| * | | | | | | | | metamask controller - move middleware into seperate fileskumavis2017-09-145-35/+45
| * | | | | | | | | 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-1318-182/+339
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | 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-125-19/+28
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | inpage - use obj-multiplex modulekumavis2017-09-081-6/+6
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-0823-56/+193
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | lint - remove dead codekumavis2017-09-081-1/+0
| * | | | | | | | | | | deps - bump jsonrpc filters for log filter formate fixkumavis2017-09-081-1/+1
| * | | | | | | | | | | 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-085-81/+44
| * | | | | | | | | | | inpage - add idRemapMiddlewarekumavis2017-09-082-1/+4
| * | | | | | | | | | | inpage - use json-rpc-engine for inpage-providerkumavis2017-08-253-46/+43
| | | | | * | | | | | | changelog.Kevin Serrano2017-09-131-0/+1
| | | | | * | | | | | | fixed position of tooltips to avoid overflow.Kevin Serrano2017-09-133-3/+3
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
| | | | | | | | | | * Modify conversion to new api.Kevin Serrano2017-09-152-58/+597
| | | | | | | | | | * Merge branch 'master' into new-currency-testKevin Serrano2017-09-1433-236/+483
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #2079 from MetaMask/FixSupportLinkKevin Serrano2017-09-132-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bump changelogDan Finlay2017-09-131-0/+1
| * | | | | | | | | | Fix support linkDan Finlay2017-09-131-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0kumavis2017-09-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | chore(package): update babel-eslint to version 8.0.0greenkeeper[bot]2017-09-121-1/+1
* | | | | | | | | | | Merge pull request #2074 from MetaMask/export-state-logskumavis2017-09-132-3/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add to changelog.Kevin Serrano2017-09-131-0/+1
| * | | | | | | | | | | Convert state logs into a download.Kevin Serrano2017-09-131-3/+4
* | | | | | | | | | | | Merge pull request #2069 from MetaMask/integration-tests-fix2Thomas Huang2017-09-138-80/+172
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ci - remove old testem configkumavis2017-09-121-9/+0
| * | | | | | | | | | | tests - integration - fix bad cherry-pickkumavis2017-09-121-16/+7
| * | | | | | | | | | | test - integration - drop testem for karmakumavis2017-09-125-56/+150
| * | | | | | | | | | | test - integration - remove redundant testem scriptskumavis2017-09-122-2/+0
| * | | | | | | | | | | test - integration - build - manually exit from test builder + add bundle des...kumavis2017-09-121-1/+2
| * | | | | | | | | | | ci - dont attempt to submit coveralls if not configuredkumavis2017-09-121-1/+1
| * | | | | | | | | | | test - integration - build - use pump + log bundling informationkumavis2017-09-121-6/+12
| * | | | | | | | | | | ci - deps - download latest chrome and firefoxkumavis2017-09-121-1/+12
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #2072 from MetaMask/kumavis-patch-2Kevin Serrano2017-09-121-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Rename add-to-firef.md to add-to-firefox.mdkumavis2017-09-121-0/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2068 from MetaMask/export-as-fileDan Finlay2017-09-124-9/+48
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typo.Kevin Serrano2017-09-121-2/+2
| * | | | | | | | | | Change the changelogKevin Serrano2017-09-121-0/+3
| * | | | | | | | | | Add ability to save seed words as file.Kevin Serrano2017-09-121-0/+10
| * | | | | | | | | | Add some styling.Kevin Serrano2017-09-121-0/+3
| * | | | | | | | | | Move function as util function.Kevin Serrano2017-09-122-16/+18
generated by cgit (git 2.34.1) at 2024-10-14 16:21:23 +0800