aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | 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
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #2306 from MetaMask/i2294-MarkTxAsFailedAfterSameNonceIsMinedkumavis2017-10-074-2/+81
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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-073-3/+11
| * | | | | | | Add failing test for issue #2294Dan Finlay2017-10-071-1/+52
|/ / / / / / /
* | | | | | | Merge pull request #2293 from MetaMask/Version-3.10.9kumavis2017-10-062-1/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Version 3.10.9v3.10.9Dan Finlay2017-10-062-1/+4
|/ / / / /
* | | | | Merge pull request #2292 from MetaMask/rebrocast-by-timeStampDan Finlay2017-10-063-4/+7
|\ \ \ \ \
| * | | | | add to CHANGELOG.mdfrankiebee2017-10-061-0/+1
| * | | | | "fix" hours for messagefrankiebee2017-10-061-1/+2
| * | | | | Merge branch 'master' into rebrocast-by-timeStampfrankiebee2017-10-063-6/+6
| |\| | | |
| * | | | | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-062-4/+5
* | | | | | Merge pull request #2289 from MetaMask/mascara-tuneupsThomas Huang2017-10-068-86/+76
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | mascara/background: use async awaitfrankiebee2017-10-051-20/+13
| * | | | | use log.debugfrankiebee2017-10-051-3/+3
| * | | | | mascara: linting and code clean upfrankiebee2017-10-055-58/+41
| * | | | | dont lint jqueryfrankiebee2017-10-051-1/+1
| * | | | | add /mascara to lintingfrankiebee2017-10-051-1/+1
| * | | | | mascara:exampl/app - add a send tx buttonfrankiebee2017-10-052-8/+22
* | | | | | Merge pull request #2282 from MetaMask/Enforce0xPrefixForKeyringsThomas Huang2017-10-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enforce 0x prefix on accounts with new hd keyringDan Finlay2017-10-051-1/+1
|/ / / / /
* | | | | Merge pull request #2276 from MetaMask/revert-computeDan Finlay2017-10-052-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert to normal balances.Kevin Serrano2017-10-052-5/+5
| | | | * Begin implementing sync injection ideaDan Finlay2017-10-052-4/+3
| |_|_|/ |/| | |
* | | | Merge pull request #2279 from MetaMask/filter-default-fixFrankie2017-10-051-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | deps - bump eth-json-rpc-filters for log filter fixkumavis2017-10-051-1/+1
|/ / /
* | | Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0Thomas Huang2017-10-041-1/+1
|\ \ \
| * | | chore(package): update coveralls to version 3.0.0greenkeeper[bot]2017-09-291-1/+1
| |/ /
* | | Merge pull request #2264 from MetaMask/greenkeeper/mocha-4.0.0Thomas Huang2017-10-041-1/+1
|\ \ \
| * | | chore(package): update mocha to version 4.0.0greenkeeper[bot]2017-10-031-1/+1
* | | | Merge pull request #2175 from MetaMask/RemoveSlackLinkKevin Serrano2017-10-042-7/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-10-0346-1925/+1786
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-09-2718-82/+356
| |\ \ \ \
| * | | | | Remove slack linkDan Finlay2017-09-272-7/+2
* | | | | | Merge pull request #2250 from interfect/masterFrankie2017-10-041-1/+0
|\ \ \ \ \ \
| * | | | | | Don't pass origin as an HTTP headerAdam Novak2017-10-021-1/+0
* | | | | | | Merge pull request #2251 from BrandenSoropia/remove-metamask-titleKevin Serrano2017-10-041-8/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Removed MetaMasktitle. Fixed #1730.Branden Soropia2017-10-021-8/+0
| |/ / / / /
* | | | | | Merge pull request #2261 from MetaMask/retry-warn-not-failFrankie2017-10-033-22/+41
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | ui - tx history - simplify error+warning display codekumavis2017-10-031-12/+22
| * | | | | pending tx tracker - on tx:warn append error message instead of error objkumavis2017-10-031-1/+1
| * | | | | pending tx tracker - test - expect warning event on resubmit failurekumavis2017-10-031-2/+9
| * | | | | pending tx tracker - tx:warning event includes err objkumavis2017-10-031-2/+2
| * | | | | pending tx tracker - test - rename tests to match event namekumavis2017-10-031-4/+4
| * | | | | 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 pull request #2260 from MetaMask/history-noteskumavis2017-10-034-17/+23
|\ \ \ \ \
| * \ \ \ \ Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h...kumavis2017-10-034-6/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into history-notesfrankiebee2017-10-034-3/+27
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #2259 from MetaMask/tx-history-fixFrankie2017-10-033-2/+25
|\ \ \ \ \ \ \
| * | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTxkumavis2017-10-033-2/+25
* | | | | | | | Merge pull request #2254 from MetaMask/block-cache-fixKevin Serrano2017-10-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | deps - bump pe for block cache fixkumavis2017-10-031-1/+1
|/ / / / / / /
* | | | | | | 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
| | * | | | | tx state history - test - fix format of history entrieskumavis2017-10-031-0/+26
| | |/ / / /
| | * / / / transaction - provide notes for historyfrankiebee2017-10-032-12/+14
| |/ / / / |/| | | |
* | | | | Merge pull request #2241 from MetaMask/Version-3.10.8-FixCurrencyDan Finlay2017-09-303-2/+6
|\ \ \ \ \
| * | | | | Version 3.10.8 - Fix Currency Conversionv3.10.8Dan Finlay2017-09-303-2/+6
|/ / / / /
* | | | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactionskumavis2017-09-305-77/+2
|\ \ \ \ \
| * | | | | pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-305-77/+2
* | | | | | 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-305-62/+56
|\| | | | | |
| * | | | | | network - remove long dead etherscan provider codekumavis2017-09-301-10/+0
| * | | | | | network - convert localhost from custom rpc to network typekumavis2017-09-305-23/+12
| * | | | | | network controller - small refactorkumavis2017-09-302-35/+50
| |/ / / / /
* | | | | | Merge pull request #2234 from MetaMask/Version-3.10.7kumavis2017-09-302-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Version 3.10.7v3.10.7Dan Finlay2017-09-302-1/+3
|/ / / / /
* | | | | Merge pull request #2230 from MetaMask/ui-dev-fixDan Finlay2017-09-302-66/+69
|\ \ \ \ \
| * | | | | development - fix ui devkumavis2017-09-302-66/+69
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2228 from MetaMask/i2218-SelectAccountBugFixKevin Serrano2017-09-302-0/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Ensure selected account is always set if possibleDan Finlay2017-09-302-0/+10
|/ / / /
* | | | Merge pull request #2124 from MetaMask/breakout-mascarakumavis2017-09-2810-144/+27
|\ \ \ \
| * | | | re-enabled x-metamask-origin for mascarafrankiebee2017-09-282-5/+1
| * | | | bump metamascara versionfrankiebee2017-09-231-1/+1
| * | | | platforms: put context for extension in platform extension classfrankiebee2017-09-223-2/+4
| * | | | mascara: turn off backgroundfrankiebee2017-09-202-3/+2
| * | | | update metamascarafrankiebee2017-09-201-1/+1
| * | | | stub platformfrankiebee2017-09-202-0/+2
| * | | | Merge branch 'master' into breakout-mascarafrankiebee2017-09-205-6/+18
| |\ \ \ \
| * | | | | add context to platform to not have X-Metamask-Origin in mascarafrankiebee2017-09-202-1/+2
| * | | | | require metamascarafrankiebee2017-09-196-140/+23
* | | | | | Merge pull request #2177 from MetaMask/new-currency-testkumavis2017-09-287-225/+678
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into new-currency-testkumavis2017-09-2833-1532/+1362
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #2194 from MetaMask/network-controller-refactorkumavis2017-09-283-36/+37
|\ \ \ \ \ \ \
| * | | | | | | network controller - move _setProvider to bottomkumavis2017-09-281-18/+18
| * | | | | | | network controller - refactor to use _setProviderkumavis2017-09-282-20/+31
| * | | | | | | network - remove getter/setterkumavis2017-09-281-23/+14
| * | | | | | | metamask - improve commentkumavis2017-09-281-2/+1
* | | | | | | | Merge pull request #2193 from MetaMask/FixAccountSelectionThomas Huang2017-09-284-598/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Version 3.10.6Dan Finlay2017-09-282-1/+3
| * | | | | | | | Commit to the eth-keyring-controller moduleDan Finlay2017-09-282-600/+1
| * | | | | | | | Remove dead referenceDan Finlay2017-09-281-1/+0
| * | | | | | | | Bump changelogDan Finlay2017-09-281-0/+3
| * | | | | | | | Fix Account SelectionDan Finlay2017-09-282-3/+7
* | | | | | | | | Merge pull request #2196 from MetaMask/express-bumpDan Finlay2017-09-281-1/+1
|\ \ \ \ \ \ \ \ \
generated by cgit (git 2.34.1) at 2024-10-14 02:21:05 +0800