aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2379 from MetaMask/FixImportedTypedDataSigningKevin Serrano2017-10-172-1/+2
|\
| * Bump changelogDan Finlay2017-10-161-0/+1
| * Bump version on eth-simple-keyringDan Finlay2017-10-161-1/+1
|/
* Merge pull request #2352 from MetaMask/i1340-SynchronousInjectionkumavis2017-10-133-5/+13
|\
| * contentscript - fix inpage require and bundlingkumavis2017-10-131-4/+4
| * Break up inpage file read into multiple linesDan Finlay2017-10-131-1/+3
| * Increase build readabilityDan Finlay2017-10-131-2/+7
| * Merge branch 'master' into i1340-SynchronousInjectionDan Finlay2017-10-1341-217/+742
| |\ | |/ |/|
* | Merge pull request #2345 from MetaMask/Version-3.11.0Thomas Huang2017-10-132-2/+4
|\ \
| * | Version 3.11.0v3.11.0Dan Finlay2017-10-122-2/+4
* | | Merge pull request #2318 from MetaMask/network-controller-clientFrankie2017-10-1211-96/+105
|\ \ \ | |/ / |/| |
| * | deps - bump eth-rpc-client for fixkumavis2017-10-121-1/+1
| * | nonce-tracker - use blockTracker directlykumavis2017-10-123-10/+8
| * | ui - network - fix localhost active statuskumavis2017-10-111-1/+1
| * | network - convert localhost from custom rpc to network typekumavis2017-10-110-0/+0
| * | test - integration - intercept reload attemptskumavis2017-10-111-0/+3
| * | deps - bump eth-json-rpc-middleware for fixkumavis2017-10-111-1/+1
| * | network-controller - use obj-proxy for providerProxykumavis2017-10-113-25/+11
| * | util - add obj-proxykumavis2017-10-111-0/+19
| * | events-proxy - clean upkumavis2017-10-111-5/+5
| * | lint fixeskumavis2017-10-112-8/+3
| * | network controller - refactor to use eth-rpc-clientkumavis2017-10-113-29/+36
| * | metamask controller - define this.newTransaction to ease instantiation orderkumavis2017-10-111-1/+6
| * | metamask controller - simplify provider initkumavis2017-10-111-22/+16
| * | metamask controller - breakout getAccounts methodkumavis2017-10-111-12/+14
* | | Merge pull request #2344 from MetaMask/FixTokenHelpLinkDan Finlay2017-10-122-1/+2
|\ \ \ | |/ / |/| |
| * | Fix link to token support pageDan Finlay2017-10-122-1/+2
|/ /
* | Merge pull request #2296 from MetaMask/precision-fixDan Finlay2017-10-102-4/+45
|\ \
| * | Make modificationKevin Serrano2017-10-101-1/+1
| * | Fix to actually fail in earlier versions.Kevin Serrano2017-10-101-5/+7
| * | Add test to look for wei precision.Kevin Serrano2017-10-101-0/+36
| * | Merge branch 'master' into precision-fixKevin Serrano2017-10-107-8/+97
| |\ \
| * \ \ Merge branch 'master' into precision-fixKevin Serrano2017-10-062-1/+4
| |\ \ \
| * | | | Fix precision to account for small wei increase.Kevin Serrano2017-10-061-4/+7
* | | | | Merge pull request #2223 from ukstv/masterDan Finlay2017-10-1013-12/+397
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | More appropriate stylingSergey Ukustov2017-10-081-1/+2
| * | | | Validate data format for eth_signTypedDataSergey Ukustov2017-10-072-1/+5
| * | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-075-2/+84
| |\ \ \ \
| * | | | | Bump changelogDan Finlay2017-10-061-0/+2
| * | | | | Merge branch 'Version-3.10.9' into SignTypedDataDan Finlay2017-10-062-1/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into SignTypedDataDan Finlay2017-10-0611-90/+83
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Bump provider-engine for better sender validationsDan Finlay2017-10-061-1/+1
| * | | | | | Add signTypedData input validationsDan Finlay2017-10-062-4/+20
| * | | | | | Require keyring-controller 2.1.0Dan Finlay2017-10-061-1/+1
| * | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-0610-47/+52
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-0318-224/+193
| |\ \ \ \ \ \ \
| * | | | | | | | Respect code styleSergey Ukustov2017-09-302-3/+2
| * | | | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-3011-9/+372
* | | | | | | | | Merge pull request #2305 from MetaMask/nodeifyFrankie2017-10-072-6/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge branch 'nodeify' of github.com:MetaMask/metamask-extension into nodeifykumavis2017-10-071-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | lint fix - nodeifykumavis2017-10-071-1/+1
| * | | | | | | | | nodeify - fix testkumavis2017-10-071-4/+3
| |/ / / / / / / /
| * | | / / / / / nodeify - allow callback to be optionalkumavis2017-10-071-2/+10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInitkumavis2017-10-072-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Check status of pending transactions on startupDan Finlay2017-10-072-0/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #2306 from MetaMask/i2294-MarkTxAsFailedAfterSameNonceIsMinedkumavis2017-10-074-2/+81
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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-073-3/+11
| * | | | | | | Add failing test for issue #2294Dan Finlay2017-10-071-1/+52
|/ / / / / / /
* | | | | | | Merge pull request #2293 from MetaMask/Version-3.10.9kumavis2017-10-062-1/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Version 3.10.9v3.10.9Dan Finlay2017-10-062-1/+4
|/ / / / /
* | | | | Merge pull request #2292 from MetaMask/rebrocast-by-timeStampDan Finlay2017-10-063-4/+7
|\ \ \ \ \
| * | | | | add to CHANGELOG.mdfrankiebee2017-10-061-0/+1
| * | | | | "fix" hours for messagefrankiebee2017-10-061-1/+2
| * | | | | Merge branch 'master' into rebrocast-by-timeStampfrankiebee2017-10-063-6/+6
| |\| | | |
| * | | | | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-062-4/+5
* | | | | | Merge pull request #2289 from MetaMask/mascara-tuneupsThomas Huang2017-10-068-86/+76
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | mascara/background: use async awaitfrankiebee2017-10-051-20/+13
| * | | | | use log.debugfrankiebee2017-10-051-3/+3
| * | | | | mascara: linting and code clean upfrankiebee2017-10-055-58/+41
| * | | | | dont lint jqueryfrankiebee2017-10-051-1/+1
| * | | | | add /mascara to lintingfrankiebee2017-10-051-1/+1
| * | | | | mascara:exampl/app - add a send tx buttonfrankiebee2017-10-052-8/+22
* | | | | | Merge pull request #2282 from MetaMask/Enforce0xPrefixForKeyringsThomas Huang2017-10-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enforce 0x prefix on accounts with new hd keyringDan Finlay2017-10-051-1/+1
|/ / / / /
* | | | | Merge pull request #2276 from MetaMask/revert-computeDan Finlay2017-10-052-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert to normal balances.Kevin Serrano2017-10-052-5/+5
| | | | * Begin implementing sync injection ideaDan Finlay2017-10-052-4/+3
| |_|_|/ |/| | |
* | | | Merge pull request #2279 from MetaMask/filter-default-fixFrankie2017-10-051-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | deps - bump eth-json-rpc-filters for log filter fixkumavis2017-10-051-1/+1
|/ / /
* | | Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0Thomas Huang2017-10-041-1/+1
|\ \ \
| * | | chore(package): update coveralls to version 3.0.0greenkeeper[bot]2017-09-291-1/+1
| |/ /
* | | Merge pull request #2264 from MetaMask/greenkeeper/mocha-4.0.0Thomas Huang2017-10-041-1/+1
|\ \ \
| * | | chore(package): update mocha to version 4.0.0greenkeeper[bot]2017-10-031-1/+1
* | | | Merge pull request #2175 from MetaMask/RemoveSlackLinkKevin Serrano2017-10-042-7/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-10-0346-1925/+1786
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-09-2718-82/+356
| |\ \ \ \
| * | | | | Remove slack linkDan Finlay2017-09-272-7/+2
* | | | | | Merge pull request #2250 from interfect/masterFrankie2017-10-041-1/+0
|\ \ \ \ \ \
| * | | | | | Don't pass origin as an HTTP headerAdam Novak2017-10-021-1/+0
* | | | | | | Merge pull request #2251 from BrandenSoropia/remove-metamask-titleKevin Serrano2017-10-041-8/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Removed MetaMasktitle. Fixed #1730.Branden Soropia2017-10-021-8/+0
| |/ / / / /
* | | | | | Merge pull request #2261 from MetaMask/retry-warn-not-failFrankie2017-10-033-22/+41
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | ui - tx history - simplify error+warning display codekumavis2017-10-031-12/+22
| * | | | | pending tx tracker - on tx:warn append error message instead of error objkumavis2017-10-031-1/+1
| * | | | | pending tx tracker - test - expect warning event on resubmit failurekumavis2017-10-031-2/+9
| * | | | | pending tx tracker - tx:warning event includes err objkumavis2017-10-031-2/+2
| * | | | | pending tx tracker - test - rename tests to match event namekumavis2017-10-031-4/+4
| * | | | | 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 pull request #2260 from MetaMask/history-noteskumavis2017-10-034-17/+23
|\ \ \ \ \
| * \ \ \ \ Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h...kumavis2017-10-034-6/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into history-notesfrankiebee2017-10-034-3/+27
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #2259 from MetaMask/tx-history-fixFrankie2017-10-033-2/+25
|\ \ \ \ \ \ \
| * | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTxkumavis2017-10-033-2/+25
* | | | | | | | Merge pull request #2254 from MetaMask/block-cache-fixKevin Serrano2017-10-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | deps - bump pe for block cache fixkumavis2017-10-031-1/+1
|/ / / / / / /
* | | | | | | 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
| | * | | | | tx state history - test - fix format of history entrieskumavis2017-10-031-0/+26
| | |/ / / /
| | * / / / transaction - provide notes for historyfrankiebee2017-10-032-12/+14
| |/ / / / |/| | | |
* | | | | Merge pull request #2241 from MetaMask/Version-3.10.8-FixCurrencyDan Finlay2017-09-303-2/+6
|\ \ \ \ \
| * | | | | Version 3.10.8 - Fix Currency Conversionv3.10.8Dan Finlay2017-09-303-2/+6
|/ / / / /
* | | | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactionskumavis2017-09-305-77/+2
|\ \ \ \ \
| * | | | | pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-305-77/+2
* | | | | | 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-305-62/+56
|\| | | | | |
| * | | | | | network - remove long dead etherscan provider codekumavis2017-09-301-10/+0
| * | | | | | network - convert localhost from custom rpc to network typekumavis2017-09-305-23/+12
| * | | | | | network controller - small refactorkumavis2017-09-302-35/+50
| |/ / / / /
* | | | | | Merge pull request #2234 from MetaMask/Version-3.10.7kumavis2017-09-302-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Version 3.10.7v3.10.7Dan Finlay2017-09-302-1/+3
|/ / / / /
* | | | | Merge pull request #2230 from MetaMask/ui-dev-fixDan Finlay2017-09-302-66/+69
|\ \ \ \ \
| * | | | | development - fix ui devkumavis2017-09-302-66/+69
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2228 from MetaMask/i2218-SelectAccountBugFixKevin Serrano2017-09-302-0/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Ensure selected account is always set if possibleDan Finlay2017-09-302-0/+10
|/ / / /
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 07:32:28 +0800