aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | transactions - transition approved transactions to failed transactions…
| * 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 - wrap addTxDefaults in a try catch and re try addTxDefa…
| * 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
|/ | | | boot if they did not complete
* Merge pull request #3012 from MetaMask/AddNetworkIndicatorClasstoLoadingFrankie2018-01-181-1/+1
|\ | | | | Add network-indicator classname to network loading spinner
| * 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.5
| * Version 3.13.5v3.13.5Dan Finlay2018-01-172-1/+3
|/
* Merge pull request #2983 from MetaMask/i2907-NoCodeGasLimitkumavis2018-01-172-6/+24
|\ | | | | Set gas limit to 21k for recipients with no code
| * Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-173-0/+5
| |\ | |/ |/|
* | Merge pull request #2929 from MetaMask/i2779-FirefoxSpecifyAccountDetailHeightkumavis2018-01-173-0/+5
|\ \ | | | | | | I2779 firefox specify account detail height
| * \ 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 out
| * | | | Rename lock to log outDan Finlay2018-01-161-1/+1
| | |/ / | |/| | | | | | | | | | Fixes #2475
* | | | Merge pull request #2962 from MetaMask/open-popupDan Finlay2018-01-165-17/+55
|\ \ \ \ | |/ / / |/| | | Open popup before estimateGas finishes
| * | | 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
|\ \ \ \ | | | | | | | | | | Fix signTypedData bytes signing
| * \ \ \ Merge branch 'master' into i2826-SignBytesFrankie2018-01-163-11/+75
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimationDan Finlay2018-01-163-11/+76
|\ \ \ \ \ | | | | | | | | | | | | Improve gas price estimation by backfilling recent-blocks
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first initializing, recent-block controller now back-fills up to its desired history length. This makes estimated gas prices reflect a longer recent history, even when first switching to a new network. Fixes #2925
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #2826
| | | | | * Set gas limit to 21k for recipients with no codeDan Finlay2018-01-162-5/+24
| |_|_|_|/ |/| | | | | | | | | | | | | | Fixes #2907
* | | | | Merge pull request #2862 from wbt/UpdateNoticeDan Finlay2018-01-162-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Update notice
| * | | | | Cut statement about test network defaultwbt2018-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Removing inaccurate statement that default is test network, because most users now connect to the main network by default. See also https://github.com/MetaMask/metamask-extension/commit/f6e551ef5f3773cf5637c2ae0e11fdeb5f40645b
| * | | | | Cut statement about test network defaultwbt2018-01-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removing inaccurate statement that default is test network, because most users now connect to the main network by default. See also https://github.com/MetaMask/metamask-extension/commit/f6e551ef5f3773cf5637c2ae0e11fdeb5f40645b
* | | | | | Merge pull request #2900 from MetaMask/infura-rest-apikumavis2018-01-162-4/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Provider - Use Infura rest api for infura networks
| * | | | | 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 ↵kumavis2018-01-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | operations bug
* | | | | | Merge pull request #2909 from MetaMask/UpdateSupportLinksKevin Serrano2018-01-132-4/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Update support links for helpscout
| * | | | | 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 build
| * | | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | Add korean localization file
| * | | | 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.4
| * | | | 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 layout
| * | | 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
|\ \ \ \ | | | | | | | | | | Default to 1 gwei for empty blocks
| * \ \ \ Merge branch 'master' into DefaultToOneGweiDan Finlay2018-01-091-1/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #2796 from MetaMask/filter-case-sensitiveDan Finlay2018-01-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | bugfix: deps - eth-json-rpc-filters@1.2.5
| * | | | | deps - eth-json-rpc-filters@1.2.5kumavis2017-12-231-1/+1
| | | | | | | | | | | | | | | | | | fix case sensitive address check in filters
* | | | | | Merge pull request #2901 from MetaMask/DefaultToOneGweikumavis2018-01-092-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Default gas estimate to 1 gwei for networks with no block activity
* \ \ \ \ \ \ Merge pull request #2899 from MetaMask/danfinlay-patch-1kumavis2018-01-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Default to estimating 1 gwei for empty blocks.
| * | | | | | | Default to estimating 1 gwei for empty blocks.Dan Finlay2018-01-091-1/+1
|/ / / / / / / | | | | | | | | | | | | | | To avoid estimating 0 gwei on low-traffic private networks.
| | | * / / / 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 - transaction controller - fix order of operations
| * | | | bugfix - transactions controller - breakout logic and fix order of ↵kumavis2018-01-091-2/+4
|/ / / / | | | | | | | | | | | | operations bug
* | | | Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackagekumavis2018-01-091-1/+1
|\ \ \ \ | | | | | | | | | | Update vinyl-buffer to version 1.0.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
|\ \ \ \ | | | | | | | | | | Account for 0x/empty string recipient
| * \ \ \ 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
|\ \ \ \ \ | |_|/ / / |/| | | | Fix condition where failing seed word checks would infinite-spin future attempts.
| * | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | | Improve gas estimation
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Return the 50th percentile lowest gas price of the previous 20 blocks.
| * | | | Add test for better gas estimationDan Finlay2018-01-061-0/+25
|/ / / /
* | | | Merge pull request #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-032-2/+10
|\ \ \ \ | | | | | | | | | | transactions - throw error if txParams.value contains a decimal
| * | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | UI - Never show seed phrase if locked
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Update vinyl-source-stream to the latest version 🚀
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | only check nonces of transactions who's from address match the txMeta
| * | | | | 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 ↵frankiebee2017-12-281-1/+2
| |/ / / / | | | | | | | | | | | | | | | match the txMeta
* | | | | Merge pull request #2818 from MetaMask/i2782-ethroundingerrorDan Finlay2017-12-296-3/+35
|\ \ \ \ \ | |/ / / / |/| | | | Fix rounding error in ether input on send screen
| * | | | 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
|\ \ \ \ | |_|/ / |/| | | Do not fail pending transactions after any amount of time
| * | | 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
|\ \ \ | | | | | | | | Add Recent Blocks controller
| * | | Do not log whole txs in recent block controller.Dan Finlay2017-12-201-1/+8
| | | | | | | | | | | | | | | | Only record gas prices, because that has a current use.
| * | | Add Recent Blocks controllerDan Finlay2017-12-182-14/+62
| | | | | | | | | | | | | | | | | | | | Tracks recent blocks, useful for estimating recent successful gas prices.
* | | | Merge pull request #2771 from MetaMask/i2173-UpdateTokenValuesThomas Huang2017-12-203-4/+54
|\ \ \ \ | |_|/ / |/| | | Allow updating token details
| * | | Bump changelogDan Finlay2017-12-191-0/+2
| | | |
| * | | Allow updating token detailsDan Finlay2017-12-191-4/+4
| | | | | | | | | | | | | | | | Fixes #2173
| * | | 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
|\ \ \ | |/ / |/| | transactions:gas-utils - handle new type of estimateGas error
| * | 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"
| * | | readme - fix "plugin" to "extension"kumavis2017-12-161-1/+1
|/ / /
* | | Merge pull request #2755 from MetaMask/testsFrankie2017-12-162-2/+2
|\ \ \ | |/ / |/| | Change `console.log` to `log.info` for configureInfuraProvider
| * | 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.3
| * | 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.
| * | | 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 suffix
| * | | 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
|\ \ \ | | | | | | | | Show watched tokens with no balance
| * | | 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
|\ \ \ \ | | | | | | | | | | re-add Infura block tracker provider
| * | | | Revert "Revert "network - for infura networks use the infura block tracker ↵kumavis2017-12-142-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provider"" This reverts commit 5df7dcd758c5a16b503a5ee237970c05c7e990c9.
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-12-143-53/+8
| |\ \ \ \ | |/ / / / |/| | | | | | | | | infura-block-tracker
* | | | | 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"
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | network - for infura networks use the infura block tracker provider
* \ \ \ \ \ Merge pull request #2740 from MetaMask/i#2729infura-chill-outkumavis2017-12-141-2/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | dont aggressively query account data
| * | | | | 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
|\ \ \ | |_|/ |/| | Reduce polling interval
| * | 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
|\ \ | | | | | | Allow Dapps to Specify Nonce
| * | 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
| | | | | | | | | | | | | | | To avoid situations where a user signs a transaction that will become surprisingly valid in the future.
| * | Merge branch 'master' into patch-2Dan Finlay2017-12-0810-37/+885
| |\ \
| * | | A more expressive wayvicnaum2017-12-071-5/+2
| | | | | | | | | | | | replaced ifs with ? :
| * | | Fix for #2644 - Specified Nonce isn't usedvicnaum2017-12-071-1/+6
| | | | | | | | | | | | | | | | Added nonceSpecified. And a check if nonce was specified - then we should use the specified nonce instead of generating a new one.
* | | | Merge pull request #2654 from abitrolly/patch-2Kevin Serrano2017-12-071-1/+1
|\ \ \ \ | |_|/ / |/| | | Download State Logs with .json extension
| * | | Download State Logs with .json extensionAnatoli Babenia2017-12-051-1/+1
| | |/ | |/| | | | | | | That doesn't fix #2095, but at least makes downloaded files syntax-highlighted when opened in editors
* | | Merge pull request #2688 from MetaMask/AddPriceBumpv3.13.0Kevin Serrano2017-12-071-1/+3
|\ \ \ | | | | | | | | Add 10% price bump minimum to retry attempts.
| * | | Add 10% price bump to retry attempts.Dan Finlay2017-12-071-1/+3
|/ / / | | | | | | | | | | | | Turns out geth requires at least a 10% price bump to replace txs: https://github.com/ethereum/go-ethereum/blob/9619a610248e9630968ba1d9be8e214b645c9c55/core/tx_pool.go#L133
* | | Merge pull request #2684 from MetaMask/RetryTransactionDan Finlay2017-12-0710-37/+883
|\ \ \ | |_|/ |/| | Retry transaction
| * | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-12-072-1/+11
| |\ \ | | | | | | | | | | | | RetryTransaction
| | * | Show retry button on submitted transactions greater than 30 seconds, add ↵Alexander Tseung2017-12-072-1/+11
| | | | | | | | | | | | | | | | hover styling
| * | | Version 3.13.0Dan Finlay2017-12-072-1/+3
| |/ /
| * | Bump changelogDan Finlay2017-12-071-0/+2
| | |
| * | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-12-071-4/+4
| |\ \ | | | | | | | | | | | | RetryTransaction
| | * | Fix styling of Retry butonAlexander Tseung2017-12-071-4/+4
| | | |
| * | | Enforce retry tx at minimum gas of previous txDan Finlay2017-12-072-2/+13
| |/ /
| * | Fix retry actionDan Finlay2017-12-072-3/+11
| | |
| * | View tx after editing state to unconfirmedDan Finlay2017-12-071-1/+9
| | |
| * | Fix actionDan Finlay2017-12-071-2/+2
| | |
| * | Add development stateDan Finlay2017-12-071-0/+739
| | |
| * | Connect to redux for retryTransactionAlexander Tseung2017-12-071-2/+10
| | |
| * | Add button to retry transactionAlexander Tseung2017-12-071-34/+69
| | |
| * | Add retry background method and actionDan Finlay2017-12-075-1/+24
|/ /
* | Merge pull request #2670 from danjm/MM-2669-tx-retry-exponential-backoffFrankie2017-12-073-23/+88
|\ \ | |/ |/| Exponentional backoff on transaction retry in pending-tx-tracker
| * Add tests for exponential backoff code in _resubmitTxDan2017-12-071-17/+63
| |
| * Update resubmitPendingTxs tests.Dan2017-12-071-3/+4
| |
| * firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta ↵Dan2017-12-071-1/+1
| | | | | | | | in _resubmitTx
| * Correct note for updateTx after block-update event in transaction.jsDan2017-12-071-1/+1
| |
| * Fix undefined latestBlockNumber in _resubmitTxDan2017-12-071-1/+1
| |
| * Exponentional backoff on transaction retry in pending-tx-trackerDan2017-12-062-2/+20
|/
* Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1Thomas Huang2017-11-3012-54/+127
|\ | | | | Versioned notices
| * Bump changelogDan Finlay2017-11-301-0/+2
| |
| * Remove debuggerDan Finlay2017-11-301-1/+0
| |
| * Add markdown class to mascara ui markdown fieldDan Finlay2017-11-302-4/+5
| |
| * Bump version to 3.12.1Dan Finlay2017-11-301-1/+1
| |
| * Fix test referenceDan Finlay2017-11-301-3/+3
| |
| * Make notice skipping asyncDan Finlay2017-11-301-3/+3
| |
| * Redundantly skip noticesDan Finlay2017-11-301-25/+22
| |
| * Make test more resilientDan Finlay2017-11-301-3/+3
| |
| * Remove duplicate button declarationDan Finlay2017-11-301-2/+2
| |
| * Fix test selectorDan Finlay2017-11-301-0/+1
| |
| * Fix migration commentDan Finlay2017-11-301-2/+3
| |
| * Accept all notices in integration testsDan Finlay2017-11-301-18/+3
| |
| * Fix test to skip screens before privacy noticeDan Finlay2017-11-291-1/+7
| |
| * Migrate old data to include firstVersion infoDan Finlay2017-11-293-1/+42
| |
| * Bump changelogDan Finlay2017-11-291-0/+1
| |
| * LintedDan Finlay2017-11-292-2/+2
| |
| * Add seed phrase bounty award noticeDan Finlay2017-11-294-3/+4
| | | | | | | | Only shows to people who installed before or equal to MetaMask 3.12.1
| * Get notice version filtering working nicelyDan Finlay2017-11-294-24/+38
| |
| * Add firstVersion field to notices selectorDan Finlay2017-11-292-1/+5
| |
| * Add optional version field to noticesDan Finlay2017-11-293-1/+21
| | | | | | | | Allows notices to only show to users who are on a certain version.
* | Merge pull request #2627 from MetaMask/reload-fixkumavis2017-11-304-7/+11
|\ \ | |/ |/| Fix dapp reload via obs-store@3
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fixkumavis2017-11-302-8/+8
| |\ | |/ |/|
* | Merge pull request #2620 from MetaMask/update-depsDan Finlay2017-11-291-7/+7
|\ \ | | | | | | Update greenkeeper deps for master
| * | Update greenkeeper deps for masterThomas Huang2017-11-281-7/+7
| | |
* | | Merge pull request #2441 from MetaMask/kumavis-patch-3Dan Finlay2017-11-281-1/+1
|\ \ \ | | | | | | | | NetworkController - add warning when aborting lookupNetwork
| * | | network controller - warn via log.warnkumavis2017-11-281-1/+1
| | | |
| * | | Update network.jskumavis2017-10-241-1/+1
| | | |
| | | * deps - obs-store@3 + migrate stream plumbingkumavis2017-11-294-7/+11
| |_|/ |/| |
* | | Merge pull request #2605 from MetaMask/i2577-SeedPhraseBugThomas Huang2017-11-284-5/+68
|\ \ \ | |_|/ |/| | Fix a possible seed phrase bug
| * | Bump changelogDan Finlay2017-11-211-0/+1
| | |
| * | Remove logsDan Finlay2017-11-211-6/+0
| | |
| * | Get test passingDan Finlay2017-11-211-4/+25
| | |
| * | Merge branch 'i2577-SeedPhraseBug' into i2577-SeedPhraseBug-TestDan Finlay2017-11-212-5/+34
| |\ \
| | * | Prevent multiple submissions of first time formDan Finlay2017-11-211-1/+6
| | | |
| | * | Prevent creation of multiple vaultsDan Finlay2017-11-211-31/+20
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #2577 by ensuring only one seed phrase can be set for a new vault. Also cleans up logs and reproduction logic.
| | * | Add reproduction and mutex codeDan Finlay2017-11-211-2/+37
| | | |
| * | | Add failing test for #2577 Seed Phrase BugDan Finlay2017-11-211-0/+18
| |/ /
* | | Merge pull request #2607 from MetaMask/i2504-OperaFixThomas Huang2017-11-281-1/+7
|\ \ \ | | | | | | | | Ensure Opera build excludes chromereload file
| * | | Ensure Opera build excludes chromereload fileDan Finlay2017-11-221-1/+7
| |/ / | | | | | | | | | Fixes #2504
* | | Merge pull request #2603 from MetaMask/greenkeeper/react-markdown-3.0.0Thomas Huang2017-11-251-1/+1
|\ \ \ | |/ / |/| | Update react-markdown to the latest version 🚀
| * | fix(package): update react-markdown to version 3.0.0greenkeeper[bot]2017-11-201-1/+1
| | |
* | | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3ErrorThomas Huang2017-11-212-0/+9
|\ \ \ | | | | | | | | Add useful error when duplicate web3 is detected.
| * | | Add useful error when duplicate web3 is detected.Dan Finlay2017-11-012-0/+9
| | | | | | | | | | | | | | | | Fixes #2507
* | | | Merge pull request #2596 from MetaMask/issue-template-support-linkThomas Huang2017-11-211-3/+3
|\ \ \ \ | |_|/ / |/| | | Point issue template at new support center
| * | | Point issue template at new support centerDan Finlay2017-11-181-3/+3
|/ / /
* | | Merge pull request #2540 from doraemondrian/masterThomas Huang2017-11-153-6/+6
|\ \ \ | |/ / |/| | newUnaprovedTx => newUnapprovedTx
| * | newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-063-6/+6
|/ / | | | | | | This typo tripped me up when I was reading through the code and trying to understand what's going on.
* | Merge pull request #2508 from watilde/fixes-1192Thomas Huang2017-10-313-2/+4
|\ \ | | | | | | Remove warning message when show import page
| * | Use const and fix lint warningsDaijiro Wachi2017-10-311-2/+2
| | |
| * | Remove warning message when show import pageDaijiro Wachi2017-10-312-0/+2
|/ / | | | | | | Fixes: https://github.com/MetaMask/metamask-extension/issues/1192
* | Merge pull request #2291 from MetaMask/gasPriceSpecifiedKevin Serrano2017-10-281-0/+1
|\ \ | | | | | | Add boolean for specified gas price
| * | Add indicator for specified gas priceKevin Serrano2017-10-061-0/+1
| | |
* | | Merge pull request #2275 from MetaMask/version-debuggingKevin Serrano2017-10-274-12/+45
|\ \ \ | | | | | | | | Add OS Version and Browser Version to State Logs
| * | | Add option to copy directly to clipboard.Kevin Serrano2017-10-271-3/+11
| | | |
| * | | Correct changelog.Kevin Serrano2017-10-271-1/+0
| | | |
| * | | Bump ChangelogKevin Serrano2017-10-271-0/+1
| | | |
generated by cgit (git 2.34.1) at 2024-10-16 04:31:52 +0800