m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 20:05:27 +02:00
Code
8,023 Commits 2 Branches 0 Tags 265 MiB
e5ca2aac6f
Commit Graph

8023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Esteban MIno
dbab9a007f delete according image when token added with watchToken deleted 2018-08-16 21:17:02 -03:00
brunobar79
2ea05e303d connect screen ready 2018-08-16 19:39:52 -04:00
Esteban MIno
bb868f5834 correct behavior when notification is closed when popup 2018-08-16 20:19:19 -03:00
Esteban MIno
2ace30bcd1 WIP 2018-08-16 18:28:07 -03:00
Esteban MIno
a36ea0e232 show watch asset image from hide token modal 2018-08-16 12:04:43 -03: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
Esteban MIno
5289a36664 change watchAsset to new spec for type ERC20 2018-08-15 20:01:59 -03:00
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
Esteban MIno
b766104c8d add suggested tokens objects in metamask state 2018-08-15 18:34:57 -03: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
Esteban MIno
a4b6b2357a watchToken to watchAsset 2018-08-14 20:09:56 -03:00
Esteban MIno
a4c3f6b65c add support for images base64 and urls on new ui 2018-08-14 20:08:12 -03: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
Dan Miller
ff72423491 Add explicit waits for submitted status for some txs initiated from test dapp. 2018-08-14 17:30:43 -02:30
Thomas
ce645561fb Remove commented out code for detect-token-test 2018-08-14 12:29:57 -07:00
Thomas
974d623da2 Update eth-json-rpc-filters 2018-08-14 12:29:15 -07:00
Dan Miller
c4fe6aa9cf Reload e2e beta test browser if initial screen doesn't load. 2018-08-14 16:45:07 -02:30
Dan Miller
42256cfbd2 Increase timeout on wait for contract status update in metamask-beta-ui-spec 2018-08-14 16:28:04 -02:30
Thomas
9ffed5fd18 E2E - Dont error on browser errors 2018-08-14 11:29:43 -07:00
Dan Miller
ebb23721ed Cast arguments for new Bignumbers() to string. 2018-08-14 15:46:58 -02:30
Thomas
96d789d2cf Merge branch 'develop' into network-remove-provider-engine 
Override package-lock and fix merge conflicts
 2018-08-14 10:44:42 -07:00
Esteban MIno
8f5b80a0fe update method to metamask_watchToken 2018-08-14 13:58:47 -03:00
Dan Miller
a59e47e7b0 Add missing awaits and/or missing wait timeouts in test/e2e/beta/metamask-beta-ui.spec.js 2018-08-14 12:50:26 -02:30
Dan Miller
860bf42346 Make deployment states in test/e2e/beta/contract-test/contract.js more explicit 2018-08-14 12:35:50 -02:30
Dan Miller
c00d0daeb5 Improve error handling in assertElementNotPresent of test/e2e/beta/helpers.js 2018-08-14 12:35:50 -02:30
Whymarrh Whitby
742aa8bb11
Merge pull request #5058 from whymarrh/fix-words 
Fix casing of some proper nouns in localised messages
 2018-08-14 07:24:01 -02:30