aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-232-0/+68
|\
| * Merge pull request #4199 from MetaMask/i3487-provider-errorsDan Finlay2018-05-192-0/+68
| |\
| | * Add new json-rpc-engine middleware for improved error handlingbitpshr2018-05-142-0/+68
* | | remove unused events-proxy, was replaced with module swappable-obj-proxykumavis2018-05-171-42/+0
|/ /
* / sentry - add helper to fully rewrite all error messageskumavis2018-05-011-17/+25
|/
* sentry - report error-like messages using the obj messagekumavis2018-05-011-0/+10
* sentry - wrap report modifiers in a try-catchkumavis2018-05-011-16/+24
* Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-011-21/+1
|\
| * Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-233-5/+41
| |\
| * | Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-221-21/+1
* | | guard adainst raven erroringfrankiebee2018-04-301-17/+20
* | | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3kumavis2018-04-265-784/+0
|\ \ \
| * | | Merge branch 'master' into tx-controller-rewrite-v3frankiebee2018-04-2019-59/+304
| |\| |
| * | | meta - transactions - create a transactions dir in controller and move releva...frankiebee2018-04-115-784/+0
* | | | lint fixDan2018-04-241-0/+1
* | | | Merge branch 'master' into dm-docs-2Dan2018-04-244-17/+52
|\ \ \ \
| * | | | Clean up network configAlexander Tseung2018-04-241-12/+11
| | |_|/ | |/| |
| * | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshrDan Finlay2018-04-213-5/+41
| |\ \ \ | | |_|/ | |/| |
| | * | Clean up JSDoc for background scriptsbitpshr2018-04-202-3/+3
| | * | Add more documentation to computed balances controllerbitpshr2018-04-203-5/+41
* | | | Remove accidentally added code in message-manager.Dan2018-04-241-8/+0
* | | | Remove unnecessary doc comment.Dan2018-04-241-2/+0
* | | | Fix nits.Dan2018-04-243-32/+32
* | | | Minor fixes in a number of docs.Dan2018-04-215-16/+15
* | | | Notification manager method docs.Dan2018-04-211-4/+31
* | | | Merge branch 'master' into dm-docs-2Dan2018-04-2016-74/+238
|\| | |
| * | | Merge pull request #3984 from whymarrh/3941-jsdocDan Finlay2018-04-197-28/+120
| |\ \ \
| | * | | Add a few missing docblocks to background filesWhymarrh Whitby2018-04-197-28/+120
| * | | | Merge pull request #3987 from MetaMask/dm-docs-1Dan Finlay2018-04-194-0/+75
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into dm-docs-1Dan2018-04-1910-46/+97
| | |\| |
| * | | | Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-191-1/+21
| | |/ / | |/| |
| * | | Fix confirmation popup not always openingAlexander Tseung2018-04-174-30/+33
| * | | Require loglevel singleton in each module that uses itbitpshr2018-04-145-1/+6
| * | | Add tests for ComposableObservableStorebitpshr2018-04-141-11/+11
| * | | Add ComposableObservableStore for subscription managementbitpshr2018-04-131-0/+49
* | | | Even more documentation for various controllers and libs.Dan2018-04-199-40/+571
| |/ / |/| |
* | | Add missing descriptions in util.jsDan2018-04-171-4/+4
* | | Document async function as returning a promise.Dan2018-04-171-1/+1
* | | Typo fixes, type fixes on the return clauses of the buyEthUrl and getPreffere...Dan2018-04-172-3/+4
* | | @params -> @param fixDan2018-04-171-2/+2
* | | Documentation for various controllers and libsDan2018-04-175-3/+74
* | | Documentation for environemnt-type.jsDan2018-04-121-0/+9
|/ /
* | Merge pull request #3921 from MetaMask/gh-3736-react-routerkumavis2018-04-101-1/+2
|\ \ | |/ |/|
| * Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-064-6/+64
| |\
| * \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-052-35/+2
| |\ \
| * \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-042-3/+11
| |\ \ \
| * \ \ \ Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-031-2/+11
| |\ \ \ \
| * \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-311-3/+2
| |\ \ \ \ \
| * \ \ \ \ \ Fix i18n merge conflictsAlexander Tseung2018-03-305-36/+73
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-279-20/+255
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-092-0/+22
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Fix merge conflicts from uat-nextAlexander Tseung2018-02-011-1/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-304-20/+55
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-1/+2
* | | | | | | | | | | | tx-state-manager - dont remove old tx history if candidate is not foundkumavis2018-04-071-2/+4
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #3857 from MetaMask/match-local-localecodeskumavis2018-04-061-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-fir...Dan2018-04-041-2/+4
| * | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from local direc...Dan2018-04-041-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3900 from MetaMask/migration-error-reportFrankie2018-04-062-4/+56
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | migrator - dont overwrite error stack and warn to consolekumavis2018-04-061-2/+5
| * | | | | | | | | | | migrator - fix typokumavis2018-04-061-1/+1
| * | | | | | | | | | | migrations - report migrations errors to sentry with vault structurekumavis2018-04-062-4/+53
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* / | | | | | | | | | Fix populating txParams with undefined dataAlexander Tseung2018-04-061-0/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...frankiebee2018-04-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tx - txParams - allow chainId to be a hex stringkumavis2018-04-041-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* / | | | | | | | | transactions - normalize txParamsfrankiebee2018-04-051-34/+1
|/ / / / / / / / /
* | | | | | | | | tx-state-manager - validateTxParams - validate chainId is Numberkumavis2018-04-041-2/+10
* | | | | | | | | transactions - dont throw if chain id is not a stringfrankiebee2018-04-041-2/+2
* | | | | | | | | build - correctly set METAMASK_ENV via envifykumavis2018-04-041-1/+1
|/ / / / / / / /
* | | | | | | | transactions gasLimit - use the block gasLimit if getCode failsfrankiebee2018-04-031-1/+3
* | | | | | | | transactions validationt - valdate from field on txParamsfrankiebee2018-04-031-1/+8
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #3782 from MetaMask/i3670-FixNonceBugFrankie2018-03-291-3/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Rename variable to be more understandableDan Finlay2018-03-291-3/+2
* | | | | | | Merge pull request #3765 from MetaMask/sentry-error-simplifyFrankie2018-03-291-2/+12
|\ \ \ \ \ \ \
| * | | | | | | sentry - simplify error message 'Transaction Failed: known transaction'kumavis2018-03-281-2/+12
* | | | | | | | tx controller - explode on non-hex txParams + dont add chainId to txParams + ...kumavis2018-03-281-5/+11
|/ / / / / / /
* | | | | | | Merge pull request #3752 from MetaMask/sentry-error-fixFrankie2018-03-283-25/+35
|\ \ \ \ \ \ \
| * | | | | | | sentry - simplify all ethjs errors for better batchingkumavis2018-03-283-25/+35
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | i18n - derrive locale codes from indexkumavis2018-03-281-3/+2
* | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-281-6/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | transactions - only save up to 40 txs totall across all networksfrankiebee2018-03-271-6/+1
| |/ / / / /
* | | | | | Remove comments and console.logsDan2018-03-271-2/+1
* | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-271-3/+29
|\| | | | |
| * | | | | lint - fixkumavis2018-03-241-1/+1
| * | | | | sentry - namespace files under metamask dirkumavis2018-03-241-2/+2
| * | | | | sentry - rewrite report urls + use raven-js from npmkumavis2018-03-241-4/+30
* | | | | | Use extension api to get initial locale.Dan2018-03-221-0/+18
|/ / / / /
* | | | | Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into...kumavis2018-03-221-5/+6
|\ \ \ \ \
| * | | | | remove console logJeffrey Tong2018-03-121-2/+0
| * | | | | add comments that need clarification on naming conventionJeffrey Tong2018-03-121-6/+8
| * | | | | fixed multiple notification windows when executing batchJeffrey Tong2018-03-081-1/+4
| * | | | | removed check for width & height on multiple popup windowsJeffrey Tong2018-03-081-3/+1
* | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-151-4/+28
|\ \ \ \ \ \
| * | | | | | local-store - fix class syntaxkumavis2018-03-151-2/+2
| * | | | | | local-store - check for error from extension.runtimekumavis2018-03-151-3/+28
| * | | | | | local-store - fix promisification of methodskumavis2018-03-151-3/+2
| * | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
* | | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
* | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-142-2/+42
|\| | | | | |
| * | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadkumavis2018-03-141-2/+4
| |\ \ \ \ \ \
| | * | | | | | tx-gas-utils - fix code stylekumavis2018-03-141-1/+1
| | * | | | | | transactions move validation of the to field to validateRecipientfrankiebee2018-03-141-7/+3
| | * | | | | | Merge remote-tracking branch 'origin/i#3509' into i#3509frankiebee2018-03-142-1/+49
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into i#3509Frankie2018-03-142-1/+49
| | | |\ \ \ \ \ \
| | * | | | | | | | fix error messagefrankiebee2018-03-141-1/+1
| | |/ / / / / / /
| | * | | | | | | transactions - insure if a to field in tx params has a truthy valu that it is...frankiebee2018-03-141-1/+7
| * | | | | | | | lint fixkumavis2018-03-091-1/+1
| * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us...kumavis2018-03-091-0/+48
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | background - storage - cleanup storage wiringkumavis2018-03-091-8/+22
| * | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-081-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-0710-5/+114
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Fix retrieval of objectDan Finlay2018-01-251-2/+1
| * | | | | | | | Remove redundant async modifiersDan Finlay2018-01-251-2/+2
| * | | | | | | | Remove extension-store since we aren't using it yetDan Finlay2018-01-251-39/+0
| * | | | | | | | Check that extension.storage exists before attempting to call methods on it.Dan2018-01-241-3/+3
| * | | | | | | | Merge branch 'UseStorageLocal' into i3076-UseStorageLocalInsteadDan Finlay2018-01-242-0/+64
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Modify @heyellieday's work to use storage.local to replace main storageDan Finlay2018-01-241-0/+25
| | * | | | | | | | conditionally use extension store if supported or enabledEllie Day2018-01-031-0/+4
| | * | | | | | | | handle situation where storage.sync is disabled in certain versions of firefoxEllie Day2018-01-031-2/+17
| | * | | | | | | | Add ExtensionStore and add basic store instance syncing to main controllerEllie Day2017-12-231-0/+20
* | | | | | | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp o...frankiebee2018-03-141-0/+4
* | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-092-1/+49
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-081-0/+48
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | add documentationCsaba Solya2018-03-041-0/+5
| | * | | | | | | | verify addresses regardless caseCsaba Solya2018-03-031-1/+1
| | * | | | | | | | fix lint issuesCsaba Solya2018-03-031-9/+9
| | * | | | | | | | seed phrase verifierCsaba Solya2018-03-031-0/+43
| | | |_|/ / / / / | | |/| | | | | |
| * / | | | | | | fix typo in tests and tx-state-managerJeffrey Tong2018-03-081-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-082-0/+64
|\| | | | | | |
| * | | | | | | sentry - extractErrorMessage - fix comment formattingkumavis2018-03-011-1/+1
| * | | | | | | sentry - failed tx - improve ethjs-rpc error formatingkumavis2018-03-011-0/+38
| * | | | | | | sentry - clean - move setupRaven to libkumavis2018-03-011-0/+26
* | | | | | | | refactor retrytx with higher gas price:frankiebee2018-03-081-10/+28
|/ / / / / / /
* | | | | | | Merge branch 'master' into uat-masterDan Finlay2018-02-222-2/+12
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #3250 from MetaMask/i#3136kumavis2018-02-161-2/+3
| |\ \ \ \ \ \ \
| | * | | | | | | fix - hex prefix estimatedGas on txMetafrankiebee2018-02-151-2/+3
| * | | | | | | | Fix incorrect promise instantiationDan Finlay2018-02-161-1/+1
| * | | | | | | | metamask mesh - inject mesh testing containerkumavis2018-02-111-0/+9
| |/ / / / / / /
* | | | | | | / Fix promise constructionDan Finlay2018-02-211-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'uat' into uat-nextDan2018-02-081-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Merge branch 'master' into uatDan2018-02-081-0/+11
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | |
| | * | | | | preserve other networks TXsBruno Barbieri2018-02-011-3/+4
| | * | | | | use txMeta.txParamsBruno Barbieri2018-01-311-1/+1
| | * | | | | wipe only transactions for current accountBruno Barbieri2018-01-311-3/+9
| | * | | | | clean upBruno Barbieri2018-01-311-3/+3
| | * | | | | added reset account featureBruno Barbieri2018-01-311-0/+4
| | |/ / / /
* | / / / / [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-081-0/+11
|/ / / / /
* | | | | Merge branch 'uat' into newmasterChi Kei Chan2018-01-203-2/+15
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-173-2/+15
| |\ \ \
| | * \ \ Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-043-2/+15
| | |\ \ \
| | | * \ \ Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-233-2/+15
| | | |\ \ \
| | | | * | | Merge branch 'master' into NewUI-flatDan2017-12-213-4/+10
| | | | |\| | | | | | | |/ | | | | |/|
| | | | * | Merge branch 'master' into NewUI-flatChi Kei Chan2017-12-071-3/+15
| | | | |\ \
| | | | * | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-1/+3
| | | | * | | Sign Typed Request styling fixesChi Kei Chan2017-10-261-1/+1
| | | | * | | Signature request fixes.Dan2017-10-261-1/+1
| | | | * | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-2511-26/+25
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-211-0/+23
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-192-1/+14
| | | | |\ \ \ \ \
| | | | | * | | | | UI for send screen container without form rows.Dan2017-10-091-1/+4
| | | | | * | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-043-28/+19
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch 'master' into mmnChi Kei Chan2017-09-287-175/+444
| | | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-191-3/+9
| | | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch 'master' into nmChi Kei Chan2017-09-1911-175/+250
| | | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-142-4/+15
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into NewUI-flatkumavis2017-08-093-33/+209
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-075-93/+28
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Adjust sidebar transition using @cjeria\'s feedbacksdtsui2017-08-031-0/+10
| | | | | * | | | | | | | | | | | Ensure app-header is rendered in responsive layoutsdtsui2017-08-031-1/+1
* | | | | | | | | | | | | | | | | test - tx controller - fix txGasUtil referencekumavis2018-01-181-1/+2
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Create new flag for simple sends to avoid overloading other flagDan Finlay2018-01-171-2/+2
* | | | | | | | | | | | | | | | Set gas limit to 21k for recipients with no codeDan Finlay2018-01-161-5/+22
* | | | | | | | | | | | | | | | Account for 0x/empty string address and contract creationThomas2018-01-081-0/+11
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-031-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tx-gas-utils - tx-param-validation - use more intuitive checkkumavis2018-01-031-2/+2
| * | | | | | | | | | | | | | | transactions - throw error if dapp provides txParams whos value has a decimalfrankiebee2017-12-211-2/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-291-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | transactions:pending - only check nonces of transactions who's from adress ma...frankiebee2017-12-281-1/+2
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* / | | | | | | | | | | | | | Fix some silly linting issues.Kevin Serrano2017-12-281-1/+1
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / Stop failing pending transactions after any period of timeDan Finlay2017-12-221-7/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | transactions:gas-utils - handle new type of estimateGas errorfrankiebee2017-12-151-1/+5
* | | | | | | | | | | | | dont aggresively query account datafrankiebee2017-12-141-2/+0
* | | | | | | | | | | | | tx-controller - failed state is a finished statekumavis2017-12-081-1/+1
* | | | | | | | | | | | | Add retry background method and actionDan Finlay2017-12-071-0/+4
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in...Dan2017-12-071-1/+1
* | | | | | | | | | | | Fix undefined latestBlockNumber in _resubmitTxDan2017-12-071-1/+1
* | | | | | | | | | | | Exponentional backoff on transaction retry in pending-tx-trackerDan2017-12-061-2/+14
* | | | | | | | | | | | deps - obs-store@3 + migrate stream plumbingkumavis2017-11-291-1/+3
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Fix lint warningsDaijiro Wachi2017-10-2211-26/+25
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | LintedDan Finlay2017-10-201-1/+1
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-193-27/+12
|\| | | | | | | | |
| * | | | | | | | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-193-27/+12
* | | | | | | | | | Make account tracking much more reactiveDan Finlay2017-10-191-3/+8
* | | | | | | | | | Make account tracking more reactiveDan Finlay2017-10-191-0/+18
|/ / / / / / / / /
* | | | | | | | | nonce-tracker - use blockTracker directlykumavis2017-10-121-7/+3
* | | | | | | | | util - add obj-proxykumavis2017-10-111-0/+19
* | | | | | | | | events-proxy - clean upkumavis2017-10-111-5/+5
* | | | | | | | | Merge pull request #2223 from ukstv/masterDan Finlay2017-10-101-0/+123
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Validate data format for eth_signTypedDataSergey Ukustov2017-10-071-0/+4
| * | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-072-1/+28
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into SignTypedDataDan Finlay2017-10-061-3/+5
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add signTypedData input validationsDan Finlay2017-10-061-0/+11
| * | | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-061-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-033-23/+12
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-301-0/+108
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2305 from MetaMask/nodeifyFrankie2017-10-071-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | lint fix - nodeifykumavis2017-10-071-1/+1
| * | | | | | | | | | | nodeify - allow callback to be optionalkumavis2017-10-071-2/+10
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInitkumavis2017-10-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check status of pending transactions on startupDan Finlay2017-10-071-0/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | When checking pending txs, check for successful txs with same nonce.Dan Finlay2017-10-071-0/+20
* | | | | | | | | | | Provide method for tx tracker to refer to all txsDan Finlay2017-10-071-1/+7
|/ / / / / / / / / /
* | | | | | | | | | "fix" hours for messagefrankiebee2017-10-061-1/+2
* | | | | | | | | | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-061-3/+4
|/ / / / / / / / /
* | | | | | | | | pending tx tracker - on tx:warn append error message instead of error objkumavis2017-10-031-1/+1
* | | | | | | | | pending tx tracker - tx:warning event includes err objkumavis2017-10-031-2/+2
* | | | | | | | | pending tx tracker - resubmit - warn dont error on unknown errorkumavis2017-10-031-2/+5
* | | | | | | | | pending tx tracker - dont throw on load failurekumavis2017-10-031-1/+0
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h...kumavis2017-10-031-1/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into history-notesfrankiebee2017-10-031-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTxkumavis2017-10-032-2/+3
* | | | | | | | | | tx state history - append note to first op of diffkumavis2017-10-031-2/+5
|/ / / / / / / / /
* / / / / / / / / transaction - provide notes for historyfrankiebee2017-10-031-5/+5
|/ / / / / / / /
* / / / / / / / pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-301-15/+0
|/ / / / / / /
* | | | | | | account-tracker - remove unused importkumavis2017-09-281-1/+0
* | | | | | | Merge branch 'master' into direct-block-trackerkumavis2017-09-284-37/+261
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3kumavis2017-09-283-36/+257
| |\ \ \ \ \ \ \
| | * | | | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin...frankiebee2017-09-271-2/+1
| | * | | | | | | transactions: make evnt names pretty and eaiser to readfrankiebee2017-09-271-8/+8
| | * | | | | | | transactions: lint fixes and reveal status-update event for balance controllerfrankiebee2017-09-271-6/+6
| | * | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-2711-185/+163
| | |\ \ \ \ \ \ \
| | * | | | | | | | ensure that values written to txParams are hex stringsfrankiebee2017-09-141-0/+9
| | * | | | | | | | linting && format fixingfrankiebee2017-09-131-5/+4
| | * | | | | | | | match other controller patternsfrankiebee2017-09-131-8/+13
| | * | | | | | | | fix miss typefrankiebee2017-09-091-1/+1
| | * | | | | | | | more tests and craete a getPendingTransactions functionfrankiebee2017-09-091-0/+6
| | * | | | | | | | remove unused variablefrankiebee2017-09-071-1/+0
| | * | | | | | | | fix merge and errors disaperaing on updatefrankiebee2017-09-071-2/+5
| | * | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-074-52/+136
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | add better commentsfrankiebee2017-09-061-1/+0
| | * | | | | | | | | rename tx-utils.js -> tx-gas-utils.jsfrankiebee2017-09-061-4/+0
| | * | | | | | | | | remove #buildEthTxFromParamsfrankiebee2017-09-061-17/+0
| | * | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-08-223-12/+56
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Create TxStateManagerfrankiebee2017-08-221-1/+18
| | * | | | | | | | | | Create tests for TxStateManagerfrankiebee2017-08-191-0/+201
| * | | | | | | | | | | Fix bug where block gas limit was incorrectly parsed.Dan Finlay2017-09-281-1/+3
* | | | | | | | | | | | style - small whitespace nitpickkumavis2017-09-281-1/+1
* | | | | | | | | | | | account-tracker - use new block-tracker block formatkumavis2017-09-281-4/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-282-55/+72
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Move obs store into account-tracker instead of inheritingDan Finlay2017-09-271-13/+18
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 11:51:26 +0800