aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge pull request #2688 from MetaMask/AddPriceBumpv3.13.0Kevin Serrano2017-12-071-1/+3
|\ \ \
| * | | Add 10% price bump to retry attempts.Dan Finlay2017-12-071-1/+3
|/ / /
* | | Merge pull request #2684 from MetaMask/RetryTransactionDan Finlay2017-12-0710-37/+883
|\ \ \ | |_|/ |/| |
| * | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R...Dan Finlay2017-12-072-1/+11
| |\ \
| | * | Show retry button on submitted transactions greater than 30 seconds, add hove...Alexander Tseung2017-12-072-1/+11
| * | | 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 R...Dan Finlay2017-12-071-4/+4
| |\ \
| | * | 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
|\ \ | |/ |/|
| * 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 in...Dan2017-12-071-1/+1
| * 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
|\
| * 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
| * 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
* | Merge pull request #2627 from MetaMask/reload-fixkumavis2017-11-304-7/+11
|\ \ | |/ |/|
| * 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 masterThomas Huang2017-11-281-7/+7
* | | Merge pull request #2441 from MetaMask/kumavis-patch-3Dan Finlay2017-11-281-1/+1
|\ \ \
| * | | 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
|\ \ \ | |_|/ |/| |
| * | 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
| | * | 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 fileDan Finlay2017-11-221-1/+7
| |/ /
* | | Merge pull request #2603 from MetaMask/greenkeeper/react-markdown-3.0.0Thomas Huang2017-11-251-1/+1
|\ \ \ | |/ / |/| |
| * | 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.Dan Finlay2017-11-012-0/+9
* | | | Merge pull request #2596 from MetaMask/issue-template-support-linkThomas Huang2017-11-211-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 => newUnapprovedTxDora E. Mondrian2017-11-063-6/+6
|/ /
* | Merge pull request #2508 from watilde/fixes-1192Thomas Huang2017-10-313-2/+4
|\ \
| * | Use const and fix lint warningsDaijiro Wachi2017-10-311-2/+2
| * | Remove warning message when show import pageDaijiro Wachi2017-10-312-0/+2
|/ /
* | Merge pull request #2291 from MetaMask/gasPriceSpecifiedKevin Serrano2017-10-281-0/+1
|\ \
| * | 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 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
| * | | Resolve merge conflictsKevin Serrano2017-10-2772-232/+12470
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2489 from MetaMask/3.12.0Frankie2017-10-262-1/+3
|\ \ \ \
| * | | | 3.12.0v3.12.0kumavis2017-10-262-1/+3
|/ / / /
* | | | Merge pull request #2100 from ChainsawBaby/patch-1Kevin Serrano2017-10-262-3/+8
|\ \ \ \
| * | | | Bump ChangelogKevin Serrano2017-10-261-0/+1
| * | | | Resolving that ugly merge.Kevin Serrano2017-10-261-3/+7
|/ / / /
* | | | Merge pull request #2476 from MetaMask/100MweiMinGasPriceDan Finlay2017-10-263-12/+16
|\ \ \ \
| * | | | Add labels to clarify warning.Kevin Serrano2017-10-261-4/+4
| * | | | Account for non-submitted mins and maxKevin Serrano2017-10-261-2/+2
| * | | | Add clarifying comment about wei conversion.Kevin Serrano2017-10-261-0/+1
| * | | | Cut out intermediary wei steps.Kevin Serrano2017-10-261-4/+2
| * | | | Remove unneeded toString conversions.Kevin Serrano2017-10-261-2/+2
| * | | | Move upsize conversions for input warning at front of fn.Kevin Serrano2017-10-261-3/+5
| * | | | Fix mismatched decimal/hex conversion in pending-txKevin Serrano2017-10-261-1/+1
| * | | | Remove css build bundle from uatDan Finlay2017-10-261-4491/+0
| * | | | Update changelogDan Finlay2017-10-261-1/+1
| * | | | Resolve merge conflict.Kevin Serrano2017-10-253-1/+4493
| |\ \ \ \
| | * | | | Reduce minimum gas price to 100 MWEIDan Finlay2017-10-253-7/+4499
| * | | | | Fix for gas price to be lowered.Kevin Serrano2017-10-252-11/+13
| |/ / / /
* | | | | Merge pull request #2478 from MetaMask/mascaraHeadersFixFrankie2017-10-261-1/+1
|\ \ \ \ \
| * | | | | Fix X-Frame-Options for mascaratmashuang2017-10-251-1/+1
|/ / / / /
* | | | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-2522-49/+55
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix lint warningsDaijiro Wachi2017-10-2220-49/+47
| * | | | Add lint:fix command to gulp and npm-scriptsDaijiro Wachi2017-10-222-0/+8
* | | | | Merge pull request #1990 from chikeichan/firsttimeflowThomas Huang2017-10-2536-64/+12257
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add error messages when importing an accounttmashuang2017-10-242-17/+24
| * | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-2435-63/+12249
|/| | | |
| * | | | Add Import With Seed PhraseChi Kei Chan2017-10-216-19/+156
| * | | | Add mobile responsivenessChi Kei Chan2017-10-212-177/+192
| * | | | Remove import optionChi Kei Chan2017-10-211-1/+3
| * | | | Fix importChi Kei Chan2017-10-211-21/+31
| * | | | Fix capitializationChi Kei Chan2017-10-211-1/+1
| * | | | Add Integration TestsChi Kei Chan2017-10-214-15/+61
| * | | | Fixing integraiton testChi Kei Chan2017-10-212-3/+130
| * | | | Fix unit testChi Kei Chan2017-10-212-2/+3
| * | | | Fix linterChi Kei Chan2017-10-2110-123/+245
| * | | | ShapeShift IntegrationChi Kei Chan2017-10-216-90/+287
| * | | | Add ShapeShift UIChi Kei Chan2017-10-216-80/+353
| * | | | Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-218-29/+9558
| * | | | Add missing presetsChi Kei Chan2017-10-211-0/+1
| * | | | Move "Skip this step" to side panelJacky Chan2017-10-212-12/+17
| * | | | Disable CTA unless notice is scrolled to bottomJacky Chan2017-10-212-4/+29
| * | | | Fix Buy Ether flowJacky Chan2017-10-212-2/+5
| * | | | Shuffle tokensJacky Chan2017-10-214-25/+44
| * | | | Add Go to Coinbase; Show Buy Ether after signupJacky Chan2017-10-2110-74/+125
| * | | | Hide Warning after changing import optionsJacky Chan2017-10-212-5/+10
| * | | | Implement Buy Ether Screen UIJacky Chan2017-10-213-8/+318
| * | | | Implement Import Account ScreenJacky Chan2017-10-215-16/+328
| * | | | Add BackupPhraseScreenJacky Chan2017-10-216-14/+406
| * | | | Add NoticeScreenJacky Chan2017-10-214-20/+119
| * | | | Add UniqueImageScreenJacky Chan2017-10-2110-64/+329
| * | | | Add BreadcrumbsJacky Chan2017-10-213-2/+47
| * | | | CreatePasswordScreenJacky Chan2017-10-214-3/+105
| * | | | Adding CreatePasswordScreenJacky Chan2017-10-216-2/+95
| |/ / /
* | | | Merge pull request #2429 from MetaMask/i2428-AltEnsTldsFrankie2017-10-244-2/+13
|\ \ \ \
| * | | | Try to fix intermittent test failure in NonceTracker testsDan Finlay2017-10-231-0/+4
| * | | | Add support for alternative ENS TLDsDan Finlay2017-10-232-1/+3
| * | | | Version 3.11.2v3.11.2Dan Finlay2017-10-222-1/+6
|/ / / /
* | | | Merge pull request #2423 from MetaMask/json-rpc-fixThomas Huang2017-10-221-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Temporarily reversal of json-rpc-engineKevin Serrano2017-10-221-1/+1
|/ / /
* | | Merge pull request #2419 from MetaMask/Version-3.11.1Thomas Huang2017-10-212-1/+3
|\ \ \
| * | | Version 3.11.1v3.11.1Dan Finlay2017-10-212-1/+3
|/ / /
* | | Merge pull request #2401 from MetaMask/filter-fix-maybeFrankie2017-10-212-1/+2
|\ \ \
| * | | changelog entry for filter fixkumavis2017-10-211-0/+1
| * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f...kumavis2017-10-218-32/+99
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2412 from MetaMask/x-frame-optionskumavis2017-10-211-1/+1
|\ \ \ \
| * | | | mascara - set x-frame-options header to DENYfrankiebee2017-10-201-1/+1
* | | | | Merge pull request #2389 from MetaMask/i2348-SelectAccountOnNewVaultThomas Huang2017-10-217-29/+96
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into i2348-SelectAccountOnNewVaultThomas Huang2017-10-201-2/+2
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #2409 from chikeichan/fix-account-creationkumavis2017-10-201-1/+1
|\ \ \ \ \
| * | | | | Update eth-keyring-controller dependencyChi Kei Chan2017-10-201-1/+1
|/ / / / /
* | | | | Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0Kevin Serrano2017-10-191-1/+1
|\ \ \ \ \
| * | | | | fix(package): update react-simple-file-input to version 2.0.0greenkeeper[bot]2017-10-141-1/+1
| | * | | | LintedDan Finlay2017-10-202-2/+1
| | * | | | Fix bug where new account was not immediately selectedDan Finlay2017-10-201-3/+14
| | * | | | Allow computed balances to enumerate its own viewDan Finlay2017-10-201-2/+3
| | * | | | Patch sandwich-expando for security updateDan Finlay2017-10-201-1/+1
| | * | | | Fix bug that breaks ui dev modeDan Finlay2017-10-191-1/+6
| | * | | | Remove account-tracker from keyringControllerDan Finlay2017-10-192-2/+1
| | * | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-1912-105/+97
| | |\ \ \ \ | |_|/ / / / |/| | | | |
| | * | | | Make account tracking much more reactiveDan Finlay2017-10-192-12/+13
| | * | | | Make account tracking more reactiveDan Finlay2017-10-193-29/+33
| | * | | | Refresh computed balances controller when restoring vaultDan Finlay2017-10-192-1/+6
| | * | | | Add validation to balance constructorDan Finlay2017-10-191-0/+10
| | * | | | Stop tracking old account balances after restore vaultDan Finlay2017-10-191-0/+13
| | * | | | Merge branch 'master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-189-66/+6
| | |\ \ \ \
| | * | | | | Bump changelogDan Finlay2017-10-181-0/+1
| | * | | | | Promisify metamask-controller vault creating methodsDan Finlay2017-10-181-17/+10
| | * | | | | Select first account when restoring seedDan Finlay2017-10-181-3/+17
| | * | | | | Select first account on new vault creationDan Finlay2017-10-181-1/+12
| |/ / / / /
| | | * | | deps - bump eth-json-rpc-filters for log filter fixkumavis2017-10-211-1/+1
| | | * | | deps - bump eth-json-rpc-filterskumavis2017-10-191-1/+1
| |_|/ / / |/| | | |
* | | | | Merge pull request #2396 from MetaMask/revert-2318-network-controller-clientKevin Serrano2017-10-1911-105/+96
|\ \ \ \ \
| * | | | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-1911-105/+96
|/ / / / /
* | | | | Merge pull request #2387 from watilde/fixes-2208Kevin Serrano2017-10-191-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Increase line-height for account nicknamesDaijiro Wachi2017-10-181-0/+1
|/ / / /
* | | | Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGenerationKevin Serrano2017-10-178-65/+4
|\ \ \ \
| * | | | Move etherscan link logic into moduleDan Finlay2017-10-148-65/+4
| |/ / /
* | | | Merge pull request #2379 from MetaMask/FixImportedTypedDataSigningKevin Serrano2017-10-172-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Bump changelogDan Finlay2017-10-161-0/+1
| * | | Bump version on eth-simple-keyringDan Finlay2017-10-161-1/+1
|/ / /
* | | Merge pull request #2352 from MetaMask/i1340-SynchronousInjectionkumavis2017-10-133-5/+13
|\ \ \
| * | | contentscript - fix inpage require and bundlingkumavis2017-10-131-4/+4
| * | | Break up inpage file read into multiple linesDan Finlay2017-10-131-1/+3
| * | | Increase build readabilityDan Finlay2017-10-131-2/+7
| * | | Merge branch 'master' into i1340-SynchronousInjectionDan Finlay2017-10-1341-217/+742
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2345 from MetaMask/Version-3.11.0Thomas Huang2017-10-132-2/+4
|\ \ \ \
| * | | | Version 3.11.0v3.11.0Dan Finlay2017-10-122-2/+4
* | | | | Merge pull request #2318 from MetaMask/network-controller-clientFrankie2017-10-1211-96/+105
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | deps - bump eth-rpc-client for fixkumavis2017-10-121-1/+1
| * | | | nonce-tracker - use blockTracker directlykumavis2017-10-123-10/+8
| * | | | ui - network - fix localhost active statuskumavis2017-10-111-1/+1
| * | | | network - convert localhost from custom rpc to network typekumavis2017-10-110-0/+0
| * | | | test - integration - intercept reload attemptskumavis2017-10-111-0/+3
| * | | | deps - bump eth-json-rpc-middleware for fixkumavis2017-10-111-1/+1
| * | | | network-controller - use obj-proxy for providerProxykumavis2017-10-113-25/+11
| * | | | util - add obj-proxykumavis2017-10-111-0/+19
| * | | | events-proxy - clean upkumavis2017-10-111-5/+5
| * | | | lint fixeskumavis2017-10-112-8/+3
| * | | | network controller - refactor to use eth-rpc-clientkumavis2017-10-113-29/+36
| * | | | metamask controller - define this.newTransaction to ease instantiation orderkumavis2017-10-111-1/+6
| * | | | metamask controller - simplify provider initkumavis2017-10-111-22/+16
| * | | | metamask controller - breakout getAccounts methodkumavis2017-10-111-12/+14
* | | | | Merge pull request #2344 from MetaMask/FixTokenHelpLinkDan Finlay2017-10-122-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix link to token support pageDan Finlay2017-10-122-1/+2
|/ / / /
| * | | Begin implementing sync injection ideaDan Finlay2017-10-052-4/+3
| | * | Changelog addition.Kevin Serrano2017-10-101-0/+1
| | * | Merge branch 'master' into version-debuggingKevin Serrano2017-10-1021-24/+539
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #2296 from MetaMask/precision-fixDan Finlay2017-10-102-4/+45
|\ \ \ \
| * | | | Make modificationKevin Serrano2017-10-101-1/+1
| * | | | Fix to actually fail in earlier versions.Kevin Serrano2017-10-101-5/+7
| * | | | Add test to look for wei precision.Kevin Serrano2017-10-101-0/+36
| * | | | Merge branch 'master' into precision-fixKevin Serrano2017-10-107-8/+97
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into precision-fixKevin Serrano2017-10-062-1/+4
| |\ \ \ \ \
| * | | | | | Fix precision to account for small wei increase.Kevin Serrano2017-10-061-4/+7
* | | | | | | Merge pull request #2223 from ukstv/masterDan Finlay2017-10-1013-12/+397
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | More appropriate stylingSergey Ukustov2017-10-081-1/+2
| * | | | | | Validate data format for eth_signTypedDataSergey Ukustov2017-10-072-1/+5
| * | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-075-2/+84
| |\ \ \ \ \ \
| * | | | | | | Bump changelogDan Finlay2017-10-061-0/+2
| * | | | | | | Merge branch 'Version-3.10.9' into SignTypedDataDan Finlay2017-10-062-1/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into SignTypedDataDan Finlay2017-10-0611-90/+83
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Bump provider-engine for better sender validationsDan Finlay2017-10-061-1/+1
| * | | | | | | | Add signTypedData input validationsDan Finlay2017-10-062-4/+20
| * | | | | | | | Require keyring-controller 2.1.0Dan Finlay2017-10-061-1/+1
| * | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-0610-47/+52
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-0318-224/+193
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Respect code styleSergey Ukustov2017-09-302-3/+2
| * | | | | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-3011-9/+372
* | | | | | | | | | Merge pull request #2305 from MetaMask/nodeifyFrankie2017-10-072-6/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'nodeify' of github.com:MetaMask/metamask-extension into nodeifykumavis2017-10-071-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | lint fix - nodeifykumavis2017-10-071-1/+1
| * | | | | | | | | | nodeify - fix testkumavis2017-10-071-4/+3
| |/ / / / / / / / /
| * | | / / / / / / nodeify - allow callback to be optionalkumavis2017-10-071-2/+10
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInitkumavis2017-10-072-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check status of pending transactions on startupDan Finlay2017-10-072-0/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 22:21:14 +0800