Csaba Solya
|
8292dabed5
|
add negative decrypt test
|
2018-02-23 11:03:53 +01:00 |
|
Csaba Solya
|
cd05d77c3f
|
fix tests
|
2018-02-23 10:49:56 +01:00 |
|
Csaba Solya
|
73d9bfc52c
|
make keyFromPassword private
|
2018-02-23 10:09:16 +01:00 |
|
Csaba Solya
|
c1aa59f6ed
|
adding tests
|
2018-02-23 10:08:23 +01:00 |
|
Csaba S
|
2f34630486
|
Merge branch 'master' into edge-support
|
2018-02-22 14:55:46 +01:00 |
|
Csaba Solya
|
5ec311ba3e
|
add edge support
|
2018-02-22 14:39:32 +01:00 |
|
Dan Finlay
|
eed75735b8
|
Merge pull request #3050 from MetaMask/uat
[EPIC] Merge UAT into master
|
2018-02-21 15:46:31 -08:00 |
|
Thomas Huang
|
e27a3823ba
|
Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix
[NewUI] Prevents new tx from active tab from opening popup
|
2018-02-21 12:50:45 -08:00 |
|
Dan Finlay
|
8da20e15bd
|
Merge pull request #3288 from MetaMask/uat-master
Uat master
|
2018-02-21 11:26:00 -08:00 |
|
Dan Finlay
|
716acc088e
|
Merge branch 'master' into uat-master
|
2018-02-21 10:56:23 -08:00 |
|
Dan
|
a4ed6af2ad
|
Prevents new transaction from generating popup when metamask is open in an active tab.
|
2018-02-21 15:04:04 -03:30 |
|
Thomas Huang
|
b8ee83e973
|
Merge pull request #3296 from danjm/MM-806-new-ui-first-time-import-seed-in-popup
[NewUI] Fix Import Existing DEN in popup New UI first time flow.
|
2018-02-21 10:22:19 -08:00 |
|
Thomas Huang
|
c26c57fad7
|
Remove output file
|
2018-02-20 20:09:32 -08:00 |
|
Thomas Huang
|
84c023ba40
|
Use same logic for downloading state logs in the old/uat
|
2018-02-20 19:52:32 -08:00 |
|
Thomas Huang
|
3fb9e04f5f
|
Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://github.com/danjm/metamask-extension into MM-806-new-ui-first-time-import-seed-in-popup
|
2018-02-20 17:49:31 -08:00 |
|
Dan
|
b1b9772731
|
Fix old-ui active notices width.
|
2018-02-20 21:44:17 -03:30 |
|
Dan
|
66f55f954e
|
Render loading inside notice screen, and don't set isLoading from unMarkPasswordForgotten.
|
2018-02-20 20:52:41 -03:30 |
|
Dan Finlay
|
98d3fba3ef
|
Fix promise construction
|
2018-02-20 15:45:48 -08:00 |
|
Dan Finlay
|
16f9ddc72c
|
Add 8MM gas limit default to send screen
|
2018-02-20 15:44:04 -08:00 |
|
Dan Finlay
|
a1b72e5252
|
Try fixing notice screen synchronous state call
|
2018-02-20 13:51:06 -08:00 |
|
Thomas Huang
|
f2f4795697
|
Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://github.com/danjm/metamask-extension into MM-806-new-ui-first-time-import-seed-in-popup
|
2018-02-20 12:00:06 -08:00 |
|
Dan
|
6740be109b
|
Temporarily disable loading indicator.
|
2018-02-20 16:28:41 -03:30 |
|
Dan
|
cca931c783
|
Temporarily disable loading indicator.
|
2018-02-20 16:17:30 -03:30 |
|
Dan
|
00c5dd2736
|
Fix variable spelling error.
|
2018-02-20 14:00:35 -03:30 |
|
Dan
|
c26e0d555b
|
Fix Import Existing DEN in popup New UI first time flow.
|
2018-02-19 22:46:18 -03:30 |
|
kumavis
|
13b12efa03
|
Merge pull request #3286 from danjm/uat-version-bump
[NewUI] uat version bump
|
2018-02-16 23:36:45 +00:00 |
|
Dan
|
7169cb1eb8
|
Bump uat version to 4.0.12
|
2018-02-16 19:38:01 -03:30 |
|
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
|
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 |
|
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 |
|
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 |
|