kumavis
|
055346843b
|
lint - fix lint for network
|
2018-06-12 11:27:32 -07:00 |
|
kumavis
|
6a2649a90f
|
network - import createBlockTrackerInspectorMiddleware and rearrange cache middleware order
|
2018-06-12 11:12:32 -07:00 |
|
kumavis
|
c86f935889
|
nonce-tracker - wrap nonce calculations in try-catch and release lock on error
|
2018-06-12 10:55:54 -07:00 |
|
kumavis
|
030fea7136
|
test - e2e - beta - from import - fix missing startup phase
|
2018-06-12 08:35:45 -07:00 |
|
kumavis
|
9d1b4cc1d7
|
test - e2e - beta - dont select localhost as it is already set
|
2018-06-12 08:19:57 -07:00 |
|
kumavis
|
4773a7f3ec
|
test - e2e - extensionUri should point to home.html
|
2018-06-11 18:56:59 -07:00 |
|
kumavis
|
93a2e28705
|
test - e2e - remove usage of extensionId from tests
|
2018-06-11 16:45:29 -07:00 |
|
kumavis
|
ab0e60e802
|
test - e2e - fix incomplete setup phase
|
2018-06-11 15:34:54 -07:00 |
|
kumavis
|
2e3f421b73
|
test - e2e - properly export setupBrowserAndExtension
|
2018-06-11 14:55:50 -07:00 |
|
kumavis
|
8a0961b4a8
|
test - e2e - more factoring of test setup
|
2018-06-11 14:46:45 -07:00 |
|
kumavis
|
907594463d
|
test - e2e - use fs-extra instead of fs
|
2018-06-11 14:35:20 -07:00 |
|
kumavis
|
ebb9447593
|
test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST_CONFIG
|
2018-06-11 14:25:49 -07:00 |
|
kumavis
|
02f5502e16
|
test - e2e - inject metamask config to point at localhost
|
2018-06-11 11:04:28 -07:00 |
|
kumavis
|
0db776c3cc
|
lint - controllers - whitepace fix
|
2018-06-11 10:17:09 -07:00 |
|
kumavis
|
0fa9014986
|
test - e2e - reduce browser-specific code
|
2018-06-11 09:37:08 -07:00 |
|
kumavis
|
3ce83570ee
|
network - provider - infura - use block-reemit middleware
|
2018-06-07 12:26:37 -07:00 |
|
kumavis
|
66b703b1a4
|
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
|
2018-06-07 10:07:36 -07:00 |
|
Dan J Miller
|
988283778a
|
Merge pull request #4090 from MetaMask/i3725-refactor-send-component-
I3725 Refactor Send Component
|
2018-06-07 00:50:16 -02:30 |
|
Dan
|
a09d609360
|
Bump beta e2e timeouts on faucet page.
|
2018-06-06 22:15:38 -02:30 |
|
Dan
|
11f5fdc927
|
Merge branch 'develop' into i3725-refactor-send-component-
|
2018-06-06 21:55:20 -02:30 |
|
kumavis
|
c86213bf11
|
Merge pull request #4385 from MetaMask/ci-test-e2e-beta
CI - Add e2e-beta tests
|
2018-06-06 16:58:34 -07:00 |
|
kumavis
|
aea9491f6a
|
Merge pull request #4477 from MetaMask/i3073-block-gravityforms
Block gravityforms.com from web3 injection
|
2018-06-06 12:24:05 -07:00 |
|
Dan
|
ae55e8a3c1
|
Merge branch 'develop' into i3725-refactor-send-component-
|
2018-06-06 16:40:43 -02:30 |
|
kumavis
|
2198276bd5
|
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
|
2018-06-06 12:05:38 -07:00 |
|
Thomas Huang
|
1fb408f62e
|
Merge pull request #4512 from MetaMask/test-metamask-no-diagnostics
test - metamask-controller - disable diagnostics
|
2018-06-06 11:54:59 -07:00 |
|
kumavis
|
d30f03dcbf
|
Merge pull request #4414 from scsaba/recipient-blacklist
Disallow sending to ganache default accounts on main net
|
2018-06-06 11:54:01 -07:00 |
|
kumavis
|
72f7a4e1d0
|
Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui
Handle errors for null selected address after Importing account (json or private key)
|
2018-06-06 11:47:45 -07:00 |
|
kumavis
|
546996c1f9
|
Merge pull request #4514 from whymarrh/account-label-type-check
Add account type assertion to PreferencesController#setAccountLabel
|
2018-06-06 11:42:52 -07:00 |
|
03-26
|
ccd4884db1
|
i18n - ja improvements
|
2018-06-06 11:38:57 -07:00 |
|
Thomas Huang
|
00f2433952
|
Merge pull request #4515 from MetaMask/master
Merge Master into Develop
|
2018-06-06 11:37:17 -07:00 |
|
kumavis
|
ffb8fa1649
|
lint - remove unused require
|
2018-06-06 11:17:52 -07:00 |
|
kumavis
|
9d77b0a196
|
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
|
2018-06-06 11:08:29 -07:00 |
|
Dan J Miller
|
191c3df108
|
Merge pull request #4507 from whymarrh/fix-account-order
Render accounts in keyring order
|
2018-06-06 15:21:45 -02:30 |
|
Dan
|
72649a0b59
|
Improve e2e beta tests by adding appropriate waits.
|
2018-06-06 13:45:08 -02:30 |
|
Dan
|
12e7508584
|
Conditionally close info page in beta e2e tests.
|
2018-06-06 07:34:25 -02:30 |
|
Dan
|
3d57352e54
|
Merge remote-tracking branch 'whymarrh/ci-test-e2e-beta' into ci-test-e2e-beta
|
2018-06-06 06:48:15 -02:30 |
|
Whymarrh Whitby
|
6ee9685490
|
Fix mock addresses used for integration tests
|
2018-06-05 19:48:42 -07:00 |
|
Dan
|
bb4de95f76
|
Fix e2e beta tests to account for add-token updates and actual behaviour of tab openings on installation.
|
2018-06-05 22:16:03 -02:30 |
|
Dan
|
fbcab7a91e
|
Merge branch 'develop' into ci-test-e2e-beta
|
2018-06-05 22:15:06 -02:30 |
|
Whymarrh Whitby
|
df6d03cefd
|
Fix account list order for the old UI
|
2018-06-05 17:17:27 -07:00 |
|
Whymarrh Whitby
|
d9d09f953b
|
Render the accounts in keyring order
|
2018-06-05 17:17:27 -07:00 |
|
Whymarrh Whitby
|
8b449b325d
|
Remove unused identities reducer from UI
|
2018-06-05 17:17:27 -07:00 |
|
Whymarrh Whitby
|
3cc85c219e
|
Add account type assertion to PreferencesController#setAccountLabel
|
2018-06-05 14:06:56 -07:00 |
|
kumavis
|
39a7702c8f
|
Merge pull request #4511 from MetaMask/v4.7.4
Version 4.7.4
|
2018-06-05 13:35:25 -07:00 |
|
kumavis
|
da938ded5c
|
test - metamask-controller - disable diagnostics
|
2018-06-05 13:31:34 -07:00 |
|
kumavis
|
f73feccf5a
|
4.7.4
|
2018-06-05 13:22:48 -07:00 |
|
kumavis
|
cb7307b7ca
|
Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4
|
2018-06-05 13:20:31 -07:00 |
|
kumavis
|
c2e3194dbf
|
Merge pull request #4509 from whymarrh/wallet-view-assertion
Add explicit selectedAddress assertion to the wallet view
|
2018-06-05 12:57:24 -07:00 |
|
kumavis
|
5b3af34139
|
Merge pull request #4506 from MetaMask/diagnostics-multivault
diagnostics - add multiple vault detection to diagnostics reporting
|
2018-06-05 12:51:41 -07:00 |
|
kumavis
|
60e61e6834
|
diagnostics - fix reportMultipleKeyrings call
|
2018-06-05 12:36:15 -07:00 |
|