aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-3020-75/+579
|\
| * Update popout to fullscreen iconAlexander Tseung2018-01-181-0/+21
| * Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-1768-42/+502
| |\
| | * [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)Dan J Miller2018-01-161-3/+7
| | * Merge branch 'uat' into cb-388Chi Kei Chan2018-01-133-2/+7
| | |\
| | | * Fix styling in initializationAlexander Tseung2018-01-131-2/+7
| | | * [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-132-0/+0
| | * | Update main view stylingAlexander Tseung2018-01-111-0/+128
| | |/
| | * 4.0.9kumavis2018-01-091-1/+1
| | * Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-0465-42/+365
| | |\
| | | * Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-231-1/+1
| | | |\
| | | | * Update manifest.json version from 4.0.4 to 4.0.5 (#2797)Alexander Tseung2017-12-231-1/+1
| | | * | Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-2365-42/+365
| | | |\|
| | | | * Track usage of old and new UI (#2794)Alexander Tseung2017-12-233-6/+57
| | | | * Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-212-0/+5
| | | | |\
| | | | | * Adds updateTransaction to background and used it to update after editing in s...Dan2017-12-212-6/+5
| | | | | * Canceled, edited transactions show edited amount.Dan2017-12-212-0/+6
| | | | * | Merge branch 'master' into NewUI-flatDan2017-12-219-37/+179
| | | | |\ \ | | | | | |/ | | | | |/|
| * | | | | Version 3.13.5v3.13.5Dan Finlay2018-01-171-1/+1
| * | | | | Create new flag for simple sends to avoid overloading other flagDan Finlay2018-01-171-2/+2
| * | | | | Merge branch 'master' into i2907-NoCodeGasLimitkumavis2018-01-171-2/+6
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into open-popupFrankie2018-01-163-13/+79
| | |\ \ \ \ \
| | * | | | | | transactions - emit 'newUnapprovedTx' before estimateGas finishesfrankiebee2018-01-151-2/+6
| * | | | | | | Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-162-11/+74
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimationDan Finlay2018-01-162-11/+74
| | |\ \ \ \ \ \
| | | * | | | | | Prefer passing a provider over an ethQuery instanceDan Finlay2018-01-132-8/+4
| | | * | | | | | Improve gas price estimation by backfilling recent-blocksDan Finlay2018-01-122-9/+76
| | | |/ / / / /
| * | / / / / / Set gas limit to 21k for recipients with no codeDan Finlay2018-01-161-5/+22
| |/ / / / / /
| * | | | | | Merge pull request #2900 from MetaMask/infura-rest-apikumavis2018-01-161-2/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' into infura-rest-apikumavis2018-01-122-3/+10
| | |\ \ \ \ \
| | * | | | | | provider - infura - use infura REST apikumavis2018-01-091-2/+5
| | * | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
| * | | | | | | ci(ko/messages.json): add korean localization filex86kernel2018-01-101-0/+10
| | |/ / / / / | |/| | | | |
| * | | | | | Version 3.13.4v3.13.4Dan Finlay2018-01-101-1/+1
| * | | | | | Default to 1 gwei for empty blocksDan Finlay2018-01-091-2/+3
| * | | | | | Default gas estimate to 1 gwei for networks with no block activityDan Finlay2018-01-091-0/+6
| * | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
| |/ / / / /
| * | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddressThomas Huang2018-01-091-0/+11
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into i2621-0xRecipientAddressDan Finlay2018-01-093-2/+28
| | |\ \ \ \ \
| | * | | | | | Account for 0x/empty string address and contract creationThomas2018-01-081-0/+11
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-091-4/+9
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Add fix for infinite spinner for incorrect seed phrase.Kevin Serrano2018-01-041-4/+9
| * | | | | | Fix feature to workDan Finlay2018-01-062-3/+11
| * | | | | | LintedDan Finlay2018-01-061-3/+0
| * | | | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-063-2/+23
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-031-2/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | tx-gas-utils - tx-param-validation - use more intuitive checkkumavis2018-01-031-2/+2
| | * | | | Merge branch 'master' into tx-param-vaalidationFrankie2017-12-223-18/+73
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | transactions - throw error if dapp provides txParams whos value has a decimalfrankiebee2017-12-211-2/+9
| * | | | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-291-1/+2
| |\ \ \ \ \
| | * | | | | transactions:pending - only check nonces of transactions who's from adress ma...frankiebee2017-12-281-1/+2
| | | |_|/ / | | |/| | |
| * / | | | Fix some silly linting issues.Kevin Serrano2017-12-282-2/+2
| |/ / / /
| * | | | Remove retryTimePeriod from tx controllerDan Finlay2017-12-221-1/+0
| * | | | 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
| * | | | Allow updating token detailsDan Finlay2017-12-191-4/+4
| | |/ / | |/| |
| * | | Merge branch 'master' into i#2720frankiebee2017-12-161-1/+1
| |\| |
| | * | Change console.log for opts in _configureInfuraProviderThomas Huang2017-12-161-1/+1
| * | | transactions:gas-utils - handle new type of estimateGas errorfrankiebee2017-12-151-1/+5
| |/ /
| * | Merge pull request #2747 from MetaMask/Version-3.13.3Thomas Huang2017-12-151-1/+1
| |\ \
| | * | Version 3.13.3v3.13.3Dan Finlay2017-12-151-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
| * | | Revert "Revert "network - for infura networks use the infura block tracker pr...kumavis2017-12-141-7/+50
| * | | Revert "network - for infura networks use the infura block tracker provider"Frankie2017-12-141-50/+7
| * | | Merge pull request #2741 from MetaMask/infura-block-trackerFrankie2017-12-141-7/+50
| |\ \ \
| | * | | network - for infura networks use the infura block tracker providerkumavis2017-12-141-7/+50
| * | | | dont aggresively query account datafrankiebee2017-12-141-2/+0
| |/ / /
| * | | Version 3.13.2v3.13.2Dan Finlay2017-12-101-1/+1
| * | | Pass polling interval to zero client providerDan Finlay2017-12-101-1/+5
| * | | tx-controller - failed state is a finished statekumavis2017-12-082-7/+9
| * | | Version 3.13.1Dan Finlay2017-12-081-1/+1
| * | | Do not allow nonces larger than the next valid nonceDan Finlay2017-12-081-0/+4
| * | | Merge branch 'master' into patch-2Dan Finlay2017-12-084-1/+21
| |\ \ \
| | * | | Version 3.13.0Dan Finlay2017-12-071-1/+1
| | * | | Enforce retry tx at minimum gas of previous txDan Finlay2017-12-071-1/+4
| | * | | Fix retry actionDan Finlay2017-12-071-1/+9
| | * | | Add retry background method and actionDan Finlay2017-12-073-0/+9
| * | | | A more expressive wayvicnaum2017-12-071-5/+2
| * | | | Fix for #2644 - Specified Nonce isn't usedvicnaum2017-12-071-1/+6
| |/ / /
* | | / Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-1/+2
| |_|/ |/| |
* | | Adds button for opening app in main browser window in extension.Dan2017-12-132-0/+20
* | | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-0810-29/+150
|\ \ \
| * | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-12-072-3/+21
| |\| |
| | * | 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-305-17/+85
| | |\
| | | * Bump version to 3.12.1Dan Finlay2017-11-301-1/+1
| | | * Fix migration commentDan Finlay2017-11-301-2/+3
| | | * Migrate old data to include firstVersion infoDan Finlay2017-11-292-0/+41
| | | * LintedDan Finlay2017-11-292-2/+2
| | | * Add seed phrase bounty award noticeDan Finlay2017-11-291-1/+0
| | | * Get notice version filtering working nicelyDan Finlay2017-11-292-24/+28
| | | * Add firstVersion field to notices selectorDan Finlay2017-11-292-1/+5
| | | * Add optional version field to noticesDan Finlay2017-11-292-1/+20
| | * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fixkumavis2017-11-301-1/+1
| | |\|
| | | * 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-293-6/+10
| | |/ /
| | * | Prevent creation of multiple vaultsDan Finlay2017-11-211-31/+20
| | * | Add reproduction and mutex codeDan Finlay2017-11-211-2/+37
| | * | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3ErrorThomas Huang2017-11-211-0/+7
| | |\ \
| | | * | Add useful error when duplicate web3 is detected.Dan Finlay2017-11-011-0/+7
| * | | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-078-26/+129
* | | | | Lint fixDan2017-12-051-1/+1
* | | | | Css selected in background based on betaUI state.Dan2017-12-051-6/+15
* | | | | Add UI selectionDan2017-12-053-0/+19
|/ / / /
* | | | Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-271-0/+1
* | | | more eslint fixesJason Clark2017-11-261-1/+1
* | | | toggle wired up to preferences property storeJason Clark2017-11-252-2/+12
* | | | incremental commitClark, Jason (Contractor)2017-11-241-0/+8
* | | | Version BumpChi Kei Chan2017-11-161-1/+1
* | | | Merge branch 'master' into merge-masterChi Kei Chan2017-11-163-2/+12
|\| | |
| * | | newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-062-2/+2
| |/ /
| * | Merge pull request #2291 from MetaMask/gasPriceSpecifiedKevin Serrano2017-10-281-0/+1
| |\ \
| | * | Add indicator for specified gas priceKevin Serrano2017-10-061-0/+1
| * | | Resolve merge conflictsKevin Serrano2017-10-2720-64/+209
| |\ \ \
| | * | | 3.12.0v3.12.0kumavis2017-10-261-1/+1
| * | | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-107-4/+221
| |\ \ \ \
| * | | | | Make the function callback friendly.Kevin Serrano2017-10-101-4/+4
| * | | | | Simplify try catchKevin Serrano2017-10-061-4/+2
| * | | | | Catch an error if this is not defined.Kevin Serrano2017-10-061-1/+8
| * | | | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-063-5/+7
| |\ \ \ \ \
| * | | | | | Configured for callback-required function.'Kevin Serrano2017-10-051-2/+2
| * | | | | | Include OS versionKevin Serrano2017-10-051-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2519 from danjm/NewUI-flat-lintfixesThomas Huang2017-11-031-2/+0
|\ \ \ \ \ \
| * | | | | | Lint fixes for NewUI-flat.Dan2017-11-021-2/+0
* | | | | | | 4.0.3kumavis2017-10-261-1/+1
* | | | | | | Merge branch 'NewUI-flat' into uatChi Kei Chan2017-10-2619-37/+134
|\| | | | | |
| * | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-261-3/+7
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Resolving that ugly merge.Kevin Serrano2017-10-261-3/+7
| * | | | | | Sign Typed Request styling fixesChi Kei Chan2017-10-261-1/+1
| * | | | | | Signature request fixes.Dan2017-10-261-1/+1
| * | | | | | Add Info sectionAlexander Tseung2017-10-261-0/+0
| * | | | | | Fix styling on notification viewChi Kei Chan2017-10-251-2/+2
| * | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-2513-31/+30
| |\| | | | |
| | * | | | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-2513-31/+30
| | |\ \ \ \ \
| | | * | | | | Fix lint warningsDaijiro Wachi2017-10-2213-31/+30
| * | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-253-1/+81
| |\| | | | | |
| | * | | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-241-0/+76
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Add ShapeShift UIChi Kei Chan2017-10-211-0/+76
| | | |/ / / /
| | * | | | | Try to fix intermittent test failure in NonceTracker testsDan Finlay2017-10-231-0/+4
| | * | | | | Version 3.11.2v3.11.2Dan Finlay2017-10-221-1/+1
| | |/ / / /
| | * | | | Version 3.11.1v3.11.1Dan Finlay2017-10-211-1/+1
| * | | | | Account menu white check markChi Kei Chan2017-10-241-0/+14
* | | | | | 4.0.2kumavis2017-10-211-1/+1
* | | | | | 4.0.1kumavis2017-10-211-1/+1
|/ / / / /
* | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-214-27/+88
|\| | | |
| * | | | 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
| * | | | Remove account-tracker from keyringControllerDan Finlay2017-10-191-1/+0
| * | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-196-90/+72
| |\ \ \ \
| * | | | | 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
| * | | | | 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
* | | | | | Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-1955-29/+215
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Adding Account Dropdown V2Chi Kei Chan2017-10-134-24/+57
| * | | | | UI for send screen container without form rows.Dan2017-10-091-1/+4
| * | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-049-86/+90
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Enables remove token and ensures add/remove update the list without need for ...Dan2017-10-042-1/+13
| * | | | | Merge branch 'master' into mmnChi Kei Chan2017-09-2820-1119/+751
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-192-4/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into nmChi Kei Chan2017-09-1920-245/+519
| |\ \ \ \ \ \ \
| * | | | | | | | Improve styling in Confirmation Screen; Show decoded send token dataChi Kei Chan2017-09-131-1/+0
| * | | | | | | | Added signTokenTx; Adding token confirmation screenChi Kei Chan2017-09-121-0/+3
| * | | | | | | | Fix html heightChi Kei Chan2017-09-061-2/+2
| * | | | | | | | Replace Avenir Next with alternative.Dan2017-08-3011-0/+93
| * | | | | | | | Add bolt and info icon vector imagessdtsui2017-08-232-0/+22
| * | | | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-144-5/+21
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into NewUI-flatkumavis2017-08-095-189/+253
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-0713-370/+308
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add Roboto without hooking it up via importsdtsui2017-08-0518-0/+0
| * | | | | | | | | | | Adjust sidebar transition using @cjeria\'s feedbacksdtsui2017-08-031-0/+10
| * | | | | | | | | | | Ensure app-header is rendered in responsive layoutsdtsui2017-08-031-1/+1
| * | | | | | | | | | | Add Ethereum Logosdtsui2017-08-031-0/+11
| * | | | | | | | | | | Reset popup to 350x500, old form factor as advised by @Zanibassdtsui2017-08-011-1/+1
| * | | | | | | | | | | Add new fonts from @cjeria: DIN Next and DIN OTsdtsui2017-08-0112-0/+0
| * | | | | | | | | | | Adjust popup size to 545x450; refactor wallet view to fitsdtsui2017-08-011-1/+1
| * | | | | | | | | | | Set font-size on body of popup.html, for responsivenesssdtsui2017-07-311-1/+1
| * | | | | | | | | | | Adjust dimensions of popup.html and app bar to matchsdtsui2017-07-312-2/+2
* | | | | | | | | | | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-196-90/+72
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | contentscript - fix inpage require and bundlingkumavis2017-10-131-4/+4
* | | | | | | | | | | Break up inpage file read into multiple linesDan Finlay2017-10-131-1/+3
* | | | | | | | | | | Merge branch 'master' into i1340-SynchronousInjectionDan Finlay2017-10-1312-80/+317
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #2345 from MetaMask/Version-3.11.0Thomas Huang2017-10-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Version 3.11.0v3.11.0Dan Finlay2017-10-121-1/+1
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | nonce-tracker - use blockTracker directlykumavis2017-10-122-7/+4
| * | | | | | | | | | | network-controller - use obj-proxy for providerProxykumavis2017-10-111-3/+4
| * | | | | | | | | | | 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-112-29/+34
| * | | | | | | | | | | 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 #2223 from ukstv/masterDan Finlay2017-10-103-1/+182
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Validate data format for eth_signTypedDataSergey Ukustov2017-10-071-0/+4
| | * | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-073-1/+29
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'Version-3.10.9' into SignTypedDataDan Finlay2017-10-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-062-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add signTypedData input validationsDan Finlay2017-10-062-4/+20
| | * | | | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-062-6/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-039-80/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-303-1/+162
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #2305 from MetaMask/nodeifyFrankie2017-10-071-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | lint fix - nodeifykumavis2017-10-071-1/+1
| | * | | | | | | | | | | | nodeify - allow callback to be optionalkumavis2017-10-071-2/+10
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInitkumavis2017-10-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Check status of pending transactions on startupDan Finlay2017-10-071-0/+1
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | When checking pending txs, check for successful txs with same nonce.Dan Finlay2017-10-071-0/+20
| * | | | | | | | | | | | Provide method for tx tracker to refer to all txsDan Finlay2017-10-072-1/+8
| |/ / / / / / / / / / /
| * | | | / / / / / / / Version 3.10.9v3.10.9Dan Finlay2017-10-061-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | "fix" hours for messagefrankiebee2017-10-061-1/+2
| * | | | | | | | | | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-062-4/+5
| |/ / / / / / / / /
* / / / / / / / / / Begin implementing sync injection ideaDan Finlay2017-10-051-2/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2250 from interfect/masterFrankie2017-10-041-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't pass origin as an HTTP headerAdam Novak2017-10-021-1/+0
* | | | | | | | | | pending tx tracker - on tx:warn append error message instead of error objkumavis2017-10-031-1/+1
* | | | | | | | | | pending tx tracker - tx:warning event includes err objkumavis2017-10-031-2/+2
* | | | | | | | | | pending tx tracker - resubmit - warn dont error on unknown errorkumavis2017-10-031-2/+5
* | | | | | | | | | pending tx tracker - dont throw on load failurekumavis2017-10-031-1/+0
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h...kumavis2017-10-032-2/+4
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into history-notesfrankiebee2017-10-032-2/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTxkumavis2017-10-032-2/+3
| | * | | | | | | | | Merge pull request #2138 from sunify/fix-firefox-corsThomas Huang2017-10-031-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Update manifest.jsonKevin Serrano2017-10-031-2/+1
| | | * | | | | | | | Wildcard for infura.io permissions, added permission for cryptonator apiAlex Lunyov2017-09-221-4/+2
| | | * | | | | | | | Fix CORS issues in FireFoxAlex Lunyov2017-09-211-1/+5
* | | | | | | | | | | tx state history - append note to first op of diffkumavis2017-10-031-2/+5
|/ / / / / / / / / /
* / / / / / / / / / transaction - provide notes for historyfrankiebee2017-10-032-12/+14
|/ / / / / / / / /
* | | | | | | | | Version 3.10.8 - Fix Currency Conversionv3.10.8Dan Finlay2017-09-302-2/+2
* | | | | | | | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactionskumavis2017-09-303-26/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-303-26/+1
* | | | | | | | | | Merge pull request #2239 from MetaMask/network-controller-contdFrankie2017-09-301-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | network - make network controller internal network switching explicitkumavis2017-09-301-2/+3
* | | | | | | | | | | Merge pull request #2237 from MetaMask/network-controller-contdFrankie2017-09-303-36/+47
|\| | | | | | | | | |
| * | | | | | | | | | network - convert localhost from custom rpc to network typekumavis2017-09-303-7/+3
| * | | | | | | | | | network controller - small refactorkumavis2017-09-302-35/+50
| |/ / / / / / / / /
* / / / / / / / / / Version 3.10.7v3.10.7Dan Finlay2017-09-301-1/+1
|/ / / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 12:12:58 +0800