1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

6681 Commits

Author SHA1 Message Date
Frankie
004d4cc3c7
Merge pull request #4328 from MetaMask/i4325-yarnignore
Remove yarn.lock
2018-05-21 14:52:53 -07:00
Kevin Serrano
610fa8f6b3
It tried to get away, but justice must be served. 2018-05-21 14:36:21 -07:00
Frankie
2c8d1c0e51
Merge pull request #4326 from MetaMask/Jabher-develop
Deps - bump extensionizer
2018-05-21 14:34:14 -07:00
Kevin Serrano
0eec30e0f4
Merge pull request #4329 from MetaMask/Trigalti-develop
Injection Blacklist: adyen
2018-05-21 14:32:51 -07:00
kumavis
9929f89c6e
Merge pull request #4316 from MetaMask/fix-signature-request
Fix signature request header text
2018-05-21 14:18:55 -07:00
kumavis
f19d8a5905 Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into Trigalti-develop 2018-05-21 14:14:03 -07:00
Kevin Serrano
4ac233b1fd
Please, this is my third PR already, stop adding extra baggage. Also, removed the yarn.lock. 2018-05-21 14:07:29 -07:00
kumavis
a1d2813f8f
Merge pull request #4273 from brunobar79/fix-new-ui-popup-header
Remove fix modal header height
2018-05-21 14:07:06 -07:00
kumavis
45ed187bfe
Merge pull request #4240 from MetaMask/EnhancePortGuide
Enhance guide to porting to new platform
2018-05-21 14:05:49 -07:00
kumavis
d45fe6fc72 Merge branch 'develop' of https://github.com/Jabher/metamask-extension into Jabher-develop 2018-05-21 13:59:23 -07:00
kumavis
08d95bbafa
Merge pull request #4034 from whymarrh/account-nicknames
Move account names out of KeyringController
2018-05-21 13:44:07 -07:00
kumavis
b426b5e58c
Merge pull request #4278 from MetaMask/e2e-tests
E2e tests
2018-05-21 10:53:55 -07:00
Alexander Tseung
646545551c Fix signature request header text 2018-05-20 13:01:31 -07:00
Dan Finlay
713c77db54
Merge pull request #4199 from MetaMask/i3487-provider-errors
RPC error middleware for json-rpc-engine
2018-05-18 11:57:29 -07:00
simon
22753d96fd Added trailing comma for eslint 2018-05-18 16:11:46 +02:00
simon
41502cb384 Added adyen.com to blacklisted domains because postMessages are blocking card encryption 2018-05-18 15:43:27 +02:00
Whymarrh Whitby
67310e151e Fix migration 026 to produce the correct shape for state.identities 2018-05-17 13:35:38 -02:30
Whymarrh Whitby
e546f4b904 Update MetaMaskController vault restoration test for new KC api 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
805c6158a4 Update eth-keyring-controller dependency 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
2d13fac476 Add migration to move identities from KeyringController 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
50af02e74b Add test case for PreferencesController#setAccountLabel 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
c54e4c7191 Add PreferencesController#setAddresses to update ids 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
cbe4d0d88c Update AddressBookController to read from preferences store 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
Thomas
f2815d3121 Adjustments for previous PR 2018-05-16 19:12:03 -07:00
Bruno
b0dcdc30fa remove fix header height 2018-05-16 18:51:55 -04:00
Thomas
77e13640b4 Testing timeouts 2018-05-16 15:03:53 -07:00
kumavis
708422432c
Merge pull request #4266 from MetaMask/send-screen-detailed-QA-checklist
Adds detailed QA checklist for the New UI send screen.
2018-05-16 14:26:47 -07:00
kumavis
f397002bf8
Merge pull request #4235 from scsaba/transaction-history-timestamps
Transaction history timestamps
2018-05-16 14:20:08 -07:00
kumavis
44f31f9a7e Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps 2018-05-16 13:56:32 -07:00
kumavis
76c8cb3d7b
Merge pull request #4146 from MetaMask/sentry-error-like2
sentry - add helper to fully rewrite all error messages
2018-05-16 13:54:15 -07:00
kumavis
8e1cad5ff6
tx-state-history-helper - use more readable Date.now method 2018-05-16 13:05:07 -07:00
kumavis
4be681f447
Merge pull request #4255 from MetaMask/i4233-dropdowns
Fix account and network dropdowns in confirm screen
2018-05-16 13:02:27 -07:00
kumavis
d722aa7f0c
Merge pull request #4155 from MetaMask/network-controller-remove-setNetworkEndpoints
Network controller - remove dead code
2018-05-16 13:01:36 -07:00
kumavis
ff91ef96ef ui - unlock - remove setNetworkEndpoints calls from new unlock screen 2018-05-16 12:35:43 -07:00
kumavis
c6f822ad45 ui - remove files accidently added by bad merge 2018-05-16 12:29:57 -07:00
kumavis
d62fc22611 network - remove debugging console.log 2018-05-16 11:59:50 -07:00
kumavis
c27d9162d7 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints 2018-05-16 11:57:07 -07:00
Dan
5a7e98b3a9 Adds description to send-screen-QA-checklist.md 2018-05-16 12:45:06 -02:30
Dan
86c73eec5c Adds detailed QA checklist for the New UI send screen. 2018-05-16 12:42:05 -02:30
Thomas
517be35ab6 Merge branch 'develop' into e2e-tests 2018-05-14 17:19:44 -07:00
Thomas
cd42d18203 Merge e2e tests into one 2018-05-14 17:17:36 -07:00
Alexander Tseung
5561937773 Fix account and network dropdowns in confirm screen 2018-05-14 15:03:04 -07:00
Thomas Huang
6e79225dbf
Merge pull request #4251 from whymarrh/e2e-fixes
Small e2e test adjustments
2018-05-14 10:56:49 -07:00
Kevin Serrano
a08f08462c
Merge pull request #4245 from MetaMask/i4208-error
Add error message when passwords don't match in first time flow. Chan…
2018-05-14 09:56:03 -07:00
Whymarrh Whitby
6926e4e9d2 e2e: Use the more reliable enter key for logging in 2018-05-14 14:01:28 -02:30
Whymarrh Whitby
dc6f6addb9 e2e: Wait a bit before clicking through privacy screen
The network connection can take a bit so we need to wait for the
spinner to go away.
2018-05-14 13:58:57 -02:30
Whymarrh Whitby
4e91fc8639 e2e: Adjust the extension ID query for newer Chrome versions 2018-05-14 13:57:58 -02:30
Whymarrh Whitby
6afd169e60 e2e: Use newest window as MM tx confirm popup 2018-05-14 13:57:19 -02:30
Whymarrh Whitby
b5a445139d Bail after the first e2e test failure
Where the tests are sequential, every test after the first failure is bound
for failure as well so we can bail after the first.
2018-05-14 13:55:33 -02:30