aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add new variant for SenderToRecipient componentAlexander Tseung2018-08-2313-107/+210
|
* Merge pull request #5109 from MetaMask/MoveOutInpageProviderDan Finlay2018-08-229-276/+72
|\ | | | | Move inpage-provider and port-stream outside
| * Move inpage-provider and port-stream outsideDan Finlay2018-08-219-284/+87
| | | | | | | | | | | | | | | | | | | | With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream. To reduce the size of its dependencies, I have moved the [metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream). This allows them to be more easily depended & iterated on by external projects.
* | Merge pull request #5118 from MetaMask/provider2-bugfixDan Finlay2018-08-223-13/+20
|\ \ | | | | | | bugfix - prevents old blocktracker from getting internal hooks migrated
| * | bugfix - prevents old blocktracker from getting internal hooks migratedkumavis2018-08-223-13/+20
| |/
* | Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flagDan J Miller2018-08-222-15/+2
|\ \ | | | | | | Fix e2e tests: adapt ganache flags and remove unnecessary checks
| * | Remove unnecessary checks and user actions in metamask-beta-ui.specDan Miller2018-08-222-15/+2
| | |
| * | Run ganache with a blocktime flag for npm:run:ganache:start.Dan Miller2018-08-221-2/+2
| | |
* | | Merge pull request #5112 from MetaMask/hardware-wallet-fixesBruno Barbieri2018-08-212-3/+6
|\ \ \ | |_|/ |/| | Hardware wallet fixes
| * | fix unit testsbrunobar792018-08-211-1/+1
| | |
| * | fix hardware wallets account namebrunobar792018-08-211-1/+3
| | |
| * | fix account removalbrunobar792018-08-211-1/+2
|/ /
* | Merge pull request #5095 from MetaMask/i4953-update-logoDan Finlay2018-08-218-56/+143
|\ \ | |/ |/| Update logo wordmark
| * Update logo wordmarkAlexander Tseung2018-08-198-56/+143
| |
* | Merge pull request #5090 from whymarrh/fix-cikumavis2018-08-185-151/+99
|\ \ | |/ |/| Update CircleCI configuration to use workspaces instead of caches
| * ci: Use workspaces instead of caches for passing data downstreamWhymarrh Whitby2018-08-181-89/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | CircleCI no longer allows external PR builds to save caches so jobs that depend on cached data from a upstream job will no longer get the files they need. This change replaces our usages of caches for passing data downstream with workspaces, which appear to be the more correct feature to use. References: - https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs - https://circleci.com/blog/deep-diving-into-circleci-workspaces/
| * ci: Install any npm@6Whymarrh Whitby2018-08-181-1/+1
| |
| * ci: Use Firefox 61.0.2Whymarrh Whitby2018-08-181-1/+1
| |
| * ci: Disable Firefox updatesWhymarrh Whitby2018-08-182-1/+24
| |
| * ci: Don't cache Firefox installWhymarrh Whitby2018-08-184-61/+28
|/ | | | | | | | | Two important notes: 1. The time it takes to download is negligble compared to e2e test runs 2. Since we cannot use environment variables in CircleCI cache keys we can't cache the download correctly and have it update when we switch firefox versions—this isn't the end of the world because of point 1
* Merge pull request #5050 from MetaMask/ledger-supportDan Finlay2018-08-1818-198/+559
|\ | | | | Add Ledger hardware wallet support
| * Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-183-2/+111
| |\ | |/ |/|
* | Merge pull request #4898 from dmvt/multi-account-restoreDan Finlay2018-08-183-2/+111
|\ \ | | | | | | Restore multiple consecutive accounts with balances.
| * | Restores accounts until one with a zero balance is foundDan Matthews2018-08-173-2/+111
|/ /
| * update package-lock.jsonbrunobar792018-08-180-0/+0
| |\ | |/ |/|
* | info.js Remove width element to fix email layout (#4588)Anatoli Babenia2018-08-161-1/+0
| | | | | | Fix for #2855 which is gone from master for some reason
* | Merge pull request #4279 from MetaMask/network-remove-provider-engineDan Finlay2018-08-1643-2918/+1285
|\ \ | | | | | | Enhancement: New BlockTracker and Json-Rpc-Engine based Provider
| * | Remove commented out code for detect-token-testThomas2018-08-151-10/+0
| | |
| * | Update eth-json-rpc-filtersThomas2018-08-152-1971/+18
| | |
| * | E2E - Dont error on browser errorsThomas2018-08-151-1/+2
| | |
| * | Merge branch 'develop' into network-remove-provider-engineThomas2018-08-1567-428/+1461
| |\ \ | | | | | | | | | | | | Override package-lock and fix merge conflicts
| * | | Confirms new contract token in the popupThomas2018-08-141-6/+6
| | | |
| * | | DelayThomas2018-08-091-0/+1
| | | |
| * | | confirms a deplay contract tx in the popupThomas2018-08-091-0/+9
| | | |
| * | | Use develop e2e beta testsThomas2018-08-081-109/+34
| | | |
| * | | Merge branch 'network-remove-provider-engine' of ↵frankiebee2018-08-081-32211/+32287
| |\ \ \ | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into network-remove-provider-engine
| | * | | deps - update package-lockfrankiebee2018-08-071-32211/+32287
| | | | |
| * | | | lint fixesfrankiebee2018-08-081-2/+2
| |/ / /
| * | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵frankiebee2018-08-0718-598/+235
| |\ \ \ | | | | | | | | | | | | | | | into network-remove-provider-engine-tests
| * \ \ \ Merge branch 'network-remove-provider-engine' into ↵frankiebee2018-08-071-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | network-remove-provider-engine-tests
| | * | | | network - fix blockTracker reference to return the blockTrackerProxy instead ↵frankiebee2018-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | of the direct blockTracker reference
| * | | | | Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-0229-695/+1203
| |\ \ \ \ \
| * | | | | | LintThomas Huang2018-07-311-2/+2
| | | | | | |
| * | | | | | Set metamask controller network provider to localhostThomas Huang2018-07-313-2/+24
| | | | | | |
| * | | | | | Disallow netConnections other than localhostsThomas2018-07-301-0/+4
| | | | | | |
| * | | | | | Detect Tokens are weirdThomas2018-07-301-26/+31
| | | | | | |
| * | | | | | Merge branch 'develop' into network-remove-provider-engineThomas2018-07-26355-3796/+10262
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | test - unit - remove tests for obsolete methodskumavis2018-07-041-52/+0
| | | | | | |
| * | | | | | deps - update lockkumavis2018-07-041-2/+26
| | | | | | |
| * | | | | | test - run ganache rpc without vm errorskumavis2018-07-041-1/+1
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-041-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-04134-773/+800
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | test - e2e - contract test - add logskumavis2018-07-041-7/+9
| | | | | | | | |
| * | | | | | | | test - e2e - fix missing importkumavis2018-07-031-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into network-remove-provider-enginekumavis2018-07-032-3/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #4711 from alextsg/network-remove-provider-enginekumavis2018-07-031-2/+15
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix notice screen incorrectly disabling Accept button after multiple …
| | * | | | | | | | | Fix notice screen incorrectly disabling Accept button after multiple noticesAlexander Tseung2018-07-031-2/+15
| |/ / / / / / / / /
| * | | | | | | | | test - e2e - move timingskumavis2018-07-031-1/+1
| | | | | | | | | |
| * | | | | | | | | test - e2e-beta - update some api callskumavis2018-07-031-6/+4
| | | | | | | | | |
| * | | | | | | | | dep - automated package-lock fixeskumavis2018-07-031-4/+42
| | | | | | | | | |
| * | | | | | | | | deps - update package-lockkumavis2018-07-031-190/+336
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-03100-32518/+33751
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | | | lint - fix lint for networkkumavis2018-06-133-3/+0
| | | | | | | | | | |
| * | | | | | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache ↵kumavis2018-06-135-41/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware order
| * | | | | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - beta - from import - fix missing startup phasekumavis2018-06-121-0/+3
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - beta - dont select localhost as it is already setkumavis2018-06-122-20/+1
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - extensionUri should point to home.htmlkumavis2018-06-121-2/+2
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - remove usage of extensionId from testskumavis2018-06-124-28/+12
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - fix incomplete setup phasekumavis2018-06-122-2/+5
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - properly export setupBrowserAndExtensionkumavis2018-06-121-0/+1
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - more factoring of test setupkumavis2018-06-125-64/+27
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - use fs-extra instead of fskumavis2018-06-121-1/+1
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to ↵kumavis2018-06-124-47/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | METAMASK_TEST_CONFIG
| * | | | | | | | | | test - e2e - inject metamask config to point at localhostkumavis2018-06-125-23/+61
| | | | | | | | | | |
| * | | | | | | | | | lint - controllers - whitepace fixkumavis2018-06-121-5/+5
| | | | | | | | | | |
| * | | | | | | | | | test - e2e - reduce browser-specific codekumavis2018-06-121-20/+13
| | | | | | | | | | |
| * | | | | | | | | | network - provider - infura - use block-reemit middlewarekumavis2018-06-083-28/+29
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-08168-1486/+7741
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-0730-85/+300
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | | | | | lint - remove unused requirekumavis2018-06-071-1/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-0788-416/+1325
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | | | | | | test - unit - tx-controller - fix blockTracker stubkumavis2018-05-291-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | controllers - transactions - fix tx status update on bootkumavis2018-05-292-2/+13
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | controllers - transactions - fix tx confirmationkumavis2018-05-292-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamaskkumavis2018-05-291-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | metamask-controller - update preferences controller addresses after import ↵kumavis2018-05-291-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-298-15/+1013
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | | | | | | | test - unit - pending-tx-tracker - update method namekumavis2018-05-291-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | test - unit - nonce-tracker - fix blockTracker stubkumavis2018-05-291-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | controllers - transaction - pending-tx-tracker - lint fixkumavis2018-05-291-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-297-153/+78
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | controllers - transactions - pending-tx-tracker - _getBlock - poll until ↵kumavis2018-05-261-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block is truthy
| * | | | | | | | | | | | | | tx-gas-utils - query for block without tx bodieskumavis2018-05-261-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | test - unit - metamask-controller - remove logkumavis2018-05-261-1/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | test - unit - code style nitpickkumavis2018-05-251-1/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | test - unit - metamask-controller - fix many bugs in testskumavis2018-05-252-33/+61
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | test - unit - run ganache-server in backgroundkumavis2018-05-251-0/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | test - unit - tx-controller-test - add history object to txMeta when using ↵kumavis2018-05-251-31/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | internal calls
| * | | | | | | | | | | | | | test - unit - move fetch polyfill to helperkumavis2018-05-253-6/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | test - unit - metamask-controller - polyfill global.fetchkumavis2018-05-251-2/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | deps - bump eth-json-rpc-middleware for fetch bugfixkumavis2018-05-252-4/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet ↵kumavis2018-05-251-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware reference before txController is instantiated
| * | | | | | | | | | | | | | test - remove .only from unit testskumavis2018-05-251-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | provider - update wallet hooks for new wallet middlewarekumavis2018-05-256-68/+114
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | deps - bump json-rpc modules for bugfixeskumavis2018-05-252-187/+403
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | metamask-controller - fix account lookup hookkumavis2018-05-251-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | account-tracker - guard against empty blockkumavis2018-05-251-1/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | controllers - recent-blocks - guard against empty blockkumavis2018-05-251-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | controllers - recent-blocks - wrap block-tracker event in try-catchkumavis2018-05-241-1/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'network-remove-provider-engine' of ↵kumavis2018-05-243-40/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into network-remove-provider-engine
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4347 from MetaMask/transactions-use-new-block-trackerkumavis2018-05-243-40/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transactions use new block tracker
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'network-remove-provider-engine' of ↵frankiebee2018-05-23122-17010/+4318
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker
| | | * | | | | | | | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-232-8/+19
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | remove dependance on the even tx:confirmedfrankiebee2018-05-231-2/+6
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ↵frankiebee2018-05-231-32/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove tx:confirmed event tests
| * | | | | | | | | | | | | | | | | deps - bump eth-block-tracker for bugfixkumavis2018-05-241-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | sentry - setupRaven - ensure message is truthykumavis2018-05-241-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | controllers - recent-blocks - ensure full blockskumavis2018-05-241-2/+2
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | controllers - account-tracker - refactor + update for eth-block-tracker@4kumavis2018-05-241-67/+56
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | controllers - recent-blocks - doc updatekumavis2018-05-241-4/+4
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-231-15/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | | | | | | | | | deps - eth-json-rpc-filters@2.0.0kumavis2018-05-231-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | deps - eth-block-tracker@4.0.1kumavis2018-05-231-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-23121-16993/+4309
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | | | | | | | | | recent-blocks - fix backfill blockNumber trackingkumavis2018-05-171-3/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | test - unit - network - get providerProxy via public methodkumavis2018-05-171-4/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | deps - bump some bugfixeskumavis2018-05-171-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | controllers - recent-blocks - fix pifyd setTimeout argskumavis2018-05-171-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | deps - fix incorrect dep paths and versionskumavis2018-05-175-7/+7
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | docs - remove references to web3-provider-enginekumavis2018-05-172-4/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | deps - remove web3-provider-enginekumavis2018-05-171-1/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | controllers - balance - update for eth-block-tracker@4kumavis2018-05-171-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | recent-blocks - update for eth-block-tracker@4kumavis2018-05-171-27/+14
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | remove unused events-proxy, was replaced with module swappable-obj-proxykumavis2018-05-172-43/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | lint fixkumavis2018-05-175-13/+18
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-1710-75/+224
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #5061 from MetaMask/greenkeeper/@zxing/library-0.8.0Bruno Barbieri2018-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update @zxing/library to the latest version 🚀
| * | | | | | | | | | | | | | | | | fix(package): update @zxing/library to version 0.8.0greenkeeper[bot]2018-08-141-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #5076 from MetaMask/v4.9.3Dan Finlay2018-08-162-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V4.9.3
| * | | | | | | | | | | | | | | | | | v4.9.3v4.9.3Thomas2018-08-161-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Bump ChangelogThomas2018-08-161-0/+6
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #5037 from MetaMask/masterDan Finlay2018-08-162-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update develop branch to v4.9.2
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5025 from MetaMask/v4.9.2v4.9.2.1Dan Finlay2018-08-1036-32551/+32635
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v4.9.2
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into v4.9.2Thomas Huang2018-08-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #4954 from MetaMask/v4.9.0Dan Finlay2018-08-08487-36876/+44757
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V4.9.0
| | * | | | | | | | | | | | | | | | | | | Bump ChangelogThomas2018-08-071-1/+3
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | v4.9.0 ReleaseThomas2018-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Update ChangelogThomas2018-08-071-5/+10
| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Bump ChangelogThomas2018-08-101-0/+4
| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | v4.9.2Thomas2018-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #5059 from MetaMask/e2e-tests-more-reliableDan J Miller2018-08-155-20/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another e2e beta test fix
| * | | | | | | | | | | | | | | | | | | | | Remove unnecessary else in test/e2e/beta/contract-test/contract.jsDan Miller2018-08-151-1/+2
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add explicit waits for submitted status for some txs initiated from test dapp.Dan Miller2018-08-151-0/+7
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Reload e2e beta test browser if initial screen doesn't load.Dan Miller2018-08-152-2/+16
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Increase timeout on wait for contract status update in metamask-beta-ui-specDan Miller2018-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add missing awaits and/or missing wait timeouts in ↵Dan Miller2018-08-141-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/e2e/beta/metamask-beta-ui.spec.js
| * | | | | | | | | | | | | | | | | | | | | Make deployment states in test/e2e/beta/contract-test/contract.js more explicitDan Miller2018-08-142-5/+6
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Improve error handling in assertElementNotPresent of test/e2e/beta/helpers.jsDan Miller2018-08-141-5/+7
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * fix merge conflictsbrunobar792018-08-1849-2934/+1358
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * fix ledger affiliate linkbrunobar792018-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * fix e2e testsbrunobar792018-08-171-1/+4
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * ui readybrunobar792018-08-174-11/+42
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * connect screen readybrunobar792018-08-175-32/+131
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * change Metamask for MetaMaskbrunobar792018-08-151-7/+1
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * update package-lock.jsonbrunobar792018-08-151-2/+3
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * Merge branch 'ledger-support' of github.com:MetaMask/metamask-extension into ↵brunobar792018-08-1520-33/+66
| | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ledger-support
| | | | | | | | | | | | | | | | | | | | | * Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-1520-33/+66
| | | | | | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #5060 from MetaMask/bignumber-stringDan Finlay2018-08-153-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | Cast arguments for new Bignumbers() to string.
| * | | | | | | | | | | | | | | | | | | | | Cast arguments for new Bignumbers() to string.Dan Miller2018-08-153-4/+4
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #5058 from whymarrh/fix-wordsWhymarrh Whitby2018-08-1414-26/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix casing of some proper nouns in localised messages
| * | | | | | | | | | | | | | | | | | | | | Fix casing of Bitcoin, Ethereum, and Litecoin across localized messagesWhymarrh Whitby2018-08-149-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the following commands: sed -i.bak s/bitcoin/Bitcoin/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete sed -i.bak s/ethereum/Ethereum/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete sed -i.bak s/litecoin/Litecoin/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete
| * | | | | | | | | | | | | | | | | | | | | Fix casing of MetaMask in all localized messagesWhymarrh Whitby2018-08-1411-16/+16
| |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the following: sed -i.bak s/Metamask/MetaMask/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete
* | | | | | | | | | | | | | | | | | | | | Merge pull request #4961 from whymarrh/download-seed-phraseWhymarrh Whitby2018-08-143-3/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Add download seed phrase link to new UI
| * | | | | | | | | | | | | | | | | | | | Add link to download seed words in new UIWhymarrh Whitby2018-08-142-0/+27
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add exportAsFile optional type argumentWhymarrh Whitby2018-08-141-2/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix casing of 1PasswordWhymarrh Whitby2018-08-141-1/+1
|/ / / / / / / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | | * / use eth-ledger-bridge-keyring from npmbrunobar792018-08-151-1/+1
| | | | | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | | | | * remove console logsbrunobar792018-08-152-8/+2
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * fixed unit testsbrunobar792018-08-152-5/+15
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * more uibrunobar792018-08-151-1/+2
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * fixbrunobar792018-08-151-1/+1
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * ui fixesbrunobar792018-08-155-34/+46
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * fix tx testsbrunobar792018-08-144-14/+25
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * legacy and new hd path workingbrunobar792018-08-145-25/+53
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * good progress adding pathsbrunobar792018-08-148-67/+140
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * remove ledger libbrunobar792018-08-121-1/+0
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * clean upbrunobar792018-08-124-43/+4
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * this should be ready to gobrunobar792018-08-124-323/+60
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * clean upbrunobar792018-08-121-45/+36
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * message signing worksbrunobar792018-08-123-6/+19
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * workingbrunobar792018-08-122-24/+14
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * tx signature is validbrunobar792018-08-121-0/+1
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * tx signing should workbrunobar792018-08-121-10/+39
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * rename keyringbrunobar792018-08-112-1/+2
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * able to add accountsbrunobar792018-08-114-40/+107
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * iframe communication workingbrunobar792018-08-118-67/+209
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * refactor to support multiple hw walletsbrunobar792018-08-1110-103/+247
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #4897 from MetaMask/qr-code-scanBruno Barbieri2018-08-1127-22/+662
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | QR Code Scanner
| * | | | | | | | | | | | | | | | | add commentbrunobar792018-08-091-0/+5
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-094-32063/+32154
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | add submit button typebrunobar792018-08-091-0/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | lintbrunobar792018-08-081-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | update package-lock.jsonbrunobar792018-08-081-4/+21
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | code review changesbrunobar792018-08-085-12/+63
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-0839-1284/+1387
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | restore qrbrunobar792018-08-041-0/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | lintbrunobar792018-08-041-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | fixed issue with inputbrunobar792018-08-043-2/+6
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | clear qr code data before scanningbrunobar792018-08-042-23/+25
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | design completebrunobar792018-08-048-45/+166
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | fixbrunobar792018-08-011-1/+6
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | lintbrunobar792018-08-011-15/+14
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | lintbrunobar792018-08-011-2/+0
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | added crossbrowser support and error handlingbrunobar792018-08-0110-56/+179
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | send to fullscreen if no permission from popupbrunobar792018-07-315-29/+48
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | kill camera stream when unmoutingbrunobar792018-07-311-1/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | copybrunobar792018-07-312-2/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | clean up cssbrunobar792018-07-313-30/+58
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | use existing modalsbrunobar792018-07-3112-235/+177
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-3110-11/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qr-code-scan
| * | | | | | | | | | | | | | | | | | | | fix unit testsbrunobar792018-07-271-0/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fix dependenciesbrunobar792018-07-273-4/+5
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fix linting errorsbrunobar792018-07-274-4/+4
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | clean upbrunobar792018-07-275-4/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | restore platform/extension.jsbrunobar792018-07-271-5/+57
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-07-2728-55/+531
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | added webrtc-adapter for browser compatbrunobar792018-07-273-0/+24
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | fully working without tweaking ext. permissionbrunobar792018-07-276-66/+7
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | working without permission issuesbrunobar792018-07-274-44/+64
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | fix spinner and qr iconbrunobar792018-07-252-2/+6
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | decent UIbrunobar792018-07-251-21/+43
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | working without injectionbrunobar792018-07-2513-87/+231
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | added qr code scanner icon in send transactionbrunobar792018-07-2410-20/+29
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | camera working back and forthbrunobar792018-07-248-95/+116
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | fixesbrunobar792018-07-241-3/+3
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | added camera snippet injection to inpage.jsbrunobar792018-07-241-0/+39
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | added instascan pkgbrunobar792018-07-242-7/+77
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #5020 from MetaMask/FixMigration28v4.9.2v4.9.1Dan Finlay2018-08-102-2/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes migration 28
| * | | | | | | | | | | | | | | | | | | | | | tests for migration 28Esteban MIno2018-08-101-0/+46
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | fix migration 28Esteban MIno2018-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5022 from MetaMask/sentry-release-versionJenny Pollack2018-08-102-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | sentry - change releaseVersion to release
| * | | | | | | | | | | | | | | | | | | | | | sentry - change releaseVersion to releaseJenny Pollack2018-08-102-4/+4
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #5017 from MetaMask/v4.9.1Dan Finlay2018-08-102-10/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V4.9.1
| * | | | | | | | | | | | | | | | | | | | | | v4.9.1Thomas2018-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Bump ChangelogThomas2018-08-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into developThomas2018-08-104-0/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into developThomas2018-08-102-9/+14
| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | remove duplicate template (#5016)bobby dresser2018-08-101-17/+0
| |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 17:44:10 +0800