aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
Commit message (Expand)AuthorAgeFilesLines
* controllers - transactions - fix tx status update on bootkumavis2018-05-292-2/+13
* controllers - transactions - fix tx confirmationkumavis2018-05-292-3/+3
* metamask-controller - lint fixkumavis2018-05-291-1/+1
* metamask-controller - update preferences controller addresses after import ac...kumavis2018-05-291-10/+10
* controllers - transaction - pending-tx-tracker - lint fixkumavis2018-05-291-1/+1
* controllers - transactions - merge @frankiebee's work with minekumavis2018-05-294-96/+69
* controllers - transactions - pending-tx-tracker - _getBlock - poll until bloc...kumavis2018-05-261-1/+10
* tx-gas-utils - query for block without tx bodieskumavis2018-05-261-2/+2
* metamask-controller - wrap txController.addUnapprovedTx for wallet middleware...kumavis2018-05-251-1/+13
* provider - update wallet hooks for new wallet middlewarekumavis2018-05-254-64/+110
* metamask-controller - fix account lookup hookkumavis2018-05-251-2/+2
* account-tracker - guard against empty blockkumavis2018-05-251-1/+2
* controllers - recent-blocks - guard against empty blockkumavis2018-05-251-3/+3
* controllers - recent-blocks - wrap block-tracker event in try-catchkumavis2018-05-241-1/+7
* Merge branch 'network-remove-provider-engine' of github.com:MetaMask/metamask...kumavis2018-05-242-9/+24
|\
| * Merge pull request #4347 from MetaMask/transactions-use-new-block-trackerkumavis2018-05-242-9/+24
| |\
| | * Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-2311-66/+176
| | |\
| | * | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-7/+18
| | * | remove dependance on the even tx:confirmedfrankiebee2018-05-231-2/+6
* | | | sentry - setupRaven - ensure message is truthykumavis2018-05-241-2/+2
* | | | controllers - recent-blocks - ensure full blockskumavis2018-05-241-2/+2
|/ / /
* | | controllers - account-tracker - refactor + update for eth-block-tracker@4kumavis2018-05-241-67/+56
* | | controllers - recent-blocks - doc updatekumavis2018-05-241-4/+4
| |/ |/|
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-231-15/+7
|\ \
| * | controllers - recent-blocks - pull first historical blocks in parallelkumavis2018-05-221-15/+7
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-2310-51/+169
|\| | | |/ |/|
| * Reveal get filtered tx list (#4332)Frankie2018-05-222-16/+1
| * Merge branch 'develop' into ci-publish-releasekumavis2018-05-228-34/+167
| |\
| | * Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into...kumavis2018-05-221-1/+2
| | |\
| | | * Added trailing comma for eslintsimon2018-05-181-1/+1
| | | * Added adyen.com to blacklisted domains because postMessages are blocking car...simon2018-05-181-1/+2
| | * | Merge pull request #4034 from whymarrh/account-nicknameskumavis2018-05-225-33/+97
| | |\ \
| | | * | Fix migration 026 to produce the correct shape for state.identitiesWhymarrh Whitby2018-05-181-1/+8
| | | * | Add migration to move identities from KeyringControllerWhymarrh Whitby2018-05-172-0/+41
| | | * | Add PreferencesController#setAddresses to update idsWhymarrh Whitby2018-05-172-8/+22
| | | * | Update AddressBookController to read from preferences storeWhymarrh Whitby2018-05-172-22/+8
| | | * | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-172-3/+19
| | | |/
| | * | 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
| * | | docs - jsdoc - fix syntaxkumavis2018-05-191-1/+1
| |/ /
* | | recent-blocks - fix backfill blockNumber trackingkumavis2018-05-171-3/+2
* | | controllers - recent-blocks - fix pifyd setTimeout argskumavis2018-05-171-1/+1
* | | deps - fix incorrect dep paths and versionskumavis2018-05-174-4/+4
* | | controllers - balance - update for eth-block-tracker@4kumavis2018-05-171-3/+3
* | | recent-blocks - update for eth-block-tracker@4kumavis2018-05-171-27/+14
* | | remove unused events-proxy, was replaced with module swappable-obj-proxykumavis2018-05-172-43/+0
* | | lint fixkumavis2018-05-175-13/+18
* | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-178-70/+217
|/ /
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-...kumavis2018-05-176-167/+68
|\ \
| * \ Merge pull request #4146 from MetaMask/sentry-error-like2kumavis2018-05-171-17/+25
| |\ \
| | * | sentry - add helper to fully rewrite all error messageskumavis2018-05-011-17/+25
| * | | network - remove debugging console.logkumavis2018-05-171-1/+0
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-174-1/+18
| |\ \ \ | | | |/ | | |/|
| * | | lint - cleanup some unused variableskumavis2018-05-031-1/+0
| * | | controllers - network - move default config out of first-time-statekumavis2018-05-032-11/+15
| * | | network - refactor to remove unnecesary codekumavis2018-05-013-124/+29
| * | | network - remove setNetworkEndpointskumavis2018-05-012-14/+0
| * | | controllers - network - more semantic assertkumavis2018-05-011-1/+1
| | |/ | |/|
* | | tx-state-history-helper - use more readable Date.now methodkumavis2018-05-171-1/+1
* | | fix lint issuesCsaba Solya2018-05-102-2/+2
* | | remove unnecessary libCsaba Solya2018-05-101-1/+0
* | | revert unnecessary change in state managerCsaba Solya2018-05-101-13/+7
* | | add time stamps to transaction history log entriesCsaba Solya2018-05-102-16/+28
| |/ |/|
* | Fix documentation typobitpshr2018-05-081-1/+1
* | transactions - add a nonce check utility for ui usefrankiebee2018-05-022-0/+16
* | fix - getTxsByMetaData check if the key is in the object not if the value is ...frankiebee2018-05-021-1/+1
* | Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframekumavis2018-05-011-0/+1
|\ \ | |/ |/|
| * Blacklist problematic shopify iFrameBryce Neal2018-05-011-0/+1
* | 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-012-23/+1
|\ \ | |/ |/|
| * Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-2311-79/+295
| |\
| * | Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-222-23/+1
* | | Merge pull request #4132 from MetaMask/masterkumavis2018-04-302-18/+25
|\ \ \
| * | | guard adainst raven erroringfrankiebee2018-04-302-18/+25
* | | | Merge pull request #4110 from MetaMask/masterkumavis2018-04-289-221/+695
|\| | |
| * | | Merge pull request #4095 from MetaMask/v4.6.0v4.6.0Thomas Huang2018-04-272-2/+2
| |\ \ \
| * \ \ \ Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3kumavis2018-04-269-221/+695
| |\ \ \ \
| | * | | | transactions - more docs and clean upsfrankiebee2018-04-266-55/+116
| | * | | | Cleaned up some typos and JSDocs in TransactionsDan Finlay2018-04-243-38/+40
| | * | | | transactions - fix referncesfrankiebee2018-04-202-1/+2
| | * | | | Merge branch 'master' into tx-controller-rewrite-v3frankiebee2018-04-2035-197/+871
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | meta - transactions - docs yo!frankiebee2018-04-208-73/+351
| | * | | | fix up - more docsfrankiebee2018-04-143-38/+77
| | * | | | meta - transactions - code clean up and jsDocfrankiebee2018-04-141-41/+109
| | * | | | transactions - code cleanupfrankiebee2018-04-132-58/+59
| | * | | | transactions - lint fixesfrankiebee2018-04-113-12/+12
| | * | | | meta - transactions - create a transactions dir in controller and move releva...frankiebee2018-04-118-69/+93
* | | | | | Return 0 for token rate fetch failuresbitpshr2018-04-271-1/+5
| |_|_|/ / |/| | | |
* | | | | rpc - bump provider-engine + eth-json-rpc-filterskumavis2018-04-261-1/+1
* | | | | Merge pull request #4069 from MetaMask/i4056-LatestPriceApiDan Finlay2018-04-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use latest balanc3 api for pricesDan Finlay2018-04-251-1/+1
* | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:01:06 +0800