aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
Commit message (Expand)AuthorAgeFilesLines
* lint fixDan2018-04-241-0/+1
* Merge branch 'master' into dm-docs-2Dan2018-04-2418-280/+867
|\
| * Use the metamask balanc3 dev price apiDan Finlay2018-04-241-1/+1
| * Merge pull request #4029 from MetaMask/DocumentMetaMaskControllerDan Finlay2018-04-241-131/+330
| |\
| | * Linted docsDan Finlay2018-04-241-1/+1
| | * Linted jsdocsDan Finlay2018-04-211-52/+60
| | * Added docs to MM-controllerDan Finlay2018-04-191-130/+321
| * | Merge pull request #3968 from MetaMask/gh-3653Dan Finlay2018-04-247-104/+151
| |\ \
| | * | Clean up network configAlexander Tseung2018-04-247-104/+151
| * | | Merge pull request #4041 from MetaMask/DocumentBackgroundDan Finlay2018-04-241-2/+127
| |\ \ \ | | |/ / | |/| |
| | * | Remove wrong charsDan Finlay2018-04-211-2/+2
| | * | Add ui note to background docsDan Finlay2018-04-211-1/+1
| | * | Lint background docsDan Finlay2018-04-211-12/+12
| | * | Document MetaMaskState and TransactionMetaDan Finlay2018-04-211-0/+69
| | * | Document Background ScriptDan Finlay2018-04-201-2/+58
| * | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshrDan Finlay2018-04-2111-79/+295
| |\ \ \ | | |/ / | |/| |
| | * | Clean up JSDoc for background scriptsbitpshr2018-04-207-24/+32
| | * | Add more documentation to computed balances controllerbitpshr2018-04-204-6/+77
| | * | Add JSDoc to various background scriptsbitpshr2018-04-193-11/+13
| | * | Add generated docsbitpshr2018-04-193-6/+6
| | * | Add JSDoc to various background scriptsbitpshr2018-04-196-70/+205
* | | | 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-244-33/+33
* | | | Minor fixes in a number of docs.Dan2018-04-216-18/+17
* | | | Notification manager method docs.Dan2018-04-211-4/+31
* | | | Merge branch 'master' into dm-docs-2Dan2018-04-2030-329/+596
|\| | |
| * | | Merge pull request #3984 from whymarrh/3941-jsdocDan Finlay2018-04-199-48/+150
| |\ \ \ | | |_|/ | |/| |
| | * | Add a few missing docblocks to background filesWhymarrh Whitby2018-04-199-48/+150
| * | | Merge pull request #3987 from MetaMask/dm-docs-1Dan Finlay2018-04-198-17/+389
| |\ \ \ | | |/ / | |/| |
| | * | Missing bracket in docblock.Dan2018-04-191-1/+1
| | * | Merge branch 'master' into dm-docs-1Dan2018-04-1922-145/+288
| | |\|
| | * | NO MIXED TABS AND SPACESDan2018-04-193-137/+137
| | * | Documentation fix: @constant -> @propertyDan2018-04-191-1/+1
| * | | Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-192-1/+23
| | |/ | |/|
| * | Fix confirmation popup not always openingAlexander Tseung2018-04-176-53/+83
| * | Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-1716-9/+17
| |\ \
| | * | Require loglevel singleton in each module that uses itbitpshr2018-04-1416-9/+17
| * | | Disable token price polling when no client is activebitpshr2018-04-173-0/+13
| * | | Maintain token prices using a background servicebitpshr2018-04-162-0/+83
| |/ /
| * | Add tests for ComposableObservableStorebitpshr2018-04-141-11/+11
| * | Add ComposableObservableStore for subscription managementbitpshr2018-04-132-70/+85
* | | Even more documentation for various controllers and libs.Dan2018-04-1913-49/+742
| |/ |/|
* | Add missing descriptions in util.jsDan2018-04-171-4/+4
* | Document async function as returning a promise.Dan2018-04-171-1/+1
* | Improve documentation of promises that return undefined.Dan2018-04-172-4/+4
* | Typo fixes, type fixes on the return clauses of the buyEthUrl and getPreffere...Dan2018-04-176-7/+8
* | Spell deprecated correctly.Dan2018-04-171-2/+2
* | @params -> @param fixDan2018-04-173-8/+8
* | Documentation for various controllers and libsDan2018-04-179-19/+387
* | 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-0610-36/+198
| |\
| * \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-056-38/+110
| |\ \
| * \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0410-40/+45
| |\ \ \
| * \ \ \ Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-032-4/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-03-312-3/+8
| |\ \ \ \ \
| * \ \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-313-6/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Fix i18n merge conflictsAlexander Tseung2018-03-3013-142/+261
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-2721-333/+898
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-096-9/+88
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Fix merge conflicts from uat-nextAlexander Tseung2018-02-016-3/+85
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-3014-74/+419
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-1/+2
* | | | | | | | | | | | | Merge pull request #3922 from MetaMask/empty-vault-fixkumavis2018-04-071-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | metamask - never persist if state is missingkumavis2018-04-071-1/+4
| * | | | | | | | | | | | | metamask - never persist if state is missing datakumavis2018-04-071-3/+6
| * | | | | | | | | | | | | metamask - attempt recovery from empty vaultkumavis2018-04-071-0/+22
* | | | | | | | | | | | | | tx-state-manager - dont remove old tx history if candidate is not foundkumavis2018-04-071-2/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | / migrations - back fixesfrankiebee2018-04-068-88/+115
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | create migration 25frankiebee2018-04-062-0/+62
* | | | | | | | | | | | meta - create a migration templatefrankiebee2018-04-061-0/+29
* | | | | | | | | | | | 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 #3887 from MetaMask/i#3886kumavis2018-04-061-19/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | transactions - _normalizeTxParams will now return a new object for txParamsfrankiebee2018-04-061-31/+18
| * | | | | | | | | | | | transactions - remove unnecessary keys on txParamsfrankiebee2018-04-051-0/+12
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3900 from MetaMask/migration-error-reportFrankie2018-04-064-14/+80
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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-064-14/+77
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3892 from alextsg/gh-3891kumavis2018-04-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix populating txParams with undefined dataAlexander Tseung2018-04-061-0/+4
| |/ / / / / / / / / / /
* / / / / / / / / / / / make migration-24 compat with first-time-statefrankiebee2018-04-061-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | transactions - make #_validateTxParams not async and "linting" wink wink nudg...frankiebee2018-04-051-7/+12
* | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...frankiebee2018-04-052-2/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tx - txParams - allow chainId to be a hex stringkumavis2018-04-041-1/+1
| * | | | | | | | | | | Add webby awards to web3 block list.Dan Finlay2018-04-041-1/+5
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | hot-fix - migrate unaproved txParams so that the from is lowercasefrankiebee2018-04-052-0/+46
* | | | | | | | | | | transactions - normalize txParamsfrankiebee2018-04-052-36/+53
|/ / / / / / / / / /
* | | | | | | | | | 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
* | | | | | | | | | app - currency - fix typo + prefer log over consolekumavis2018-04-041-2/+3
* | | | | | | | | | app - currency - fix typokumavis2018-04-041-1/+1
* | | | | | | | | | app - warn on fetch errors instead of spamming sentrykumavis2018-04-044-32/+28
* | | | | | | | | | build - correctly set METAMASK_ENV via envifykumavis2018-04-045-6/+6
|/ / / / / / / / /
* | | | | | | | | transactions gasLimit - use the block gasLimit if getCode failsfrankiebee2018-04-032-3/+6
* | | | | | | | | transactions validationt - valdate from field on txParamsfrankiebee2018-04-031-1/+8
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | transactions#newUnapprovedTransaction - dont default origin to metamaskfrankiebee2018-03-311-1/+1
* | | | | | | | transactions - put the origing on the txMeta to help with debuggingfrankiebee2018-03-312-3/+8
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-301-3/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #3782 from MetaMask/i3670-FixNonceBugFrankie2018-03-291-3/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Rename variable to be more understandableDan Finlay2018-03-291-3/+2
* | | | | | | | build - extension - move js files to toplevelkumavis2018-03-291-3/+3
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-294-12/+30
|\| | | | | | |
| * | | | | | | Merge pull request #3777 from MetaMask/etc-fixesFrankie2018-03-291-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | controllers - currency - warn currency and encountered errorkumavis2018-03-291-1/+1
| * | | | | | | | 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-282-9/+17
| |/ / / / / / /
* / / / / / / / build - rename 'popup.js' to 'ui.js'kumavis2018-03-291-0/+0
|/ / / / / / /
* | | | | | | 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
* | | | | | | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountResetkumavis2018-03-281-34/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | metamask-controller - fix typokumavis2018-03-281-1/+1
| * | | | | | | | Fix bug where resetAccount does not clear network cacheDan Finlay2018-03-281-34/+39
| |/ / / / / / /
* | | | | | | | i18n - derrive locale codes from indexkumavis2018-03-281-3/+2
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-283-6/+52
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' into i#3731frankiebee2018-03-281-2/+0
| |\| | | | | |
| * | | | | | | migration for removing unnecessary transactions from statefrankiebee2018-03-282-0/+52
| * | | | | | | transactions - only save up to 40 txs totall across all networksfrankiebee2018-03-271-6/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Undo unnecessary line removals.Dan2018-03-272-0/+2
* | | | | | | Remove comments and console.logsDan2018-03-271-2/+1
* | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-273-2/+40
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | include migration 22frankiebee2018-03-271-0/+1
| * | | | | | Fix bug where full localStorage would crash on startDan Finlay2018-03-271-2/+0
| |/ / / / /
| * | | | | migration for adding submittedTime to the txMeta (#3727)Frankie2018-03-271-0/+39
* | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-272-6/+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-242-7/+30
* | | | | | Use extension api to get initial locale.Dan2018-03-224-6/+26
* | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-227-251/+392
|\| | | | |
| * | | | | Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into...kumavis2018-03-223-6/+15
| |\ \ \ \ \
| | * | | | | fix for lintJeffrey Tong2018-03-211-5/+5
| | * | | | | remove console logJeffrey Tong2018-03-121-2/+0
| | * | | | | add comments that need clarification on naming conventionJeffrey Tong2018-03-123-9/+10
| | * | | | | fixed multiple notification windows when executing batchJeffrey Tong2018-03-082-2/+14
| | * | | | | removed check for width & height on multiple popup windowsJeffrey Tong2018-03-081-3/+1
| * | | | | | Merge pull request #3585 from lazaridiscom/laz/i3568kumavis2018-03-211-245/+354
| |\ \ \ \ \ \
| | * | | | | | moves setup-related code towads end of file, re #3568Lazaridis2018-03-171-115/+124
| | * | | | | | add ESLint exceptions for //= and //-, re #3568Lazaridis2018-03-161-3/+3
| | * | | | | | group all vault/keyring related methods together, re #3568Lazaridis2018-03-161-128/+130
| | * | | | | | adds initial documentation, re #3568Lazaridis2018-03-161-40/+138
| * | | | | | | Merge pull request #3504 from lazaridiscom/laz/i3427kumavis2018-03-213-0/+23
| |\ \ \ \ \ \ \
| | * | | | | | | add READMEs to folders, re #3427Lazaridis2018-03-143-0/+23
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-212-31/+64
|\| | | | | | | |
| * | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-201-1/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-151-4/+28
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
| * | | | | | | | | Fix TransactionStateManager spelling.Dan2018-03-141-2/+2
| * | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-143-5/+74
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | transactions - return the txMeta in retryTransactionfrankiebee2018-03-141-2/+3
| * | | | | | | | | | 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-094-12/+95
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | fix marking of confirmed transaction as droppedfrankiebee2018-03-091-1/+1
| * | | | | | | | | | transactions - make _markNonceDuplicatesDroppedfrankiebee2018-03-081-21/+20
| * | | | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-085-8/+121
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refactor retrytx with higher gas price:frankiebee2018-03-082-26/+55
* | | | | | | | | | | | Lint fixes.Dan2018-03-201-1/+0
* | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-201-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Inject Script: Blacklist domains where not to inject scriptSaptak Sengupta2018-03-171-1/+16
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fetch localeMessages in front end only.Dan2018-03-202-13/+3
* | | | | | | | | | | Handle i18n with redux.Dan2018-03-164-8/+25
* | | | | | | | | | | i18n - load locales manuallykumavis2018-03-151-59/+74
|/ / / / / / / / / /
* | | | | | | | | | 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
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | 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-144-12/+95
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into i#3509Frankie2018-03-144-12/+95
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| * | / | | | | | | | 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-092-9/+92
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-082-9/+92
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | modify verifySeedPhrase to async and call it from addNewAccount alsoCsaba Solya2018-03-061-32/+34
| | * | | | | | | add documentationCsaba Solya2018-03-042-0/+9
| | * | | | | | | verify seedwords on log inCsaba Solya2018-03-041-3/+16
| | * | | | | | | verify addresses regardless caseCsaba Solya2018-03-031-1/+1
| | * | | | | | | fix lint issuesCsaba Solya2018-03-032-11/+11
| | * | | | | | | seed phrase verifierCsaba Solya2018-03-032-2/+61
* | | | | | | | | background - storage - cleanup storage wiringkumavis2018-03-092-34/+30
* | | | | | | | | Tighten up data loading codeDan Finlay2018-03-081-4/+8
* | | | | | | | | Add clarifying commentDan Finlay2018-03-081-0/+1
* | | | | | | | | Some fixes for new storage strategyDan Finlay2018-03-081-5/+9
* | | | | | | | | Increase storage debounce to 2sDan Finlay2018-03-081-1/+1
* | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-082-3/+3
|\| | | | | | | |
| * | | | | | | | fix typo in tests and tx-state-managerJeffrey Tong2018-03-081-1/+1
| * | | | | | | | fix typo in transaction.jsJeffrey Tong2018-03-071-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-0722-32/+397
|\| | | | | | |
| * | | | | | | Merge pull request #3309 from scsaba/edge-supportDan Finlay2018-03-072-0/+77
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | make keyFromPassword privateCsaba Solya2018-02-231-3/+3
| | * | | | | | Merge branch 'master' into edge-supportCsaba S2018-02-2213-12/+196
| | |\ \ \ \ \ \
| | * | | | | | | add edge supportCsaba Solya2018-02-222-0/+77
| * | | | | | | | sentry - extractErrorMessage - fix comment formattingkumavis2018-03-011-1/+1
| * | | | | | | | sentry - failed tx - improve ethjs-rpc error formatingkumavis2018-03-012-5/+41
| * | | | | | | | sentry - clean - move setupRaven to libkumavis2018-03-013-3/+3
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3281 from MetaMask/sentry-failed-tx-debatchDan Finlay2018-02-281-1/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | sentry - report failed tx with more specific messagekumavis2018-02-171-1/+2
| * | | | | | | Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fixThomas Huang2018-02-221-1/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Prevents new transaction from generating popup when metamask is open in an ac...Dan2018-02-221-1/+11
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'master' into uat-masterDan Finlay2018-02-224-3/+17
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | 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
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #3222 from MetaMask/mesh-testDan Finlay2018-02-162-0/+13
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | metamask mesh - inject mesh testing containerkumavis2018-02-112-0/+13
| | * | | | | | use the providers initial _blocktracker. fixes #2393Lazaridis2018-02-111-1/+1
| | |/ / / / /
| * | / / / / Fix promise constructionDan Finlay2018-02-211-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'uat' into uat-nextDan2018-02-085-9/+62
| |\ \ \ \ \
| | * | | | | Merge branch 'master' into uatDan2018-02-085-9/+62
| | |\| | | | | | | |_|_|/ | | |/| | |
| | | * | | Merge branch 'master' into localStorage-clean-upFrankie2018-02-013-0/+23
| | | |\ \ \
| | | | * | | 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-313-9/+15
| | | | * | | clean upBruno Barbieri2018-01-311-3/+3
| | | | * | | added reset account featureBruno Barbieri2018-01-313-0/+16
| | | * | | | remove RecentBlocks from diskfrankiebee2018-02-012-3/+2
| | | * | | | creater migration to remove BlacklistControllerfrankiebee2018-01-311-0/+33
| | | * | | | remove BlacklistController from disk statefrankiebee2018-01-312-6/+2
| | | |/ / /
| | | * | | Bump limit for event emitter warning.Kevin Serrano2018-01-261-0/+2
| * | | | | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-082-0/+26
| |/ / / /
| * | | | Merge branch 'master' into uatThomas2018-01-232-1/+13
| * | | | Merge branch 'uat' into newmasterChi Kei Chan2018-01-2011-11/+159
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-1711-13/+157
| | |\ \ \
| | | * | | [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)Dan J Miller2018-01-161-3/+7
| | | * | | Fix styling in initializationAlexander Tseung2018-01-131-2/+7
| | | * | | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-0411-13/+148
| | | |\ \ \
| | | | * \ \ Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-2311-13/+148
| | | | |\ \ \
| | | | | * | | Track usage of old and new UI (#2794)Alexander Tseung2017-12-233-6/+57
| | | | | * | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-212-0/+5
| | | | | |\ \ \
| | | | | | * | | Adds updateTransaction to background and used it to update after editing in s...Dan2017-12-212-6/+5
| | | | | | * | | Canceled, edited transactions show edited amount.Dan2017-12-212-0/+6
| | | | | | | |/ | | | | | | |/|
| | | | | * | | Merge branch 'master' into NewUI-flatDan2017-12-219-37/+179
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | Adds button for opening app in main browser window in extension.Dan2017-12-131-0/+5
| | | | | * | | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-0810-29/+150
| | | | | |\ \ \
| | | | | | * \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-12-072-3/+21
| | | | | | |\ \ \
| | | | | | * | | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-078-26/+129
| | | | | * | | | | Lint fixDan2017-12-051-1/+1
| | | | | * | | | | Css selected in background based on betaUI state.Dan2017-12-051-6/+15
| | | | | * | | | | Add UI selectionDan2017-12-053-0/+19
| | | | | |/ / / /
| | | | | * | | | Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-271-0/+1
| | | | | * | | | more eslint fixesJason Clark2017-11-261-1/+1
| | | | | * | | | toggle wired up to preferences property storeJason Clark2017-11-252-2/+12
| | | | | * | | | incremental commitClark, Jason (Contractor)2017-11-241-0/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 08:39:40 +0800