1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Commit Graph

5596 Commits

Author SHA1 Message Date
Dan J Miller
81eb5c8796
Ensures that mascara initialize screen is not shown in popup. (#3279) 2018-02-16 19:21:16 -03:30
Dan Finlay
16754fa307
Merge pull request #3278 from MetaMask/Version-3.14.1
Make announcement more general
2018-02-16 13:07:17 -08:00
kumavis
06838774fa sentry - report failed tx with more specific message 2018-02-16 10:21:06 -08:00
kumavis
4e8d9fef84
Merge pull request #3200 from alextsg/cb-703
[NewUI] Remove accessing PropTypes from main React package
2018-02-16 16:11:36 +00:00
kumavis
c0893f2bcc
Merge pull request #3250 from MetaMask/i#3136
fix - hex prefix estimatedGas on txMeta
2018-02-16 15:59:20 +00:00
kumavis
b046378e33
Merge pull request #3267 from MetaMask/i3266-IgnoreZeroGasLimit
Default validated block gas limit to 8MM when none identified
2018-02-16 15:57:31 +00:00
kumavis
8e80081966
lint - lift comment to new line 2018-02-16 07:50:51 -08:00
kumavis
79f62635d7
Merge pull request #3261 from MetaMask/uat-oldui-compatibility
Adjust old UI css compatibility with new UI style changes
2018-02-16 15:46:51 +00:00
Dan J Miller
170c7602b7
[NewUI] Adds the mascara first time flow to betaUI extension (#3257)
* Adds the mascara first time flow to the extension when opened in browser.

* Fix tests after addition of mascara first time flow to new ui.
2018-02-16 06:15:09 -03:30
Dan Finlay
73e5ae6e29 Fix incorrect promise instantiation 2018-02-15 15:32:48 -08:00
Dan Finlay
70132e6df6 Default validated block gas limit to 8MM when none identified
Mitigates #3266
2018-02-15 15:15:26 -08:00
kumavis
a26add6fdf
Merge pull request #3265 from MetaMask/Version-3.14.2
Version 3.14.2
2018-02-15 22:38:09 +00:00
Dan Finlay
71be537f1c Version 3.14.2 2018-02-15 14:23:22 -08:00
Dan Finlay
a4a56b239f
Merge pull request #3260 from MetaMask/changelog-mesh-testing
CHANGELOG.md - Add mesh testing container note
2018-02-15 12:36:37 -08:00
Thomas Huang
ed33f3160a Make oldui compatible with newUI style changes 2018-02-15 12:36:26 -08:00
Dan Finlay
58871cb146
Merge pull request #3222 from MetaMask/mesh-test
metamask mesh - inject mesh testing container
2018-02-15 12:08:06 -08:00
kumavis
a5056a62d1
Update CHANGELOG.md 2018-02-15 12:04:19 -08:00
Thomas Huang
8f7094a73d Network controller nock 2018-02-15 09:54:22 -08:00
Thomas Huang
33182efb13 Offline testing 2018-02-15 08:34:31 -08:00
frankiebee
dc3f3e79ca fix - hex prefix estimatedGas on txMeta 2018-02-14 14:37:02 -08:00
Kevin Serrano
884f097cc1
Merge pull request #3242 from MetaMask/AddChangelogEntry
Bump changelog
2018-02-13 14:17:50 -08:00
Kevin Serrano
bcd3042491
Standardize license. 2018-02-13 14:17:13 -08:00
Dan Finlay
7a820bedda Bump changelog 2018-02-13 13:35:03 -08:00
Dan Finlay
c5773c4973
Merge pull request #3224 from lazaridiscom/master
use the providers initial _blocktracker (fixes #2393)
2018-02-13 21:28:33 +01:00
Dan Finlay
77259ef5be
Merge pull request #3240 from MetaMask/AddSassToDevDeps
Add node-sass to dev dependencies
2018-02-13 20:49:27 +01:00
Dan Finlay
e422294ad1 Add node-sass to dev dependencies
To fix build
2018-02-13 11:35:30 -08:00
Dan J Miller
eb61f69f92
Merge pull request #3231 from danjm/MM-744-restore-from-seed-fix
[NewUI] Only open a new window on restore from seed if in extension view.
2018-02-13 15:32:29 -03:30
Dan J Miller
b4bfdc5e6c
Merge pull request #3239 from MetaMask/uat-next
Uat next
2018-02-13 15:31:49 -03:30
Dan
5e9dc74a59 Remove isInBrowser method and use environment-type.js 2018-02-13 15:20:24 -03:30
Dan Finlay
ee1197192f
Merge pull request #3209 from danjm/MM-634-newui-reset-account
[NewUI] Add reset account button to new UI.
2018-02-13 19:50:19 +01:00
Dan
b5b16e4ce0 Only open a new window on restore from seed if in extension view. 2018-02-13 15:19:53 -03:30
Dan Finlay
96d40ee618
Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screens
[NewUI] Try beta link on unlock and privacy screens.
2018-02-13 19:28:49 +01:00
Dan J Miller
35c762da47 Updates the styling of confirm send ether and token screens. (#3235) 2018-02-12 22:51:05 -08:00
Dan J Miller
e4c83466be Send screen style updates. (#3234) 2018-02-12 22:39:15 -08:00
Dan J Miller
fe2ed68f11 Remove chrome focus outline for mouse users. (#3230) 2018-02-12 09:45:53 -08:00
Lazaridis
58a554b168 use the providers initial _blocktracker. fixes #2393 2018-02-11 05:09:27 +02:00
kumavis
94cd5b9df4 metamask mesh - inject mesh testing container 2018-02-10 19:33:33 +00:00
Dan
bb79fb354b Try beta link on unlock and privacy screens. 2018-02-08 22:47:32 -03:30
Alexander Tseung
7f70943fa2
Fix exception thrown in selected token tx list with shapeshift txs (#3215) 2018-02-08 17:37:22 -08:00
Dan J Miller
c8c2dfdc0f Fixes shapeshift txs so that they render in tx list. (#3208) 2018-02-08 16:40:15 -08:00
Dan
cd976a2765 Add reset account button to new UI. 2018-02-08 20:23:16 -03:30
Dan J Miller
f39222c9af
Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019
[NewUI] Merge uat to uatnext feb072019
2018-02-08 12:20:04 -03:30
Alexander Tseung
e9c2c0eec1
Make blockies icon round to match identicons (#3205) 2018-02-07 18:46:27 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan J Miller
c50a197ab9
Merge pull request #3203 from danjm/merge-master-to-uat-feb72018
Merge master to UAT feb72018
2018-02-07 21:18:10 -03:30
Dan J Miller
7f151b861c
[NewUI] Opens to full screen when restoring from seed. (#3201)
* Opens to full screen when restoring from seed.

* Remove redundant parameter in actions.markPasswordForgotten call.
2018-02-07 21:08:55 -03:30
Dan
6f14dc4702 Point add-token unit test to old-ui component. 2018-02-07 20:55:21 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
8b90b1d1b1 Remove accessing PropTypes from main React package 2018-02-06 22:03:37 -08:00
Alexander Tseung
9db0a32dac
Update modal header design on send screen (#3196) 2018-02-06 21:07:00 -08:00