m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 21:00:13 +01:00
Code
7,614 Commits 2 Branches 0 Tags 265 MiB
a2082bae5c
Commit Graph

7614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan J Miller
46cda26f3b
Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui 
Use background gas price estimation method in new ui.
 2018-07-05 08:01:03 -02:30
TrejGun
94d1d846fb Merge branch 'develop' into contextTypes 
# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
 2018-07-05 11:34:13 +08:00
trejgun
c94f639de5 convert contextType to static prop for refactored components 2018-07-05 11:33:34 +08:00
TrejGun
b427743ab8 fix classname 2018-07-05 11:21:27 +08:00
Анна
90934bca46 Merge branch 'develop' into to-autocomplete 2018-07-05 11:15:28 +08:00
Dan
7d7662191a Improve error and promise resolution handling in action.js updateGasData(). 2018-07-04 21:47:19 -02:30
Dan
f262f0ea64 Update import from seed screen on new ui. 2018-07-04 21:21:12 -02:30
Dan J Miller
fd218142ac
Merge pull request #4721 from MetaMask/i4666-gasLimit 
fixes #4666 getGasLimit and getGasPrice removed and replaced
 2018-07-04 17:22:14 -02:30
Dan
c47a4ce2c9 Update new-ui-send integration tests to always explicitly set gas price. (e2e tests handle auto-setting and defaults) 2018-07-04 16:44:56 -02:30
Dan
0796fc58e4 Improve send token error ux. 2018-07-04 16:09:29 -02:30
Dan Finlay
68e1f22193
Merge pull request #4405 from PortalNetwork/portal-metamask 
Integration ENS with IPFS
 2018-07-04 11:05:16 -07:00
PhyrexTsai
f38dc03b27
Merge pull request #4 from brunobar79/portal-metamask-lint-fix 
Lint fix for Integration ENS with IPFS
 2018-07-04 09:06:10 +08:00
brunobar79
986bb74501 package.json updated and tests passing 2018-07-03 20:24:21 -04:00
brunobar79
d382f89989 tests are passing 2018-07-03 20:21:01 -04:00
Sara Reynolds
6bc7647c05 fixes 4666 2018-07-03 16:05:20 -07:00
Sara Reynolds
d3c64358c5 :qw 
:wq
q
 2018-07-03 16:05:20 -07:00
brunobar79
46498af9b5 Merge branch 'develop' into initial-trezor-support 2018-07-03 18:04:51 -04:00
brunobar79
a279748c2e package-lock update 2018-07-03 17:56:30 -04:00
kumavis
7d882fe491
Merge pull request #4719 from MetaMask/kumavis-patch-3 
lint - ignore test-builds dir
 2018-07-03 13:47:57 -07:00
Dan
7babacf062 Remove unnecessary anonymous function call in actions.js gas estimation. 2018-07-03 17:24:21 -02:30
brunobar79
9d3f2435e5 lint fix 2018-07-03 15:46:15 -04:00
kumavis
b3b33b4697
Update .eslintignore 2018-07-03 12:43:14 -07:00
brunobar79
3837c2ddd7 fix merge conflicts 2018-07-03 15:41:18 -04:00
Esteban MIno
63b9c8796b fix lint 2018-07-03 15:24:23 -04:00
Bruno Barbieri
e467eda4f7
Merge pull request #4718 from MetaMask/ignore-superstatic-vulnerability 
ignore lodash vulnerability
 2018-07-03 09:08:12 -10:00
Dan J Miller
a049627752
Merge pull request #4716 from MetaMask/i4663-clearErrorMessages 
fixes #4663 - Clear Error Messages when Importing Accounts are Successful
 2018-07-03 16:03:55 -02:30
brunobar79
13b03ec090 fix lint errors 2018-07-03 14:29:36 -04:00
brunobar79
595447ccac Merge remote-tracking branch 'upstream/develop' into HEAD 2018-07-03 14:21:17 -04:00
Dan Finlay
2e9bd7e9d1
Merge pull request #4717 from MetaMask/chrome-promise-bugfix 
Conditionally use Promise-based extension API when creating windows
 2018-07-03 11:16:35 -07:00
Dan J Miller
8def5281b4
Merge pull request #4654 from TrejGun/bignumber 
fixes #4307 BigNumber casting issue
 2018-07-03 15:18:04 -02:30
brunobar79
160bc4daa4 ignore lodash vulnerability 2018-07-03 13:46:50 -04:00
Alexander Tseung
3fd5af636f
Merge pull request #4633 from MetaMask/i4580-import-account-errors 
Show all errors on account creation screen.
 2018-07-03 07:43:40 -10:00
bitpshr
badf0ce314 Conditionally use Promise-based extension API when creating windows 2018-07-03 13:33:13 -04:00
Dan J Miller
4bdd59b055
Merge pull request #4699 from TrejGun/removeLeadingZeroes 
move removeLeadingZeroes to utils, add test
 2018-07-03 15:01:48 -02:30
brunobar79
3290421e2f fix merge conflicts 2018-07-03 13:31:30 -04:00
Esteban MIno
0494b2fc8a Merge branch 'develop' into detectTokenFeature 2018-07-03 13:23:15 -04:00
Esteban MIno
03fd4355af passtest-lint 2018-07-03 12:53:06 -04:00
Sara Reynolds
d126887bc3 fixes 4663 2018-07-03 09:50:59 -07:00
kumavis
1f0cf11af1
Merge pull request #4712 from MetaMask/lint-fix 
Lint - Lint all the things (without conflicts!)
 2018-07-03 09:40:25 -07:00
trejgun
1f6bf0a80d fixes #4664 2018-07-03 10:34:39 +08:00
brunobar79
53f1072ff4 fix contract-test 2018-07-02 22:20:51 -04:00
brunobar79
4b398701c1 fix unit tests 2018-07-02 21:03:34 -04:00
brunobar79
c734e486a0 fix tests 2018-07-02 20:21:27 -04:00
brunobar79
b4107a505b fix warning for new-ui screen tests 2018-07-02 20:13:04 -04:00
brunobar79
0da41263ac fix warning for unit tests 2018-07-02 20:12:50 -04:00
brunobar79
390f86113a fix test/mascara.conf.js warnings 2018-07-02 19:53:45 -04:00
brunobar79
04743afb2d fix warnings for integration tests 2018-07-02 19:52:49 -04:00
brunobar79
cb71896a8f fix warnings for e2e tests 2018-07-02 19:51:27 -04:00
brunobar79
376188ffc5 fix notices warning 2018-07-02 19:46:42 -04:00
Esteban Miño
4d9ef0dd7f
Merge pull request #4709 from MetaMask/pointMasterContractMetadata 
point eth-contract-metadata to repo master
 2018-07-02 19:38:50 -04:00