aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use the providers initial _blocktracker. fixes #2393Lazaridis2018-02-111-1/+1
* Merge pull request #3177 from MetaMask/Version-3.14.1Thomas Huang2018-02-022-1/+5
|\
| * Version 3.14.1v3.14.1Dan Finlay2018-02-022-1/+5
|/
* Merge pull request #3176 from MetaMask/FirefoxSettingsOverflowDan Finlay2018-02-022-1/+7
|\
| * Scrollable Settings screen for FirefoxThomas2018-02-022-1/+7
|/
* Merge pull request #3175 from MetaMask/Version-3.13.9Frankie2018-02-023-2/+4
|\
| * Version 3.14.0Dan Finlay2018-02-022-1/+3
| * Remove deps from build processDan Finlay2018-02-021-1/+1
|/
* Merge pull request #3161 from MetaMask/AddResetExplanationFrankie2018-02-012-59/+20
|\
| * Add explanation of account resettingDan Finlay2018-02-011-0/+20
| * Remove unused fileDan Finlay2018-02-011-59/+0
* | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputsFrankie2018-02-016-4/+74
|\ \
| * | Bump ChangelogThomas2018-01-311-0/+1
| * | Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to depsThomas2018-01-311-2/+4
| * | Clean up test, remove react & mountWithStoreThomas2018-01-311-3/+2
| * | Set address to default with empty string, add test validation.Thomas2018-01-314-2/+70
* | | Merge pull request #3148 from MetaMask/localStorage-clean-upFrankie2018-02-016-9/+55
|\ \ \ | |_|/ |/| |
| * | fix changelogfrankiebee2018-02-011-1/+1
| * | Merge branch 'master' into localStorage-clean-upFrankie2018-02-017-0/+102
| |\ \ | |/ / |/| |
* | | Merge pull request #3155 from brunobar79/feature/reset-accountDan Finlay2018-02-017-0/+102
|\ \ \
| * | | clean upBruno Barbieri2018-02-011-19/+13
| * | | add test for wipeTransactionsBruno Barbieri2018-02-011-0/+49
| * | | 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-316-0/+52
|/ / /
| * | Merge branch 'localStorage-clean-up' of https://github.com/MetaMask/metamask-...frankiebee2018-02-012-0/+7
| |\ \
| | * \ Merge branch 'master' into localStorage-clean-upFrankie2018-01-312-0/+7
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #3145 from MetaMask/i3089-FixNullErrorFrankie2018-01-312-0/+8
|\ \ \ \
| * | | | Add warning when importing no valid fileDan Finlay2018-01-312-0/+8
|/ / / /
| * / / remove RecentBlocks from diskfrankiebee2018-02-013-3/+3
| |/ /
| * | test for migration 021frankiebee2018-01-312-0/+16
| * | add to CHANGELOG.mdfrankiebee2018-01-311-0/+2
| * | creater migration to remove BlacklistControllerfrankiebee2018-01-311-0/+33
| * | remove BlacklistController from disk statefrankiebee2018-01-312-6/+2
|/ /
* | Merge pull request #3126 from MetaMask/Version-3.13.8Thomas Huang2018-01-302-1/+4
|\ \ | |/ |/|
| * Version 3.13.8v3.13.8Dan Finlay2018-01-302-1/+4
|/
* Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0Thomas Huang2018-01-301-1/+1
|\
| * chore(package): update gulp-watch to version 5.0.0greenkeeper[bot]2018-01-071-1/+1
* | Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0Thomas Huang2018-01-301-1/+1
|\ \
| * | chore(package): update mocha to version 5.0.0greenkeeper[bot]2018-01-181-1/+1
* | | Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0Thomas Huang2018-01-301-1/+1
|\ \ \
| * | | chore(package): update testem to version 2.0.0greenkeeper[bot]2018-01-251-1/+1
* | | | Merge pull request #3101 from MetaMask/eventemitterwarningThomas Huang2018-01-302-0/+4
|\ \ \ \
| * | | | Bump ChangelogKevin Serrano2018-01-261-0/+2
| * | | | Bump limit for event emitter warning.Kevin Serrano2018-01-261-0/+2
| |/ / /
* | | | Merge pull request #3100 from MetaMask/kovan-fixDan Finlay2018-01-261-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | deps - bump eth-json-rpc-infura for kovan fixkumavis2018-01-261-1/+1
|/ / /
* | | Merge pull request #3065 from MetaMask/Version-3.13.7Dan Finlay2018-01-232-1/+8
|\ \ \
| * \ \ Merge branch 'Version-3.13.7' of github.com:MetaMask/metamask-plugin into Ver...Dan Finlay2018-01-230-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' into Version-3.13.7kumavis2018-01-233-2/+15
| | |\ \ \ | |_|/ / / |/| | | |
| | * | | Version 3.13.7v3.13.7Dan Finlay2018-01-232-1/+8
| * | | | Merge remote-tracking branch 'origin/master' into Version-3.13.7Dan Finlay2018-01-233-1/+14
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3066 from MetaMask/sentry-failed-txkumavis2018-01-233-1/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | changelog - add note on sentrykumavis2018-01-231-0/+1
| * | | | sentry - report failed txskumavis2018-01-232-1/+13
|/ / / /
| * / / Version 3.13.7Dan Finlay2018-01-232-1/+8
|/ / /
* | | Merge pull request #3047 from MetaMask/fix-provider-json-parseKevin Serrano2018-01-231-2/+2
|\ \ \
| * | | deps - bump provider engine and infura-middleware for better retry and error ...kumavis2018-01-201-2/+2
| * | | deps - bump providers for better JSON parse error messageskumavis2018-01-201-2/+2
* | | | Merge pull request #3064 from MetaMask/engine-patchDan Finlay2018-01-231-1/+1
|\ \ \ \
| * | | | deps - bump json rpc engine for bugfixkumavis2018-01-231-1/+1
|/ / / /
* | | | Merge pull request #3025 from MetaMask/i#3018kumavis2018-01-233-2/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Bump changelogDan Finlay2018-01-231-0/+2
| * | | add a `x` close button to gas calc loding screen on conf-txfrankiebee2018-01-182-2/+16
* | | | Merge pull request #3023 from MetaMask/build-lock-gulpDan Finlay2018-01-191-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into build-lock-gulpThomas Huang2018-01-197-42/+40
| |\ \ \ \
| * | | | | test - stub provider needs to handle errorskumavis2018-01-181-2/+2
| * | | | | build - lock pre-release gulp dep to commitkumavis2018-01-181-1/+1
* | | | | | Merge pull request #3016 from MetaMask/sentryDan Finlay2018-01-195-1/+38
|\ \ \ \ \ \
| * | | | | | lint - ignore vendor jskumavis2018-01-181-1/+1
| * | | | | | sentry - dedupe raven vendorkumavis2018-01-182-5/+2
| * | | | | | lint - ignore vendor jskumavis2018-01-181-1/+1
| * | | | | | sentry - breakout raven setup and add release configkumavis2018-01-183-9/+35
| * | | | | | sentry - update raven and add to uikumavis2018-01-184-7/+13
| * | | | | | sentry - add raven + sentry reporting configkumavis2018-01-182-0/+8
* | | | | | | Merge pull request #3035 from MetaMask/infura-rest-fixDan Finlay2018-01-191-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | deps - bump infura provider for uri length limit fixkumavis2018-01-191-1/+1
|/ / / / / /
* | | | | | Merge pull request #3029 from MetaMask/test-provider-stubThomas Huang2018-01-196-43/+33
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | deps - re-add eth-block-trackerkumavis2018-01-181-0/+1
| * | | | | test - createTestProviderTools includes block tracker layerkumavis2018-01-185-22/+25
| * | | | | test - tx controller - fix txGasUtil referencekumavis2018-01-182-3/+4
| * | | | | deps - bump json-rpc-engine for better errorskumavis2018-01-181-1/+1
| * | | | | test - typo - fix spelling of word stubbedkumavis2018-01-184-8/+8
| * | | | | test - remove createEthJsQueryStubkumavis2018-01-182-18/+3
|/ / / / /
* | | | | Merge pull request #3021 from MetaMask/i#3020kumavis2018-01-181-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update transactions.jskumavis2018-01-181-1/+1
| | |/ / | |/| |
| * | | transactions - transtion approved transactions to failed transactions on bootfrankiebee2018-01-181-0/+8
|/ / /
* | | Merge pull request #3019 from MetaMask/i#3015Frankie2018-01-181-2/+22
|\ \ \ | |/ / |/| |
| * | transactions - fail txs on boot who fail addTxDefaultsfrankiebee2018-01-181-0/+2
| * | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ...frankiebee2018-01-181-2/+20
|/ /
* | Merge pull request #3012 from MetaMask/AddNetworkIndicatorClasstoLoadingFrankie2018-01-181-1/+1
|\ \
| * | Add network-indicator classname to network loading spinnerThomas2018-01-181-1/+1
|/ /
* | Merge pull request #2996 from MetaMask/Version-3.13.5Thomas Huang2018-01-172-1/+3
|\ \
| * | Version 3.13.5v3.13.5Dan Finlay2018-01-172-1/+3
|/ /
* | Merge pull request #2983 from MetaMask/i2907-NoCodeGasLimitkumavis2018-01-172-6/+24
|\ \
| * \ Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-173-0/+5
| |\ \ | |/ / |/| |
* | | Merge pull request #2929 from MetaMask/i2779-FirefoxSpecifyAccountDetailHeightkumavis2018-01-173-0/+5
|\ \ \
| * \ \ Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-176-18/+56
| |\ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-1611-29/+116
| |\ \ \
| * | | | Edit: Fix Firefox scrollbar ChangelogThomas Huang2018-01-161-1/+1
| * | | | Bump ChangelogThomas2018-01-161-0/+3
| * | | | Add max height for Firefox addon overflow and hide horizontal scrolltmashuang2018-01-111-0/+2
| * | | | Add one px to address for Firefox clippingtmashuang2018-01-111-0/+1
| | | * | Create new flag for simple sends to avoid overloading other flagDan Finlay2018-01-171-2/+2
| | | * | Merge branch 'master' into i2907-NoCodeGasLimitkumavis2018-01-176-18/+56
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #2984 from MetaMask/RenameLockToLogoutThomas Huang2018-01-171-1/+1
|\ \ \ \ \
| * | | | | Rename lock to log outDan Finlay2018-01-161-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #2962 from MetaMask/open-popupDan Finlay2018-01-165-17/+55
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into open-popupFrankie2018-01-169-26/+90
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | add to CHANGELOG.mdfrankiebee2018-01-161-0/+2
| * | | | test - fix to match expected behaviorfrankiebee2018-01-151-14/+28
| * | | | test - create ethJsQuery stubfrankiebee2018-01-151-1/+14
| * | | | transactions - emit 'newUnapprovedTx' before estimateGas finishesfrankiebee2018-01-151-2/+6
| * | | | add a loading spinner to conf-tx viewfrankiebee2018-01-151-0/+6
| | | * | Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-164-15/+78
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #2953 from MetaMask/i2826-SignBytesFrankie2018-01-162-4/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i2826-SignBytesFrankie2018-01-163-11/+75
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimationDan Finlay2018-01-163-11/+76
|\ \ \ \ \ \
| * | | | | | Prefer passing a provider over an ethQuery instanceDan Finlay2018-01-132-8/+4
| * | | | | | Improve gas price estimation by backfilling recent-blocksDan Finlay2018-01-123-9/+78
| | * | | | | Merge branch 'master' into i2826-SignBytesDan Finlay2018-01-164-7/+8
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
| | * | | | | Bump keyringController versionDan Finlay2018-01-161-3/+1
| | * | | | | Fix signTypedData bytes signingDan Finlay2018-01-142-1/+3
| | | | | * | Set gas limit to 21k for recipients with no codeDan Finlay2018-01-162-5/+24
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #2862 from wbt/UpdateNoticeDan Finlay2018-01-162-3/+1
|\ \ \ \ \ \
| * | | | | | Cut statement about test network defaultwbt2018-01-051-1/+1
| * | | | | | Cut statement about test network defaultwbt2018-01-051-2/+0
* | | | | | | Merge pull request #2900 from MetaMask/infura-rest-apikumavis2018-01-162-4/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'master' into infura-rest-apikumavis2018-01-126-5/+32
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | deps - bump eth-json-infurakumavis2018-01-101-1/+1
| * | | | | | provider - infura - use infura REST apikumavis2018-01-092-4/+7
| * | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
* | | | | | | Merge pull request #2909 from MetaMask/UpdateSupportLinksKevin Serrano2018-01-132-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use httpsDan Finlay2018-01-132-2/+2
| * | | | | | Merge branch 'UpdateReadmeSupportLink' into UpdateSupportLinksDan Finlay2018-01-136-5/+30
| |\ \ \ \ \ \
| | * | | | | | Update support link on readmeDan Finlay2018-01-131-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #2926 from MetaMask/gulp-npmlsDan Finlay2018-01-122-3/+16
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | build - add 'deps' step that records output of 'npm ls' into buildkumavis2018-01-111-1/+15
| * | | | | | deps - gulp in dev deps onlykumavis2018-01-111-2/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2917 from x86kernel/ci/add-ko-localekumavis2018-01-121-0/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | ci(ko/messages.json): add korean localization filex86kernel2018-01-101-0/+10
|/ / / / /
* | | | | Merge pull request #2906 from MetaMask/Version-3.13.4Thomas Huang2018-01-102-1/+3
|\ \ \ \ \
| * | | | | Version 3.13.4v3.13.4Dan Finlay2018-01-102-1/+3
|/ / / / /
| | * / / Update support links for helpscoutDan Finlay2018-01-101-3/+3
| |/ / / |/| | |
* | | | Merge pull request #2855 from abitrolly/patch-2kumavis2018-01-091-1/+0
|\ \ \ \
| * | | | info.js Remove width element to fix email layoutAnatoli Babenia2018-01-041-1/+0
| | |_|/ | |/| |
* | | | Merge pull request #2902 from MetaMask/DefaultToOneGweiDan Finlay2018-01-091-1/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' into DefaultToOneGweiDan Finlay2018-01-091-1/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #2796 from MetaMask/filter-case-sensitiveDan Finlay2018-01-091-1/+1
|\ \ \ \ \
| * | | | | deps - eth-json-rpc-filters@1.2.5kumavis2017-12-231-1/+1
* | | | | | Merge pull request #2901 from MetaMask/DefaultToOneGweikumavis2018-01-092-0/+25
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #2899 from MetaMask/danfinlay-patch-1kumavis2018-01-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Default to estimating 1 gwei for empty blocks.Dan Finlay2018-01-091-1/+1
|/ / / / / / /
| | | * / / / Default to 1 gwei for empty blocksDan Finlay2018-01-091-2/+3
| | |/ / / / | |/| | | |
| * | | | | Add test for gas estimate defaultDan Finlay2018-01-091-0/+19
| * | | | | Default gas estimate to 1 gwei for networks with no block activityDan Finlay2018-01-091-0/+6
|/ / / / /
* | | | | Merge pull request #2896 from MetaMask/kumavis-patch-2Dan Finlay2018-01-091-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
|/ / / /
* | | | Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackagekumavis2018-01-091-1/+1
|\ \ \ \
| * | | | Update vinyl-buffer to version 1.0.1Thomas Huang2018-01-041-1/+1
| | |/ / | |/| |
* | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddressThomas Huang2018-01-093-0/+44
|\ \ \ \
| * \ \ \ Merge branch 'master' into i2621-0xRecipientAddressDan Finlay2018-01-096-2/+57
| |\ \ \ \
| * | | | | Account for 0x/empty string address and contract creationThomas2018-01-083-0/+44
| | |/ / / | |/| | |
* | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-094-6/+34
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update CHANGELOG.mdKevin Serrano2018-01-091-0/+1
| * | | | Test for failure of the async methods.Kevin Serrano2018-01-041-2/+20
| * | | | Add fix for infinite spinner for incorrect seed phrase.Kevin Serrano2018-01-042-4/+13
* | | | | Merge pull request #2879 from MetaMask/ImproveGasEstimationDan Finlay2018-01-096-2/+57
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix feature to workDan Finlay2018-01-063-6/+16
| * | | | LintedDan Finlay2018-01-061-3/+0
| * | | | Bump changelogDan Finlay2018-01-061-0/+1
| * | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-064-2/+24
| * | | | Add test for better gas estimationDan Finlay2018-01-061-0/+25
|/ / / /
* | | | Merge pull request #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-032-2/+10
|\ \ \ \
| * | | | tx-gas-utils - tx-param-validation - use more intuitive checkkumavis2018-01-031-2/+2
| * | | | Merge branch 'master' into tx-param-vaalidationFrankie2017-12-225-18/+122
| |\ \ \ \
| * | | | | SpellingDan Finlay2017-12-221-1/+1
| * | | | | add to CHANGELOG.mdfrankiebee2017-12-211-0/+2
| * | | | | transactions - throw error if dapp provides txParams whos value has a decimalfrankiebee2017-12-211-2/+9
* | | | | | Merge pull request #2840 from oosthuizenr/masterkumavis2018-01-031-5/+6
|\ \ \ \ \ \
| * | | | | | fix commentoosthuizenr2018-01-031-1/+1
| * | | | | | Fixes #2834Renier Oosthuizen2018-01-031-5/+6
|/ / / / / /
* | | | | | Merge pull request #2801 from MetaMask/greenkeeper/vinyl-source-stream-2.0.0kumavis2018-01-031-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | chore(package): update vinyl-source-stream to version 2.0.0greenkeeper[bot]2017-12-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-292-3/+63
|\ \ \ \ \
| * | | | | tests - be more verbose in test messagesfrankiebee2017-12-291-2/+2
| * | | | | add tests for #_checkIfNonceIsTakenfrankiebee2017-12-281-2/+61
| * | | | | transactions:pending - only check nonces of transactions who's from adress ma...frankiebee2017-12-281-1/+2
| |/ / / /
* | | | | Merge pull request #2818 from MetaMask/i2782-ethroundingerrorDan Finlay2017-12-296-3/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump ChangelogKevin Serrano2017-12-281-0/+1
| * | | | Add frontend validation to ensure that ether inputs are valid.Kevin Serrano2017-12-281-2/+12
| * | | | Add frontend validation to check if send ether input is a valid number.Kevin Serrano2017-12-281-0/+6
| * | | | Add additional test to ui utils to account for exact wei values.Kevin Serrano2017-12-281-0/+6
| * | | | Add backend fix for util in normalizeethstringtowei.Kevin Serrano2017-12-281-0/+3
| * | | | Fix some silly linting issues.Kevin Serrano2017-12-282-2/+2
| * | | | Add test for edge case.Kevin Serrano2017-12-281-0/+6
|/ / / /
* | | | Merge pull request #2793 from MetaMask/i2681-DoNotFailPendingKevin Serrano2017-12-223-8/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove retryTimePeriod from tx controllerDan Finlay2017-12-221-1/+0
| * | | Bump changelogDan Finlay2017-12-221-0/+1
| * | | Stop failing pending transactions after any period of timeDan Finlay2017-12-221-7/+0
|/ / /
* | | Merge pull request #2763 from MetaMask/AddRecentBlocksControllerThomas Huang2017-12-212-14/+69
|\ \ \
| * | | Do not log whole txs in recent block controller.Dan Finlay2017-12-201-1/+8
| * | | Add Recent Blocks controllerDan Finlay2017-12-182-14/+62
* | | | Merge pull request #2771 from MetaMask/i2173-UpdateTokenValuesThomas Huang2017-12-203-4/+54
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump changelogDan Finlay2017-12-191-0/+2
| * | | Allow updating token detailsDan Finlay2017-12-191-4/+4
| * | | Add failing test for updating token detailsDan Finlay2017-12-191-0/+48
|/ / /
* | | Merge pull request #2751 from MetaMask/i#2720Thomas Huang2017-12-191-1/+5
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into i#2720frankiebee2017-12-162-2/+2
| |\ \
| * | | transactions:gas-utils - handle new type of estimateGas errorfrankiebee2017-12-151-1/+5
* | | | Merge pull request #2757 from MetaMask/kumavis-patch-2Thomas Huang2017-12-161-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | readme - fix "plugin" to "extension"kumavis2017-12-161-1/+1
|/ / /
* | | Merge pull request #2755 from MetaMask/testsFrankie2017-12-162-2/+2
|\ \ \ | |/ / |/| |
| * | Change console.log for opts in _configureInfuraProviderThomas Huang2017-12-161-1/+1
| * | Add exit flag to mocha to exit after tests runThomas Huang2017-12-161-1/+1
|/ /
* | Merge pull request #2747 from MetaMask/Version-3.13.3Thomas Huang2017-12-152-1/+4
|\ \
| * | Version 3.13.3v3.13.3Dan Finlay2017-12-152-1/+4
* | | Merge pull request #2706 from danjm/MM-fix-buy-cancel-buttonThomas Huang2017-12-151-1/+1
|\ \ \
| * | | Fixes the cancel button in the buy screen to take the user home.Dan2017-12-091-1/+1
* | | | Merge pull request #2662 from williamchong007/masterThomas Huang2017-12-151-2/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | fix #1398, prevent injecting xml without xml suffixWilliam Chong2017-12-051-2/+10
| | |/ | |/|
* | | Merge pull request #2733 from MetaMask/i2380-ShowNoBalanceThomas Huang2017-12-152-4/+3
|\ \ \
| * | | Bump changelogDan Finlay2017-12-131-0/+2
| * | | Show watched tokens with no balanceDan Finlay2017-12-131-4/+1
* | | | Merge pull request #2744 from MetaMask/infura-block-trackerFrankie2017-12-142-8/+52
|\ \ \ \
| * | | | Revert "Revert "network - for infura networks use the infura block tracker pr...kumavis2017-12-142-8/+51
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-bloc...kumavis2017-12-143-53/+8
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #2743 from MetaMask/revert-2741-infura-block-trackerThomas Huang2017-12-142-52/+8
|\ \ \ \ \
| * | | | | Revert "network - for infura networks use the infura block tracker provider"Frankie2017-12-142-52/+8
|/ / / / /
* | | | | Merge pull request #2741 from MetaMask/infura-block-trackerFrankie2017-12-142-8/+52
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #2740 from MetaMask/i#2729infura-chill-outkumavis2017-12-141-2/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | dont aggresively query account datafrankiebee2017-12-141-2/+0
|/ / / / /
| | * / / deps - bump eth-json-rpc-infurakumavis2017-12-141-1/+1
| |/ / /
| * / / network - for infura networks use the infura block tracker providerkumavis2017-12-142-8/+52
|/ / /
* | | Merge pull request #2718 from MetaMask/ReducePollingIntervalkumavis2017-12-104-3/+11
|\ \ \ | |_|/ |/| |
| * | Version 3.13.2v3.13.2Dan Finlay2017-12-103-2/+4
| * | Bump changelogDan Finlay2017-12-101-0/+2
| * | Pass polling interval to zero client providerDan Finlay2017-12-101-1/+5
|/ /
* | Merge pull request #2699 from MetaMask/patch-2v3.13.1kumavis2017-12-084-9/+21
|\ \
| * | tx-controller - failed state is a finished statekumavis2017-12-082-7/+9
| * | Version 3.13.1Dan Finlay2017-12-082-1/+3
| * | Bump changelogDan Finlay2017-12-081-0/+2
| * | Do not allow nonces larger than the next valid nonceDan Finlay2017-12-081-0/+4
| * | Merge branch 'master' into patch-2Dan Finlay2017-12-0810-37/+885
| |\ \
| * | | A more expressive wayvicnaum2017-12-071-5/+2
| * | | Fix for #2644 - Specified Nonce isn't usedvicnaum2017-12-071-1/+6
* | | | Merge pull request #2654 from abitrolly/patch-2Kevin Serrano2017-12-071-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Download State Logs with .json extensionAnatoli Babenia2017-12-051-1/+1
| | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:28:57 +0800