1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 04:46:10 +01:00
Commit Graph

7916 Commits

Author SHA1 Message Date
kumavis
3ac2b40dcf metamask controller - track active controller connections 2018-08-21 16:30:11 -07:00
Dan Finlay
babd59a2dc
Merge pull request #5109 from MetaMask/MoveOutInpageProvider
Move inpage-provider and port-stream outside
2018-08-21 14:38:47 -07:00
Dan Finlay
a485516488
Merge pull request #5118 from MetaMask/provider2-bugfix
bugfix - prevents old blocktracker from getting internal hooks migrated
2018-08-21 14:27:34 -07:00
kumavis
13dfea7f2d bugfix - prevents old blocktracker from getting internal hooks migrated 2018-08-21 14:13:23 -07:00
Dan J Miller
4704f3598e
Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flag
Fix e2e tests: adapt ganache flags and remove unnecessary checks
2018-08-21 15:26:23 -02:30
Dan Miller
9bd0ce46e8 Remove unnecessary checks and user actions in metamask-beta-ui.spec 2018-08-21 14:45:27 -02:30
Dan Miller
1718b83d20 Run ganache with a blocktime flag for npm:run:ganache:start. 2018-08-21 13:47:42 -02:30
Bruno Barbieri
282820c93a
Merge pull request #5112 from MetaMask/hardware-wallet-fixes
Hardware wallet fixes
2018-08-21 10:48:40 -04:00
brunobar79
54021fd90b fix unit tests 2018-08-21 00:09:54 -04:00
brunobar79
cee5783283 fix hardware wallets account name 2018-08-21 00:04:30 -04:00
brunobar79
34e3ec6092 fix account removal 2018-08-21 00:04:07 -04:00
Dan Finlay
6ce119d1fb Move inpage-provider and port-stream outside
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.
2018-08-20 15:45:50 -07:00
Dan Finlay
887cad973f
Merge pull request #5095 from MetaMask/i4953-update-logo
Update logo wordmark
2018-08-20 13:12:31 -07:00
Alexander Tseung
cec87a5b2c Update logo wordmark 2018-08-18 20:46:56 -07:00
kumavis
fb5faec372
Merge pull request #5090 from whymarrh/fix-ci
Update CircleCI configuration to use workspaces instead of caches
2018-08-17 16:31:32 -07:00
Whymarrh Whitby
00906937a1 ci: Use workspaces instead of caches for passing data downstream
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/
2018-08-17 19:50:58 -02:30
Whymarrh Whitby
8f834ed87d ci: Install any npm@6 2018-08-17 18:51:02 -02:30
Whymarrh Whitby
2185197ef6 ci: Use Firefox 61.0.2 2018-08-17 18:41:12 -02:30
Whymarrh Whitby
7b89d3d473 ci: Disable Firefox updates 2018-08-17 18:41:12 -02:30
Whymarrh Whitby
e493efb123 ci: Don't cache Firefox install
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
2018-08-17 18:41:12 -02:30
Dan Finlay
c7f5436143
Merge pull request #5050 from MetaMask/ledger-support
Add Ledger hardware wallet support
2018-08-17 11:26:38 -07:00
Bruno Barbieri
bd904c86f6
Merge branch 'develop' into ledger-support 2018-08-17 13:45:46 -04:00
Dan Finlay
755369e4e4
Merge pull request #4898 from dmvt/multi-account-restore
Restore multiple consecutive accounts with balances.
2018-08-17 10:43:15 -07:00
brunobar79
0391ec37c8 update package-lock.json 2018-08-17 13:03:02 -04:00
brunobar79
992e7f1b5a fix merge conflicts 2018-08-17 12:56:07 -04:00
Dan Matthews
df799d7fd6 Restores accounts until one with a zero balance is found 2018-08-17 10:26:47 -04:00
brunobar79
51e4a6d335 fix ledger affiliate link 2018-08-16 21:15:50 -04:00
brunobar79
b369560569 fix e2e tests 2018-08-16 20:59:11 -04:00
brunobar79
285814646f ui ready 2018-08-16 20:41:23 -04:00
brunobar79
2ea05e303d connect screen ready 2018-08-16 19:39:52 -04:00
Anatoli Babenia
59ba2d2785 info.js Remove width element to fix email layout (#4588)
Fix for #2855 which is gone from master for some reason
2018-08-16 11:09:57 -02:30
Dan Finlay
955ec2dca6
Merge pull request #4279 from MetaMask/network-remove-provider-engine
Enhancement: New BlockTracker and Json-Rpc-Engine based Provider
2018-08-15 15:41:05 -07:00
Bruno Barbieri
8b73a69cd8
Merge pull request #5061 from MetaMask/greenkeeper/@zxing/library-0.8.0
Update @zxing/library to the latest version 🚀
2018-08-15 13:46:32 -04:00
Dan Finlay
772c97088e
Merge pull request #5076 from MetaMask/v4.9.3
V4.9.3
2018-08-15 10:37:47 -07:00
Thomas
d636cc3552 v4.9.3 2018-08-15 10:06:20 -07:00
Thomas
595fc403ed Bump Changelog 2018-08-15 10:05:43 -07:00
Dan Finlay
7c47187f4d
Merge pull request #5037 from MetaMask/master
Update develop branch to v4.9.2
2018-08-15 10:02:20 -07:00
brunobar79
837be704f5 change Metamask for MetaMask 2018-08-15 11:44:00 -04:00
Dan J Miller
a41afebd66
Merge pull request #5059 from MetaMask/e2e-tests-more-reliable
Another e2e beta test fix
2018-08-15 12:10:04 -02:30
brunobar79
d2d8d38346 update package-lock.json 2018-08-14 23:08:50 -04:00
brunobar79
8fb7099bf2 Merge branch 'ledger-support' of github.com:MetaMask/metamask-extension into ledger-support 2018-08-14 23:02:14 -04:00
brunobar79
e54b8507d2 use eth-ledger-bridge-keyring from npm 2018-08-14 23:02:01 -04:00
Bruno Barbieri
80fe3ce888
Merge branch 'develop' into ledger-support 2018-08-14 22:55:47 -04:00
brunobar79
82a5ed1e03 remove console logs 2018-08-14 22:40:29 -04:00
brunobar79
fdf202efb0 fixed unit tests 2018-08-14 21:19:01 -04:00
brunobar79
53dcad5a3b more ui 2018-08-14 19:38:23 -04:00
brunobar79
19d1988715 fix 2018-08-14 19:24:15 -04:00
brunobar79
c72ced79ae ui fixes 2018-08-14 19:22:00 -04:00
Dan Miller
3c8a4162a4 Remove unnecessary else in test/e2e/beta/contract-test/contract.js 2018-08-14 19:18:04 -02:30
Dan Finlay
d7aa1bf5c0
Merge pull request #5060 from MetaMask/bignumber-string
Cast arguments for new Bignumbers() to string.
2018-08-14 14:36:27 -07:00