1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 12:47:14 +01:00
Commit Graph

6320 Commits

Author SHA1 Message Date
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
Alexander Tseung
72ffa2c3f5 Fix react-router related exceptions 2018-02-09 12:05:27 -08:00
Alexander Tseung
ef0bbb291d Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 21:46:19 -08: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
Alexander Tseung
2240688fd4 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:44:02 -08:00
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -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
Dan J Miller
9ed3a5512e Fix alignment of ellipsis and address in wallet view. (#3198) 2018-02-06 16:51:32 -08:00
Dan J Miller
d84dc5da42 Remove duplicate token balance on uat next. (#3195) 2018-02-06 10:21:21 -08:00
Dan J Miller
a7bfea51e5 Integration tests for signature requests confirmations. (#3194) 2018-02-06 10:20:37 -08:00
Alexander Tseung
d452403322
Add functional integration testing to Add Token flow (#3189) 2018-02-05 18:47:46 -08:00
Dan J Miller
d4da419c5b Wallet view supports screen sizes between 576px and 667px (#3193) 2018-02-05 18:31:21 -08:00
Alexander Tseung
e4895df953
Change styling of Import Account with Seed Phrease (#3182) 2018-02-05 12:39:33 -08:00
Dan Finlay
6d9ea863bd Make announcement more general 2018-02-01 16:14:28 -08:00
Thomas Huang
dc24a6e8c2
Merge pull request #3177 from MetaMask/Version-3.14.1
Version 3.14.1
2018-02-01 16:12:27 -08:00
Dan Finlay
9f304e3026 Version 3.14.1 2018-02-01 15:53:18 -08:00
Dan Finlay
daa7caf7bb
Merge pull request #3176 from MetaMask/FirefoxSettingsOverflow
Scrollable Settings screen for Firefox
2018-02-01 15:51:55 -08:00
Thomas
10e75dc4dd Scrollable Settings screen for Firefox 2018-02-01 14:53:43 -08:00
Frankie
3b89a3f6ce
Merge pull request #3175 from MetaMask/Version-3.13.9
Version 3.14.0
2018-02-01 14:47:20 -08:00
Alexander Tseung
2fd9e58e61 Fix lint errors 2018-02-01 14:13:08 -08:00
Dan Finlay
0608d1579f Version 3.14.0 2018-02-01 12:27:19 -08:00
Dan Finlay
678bf561ce Remove deps from build process
Was running out of stdout memory, preventing me from building.
2018-02-01 12:26:17 -08:00
Dan
f38675c9ac Checks if there is currently a send in progress before redirecting to default in conf-tx 2018-01-31 18:26:26 -08:00
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00