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

5267 Commits

Author SHA1 Message Date
Chi Kei Chan
b80ed2c451
Merge pull request #3007 from alextsg/uat-master-011618
[NewUI] Merge master into uat branch
2018-01-17 13:48:16 -08:00
Alexander Tseung
aa08d1a09d Fix merge conflicts 2018-01-16 18:34:24 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Alexander Tseung
ccb80594be Readjust gas fees when switching networks on the send screen 2018-01-16 17:26:34 -08:00
Thomas Huang
aa76c5c73c
Merge pull request #2996 from MetaMask/Version-3.13.5
Version 3.13.5
2018-01-16 12:30:48 -08:00
Dan Finlay
41fdff41cd Version 3.13.5 2018-01-16 12:20:15 -08:00
Dan J Miller
668aab11d1 Vertically centers the text of the new ui modal header. (#2987) 2018-01-16 12:15:18 -08:00
Dan J Miller
d7a1019a2c Adding one or more tokens sets the selected token before returning the user to the main screen. (#2995) 2018-01-16 12:14:03 -08:00
kumavis
727ec73b66
Merge pull request #2983 from MetaMask/i2907-NoCodeGasLimit
Set gas limit to 21k for recipients with no code
2018-01-16 11:16:06 -08:00
Dan Finlay
c0cf665b85 Merge branch 'master' into i2907-NoCodeGasLimit 2018-01-16 11:05:40 -08:00
Dan Finlay
8fb62b97c5 Create new flag for simple sends to avoid overloading other flag 2018-01-16 11:05:11 -08:00
kumavis
b046f96d4b
Merge pull request #2929 from MetaMask/i2779-FirefoxSpecifyAccountDetailHeight
I2779 firefox specify account detail height
2018-01-16 10:42:59 -08:00
Dan Finlay
003b4a721c
Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight 2018-01-16 10:15:11 -08:00
kumavis
6cfaf03b3d
Merge branch 'master' into i2907-NoCodeGasLimit 2018-01-16 09:59:32 -08:00
Thomas Huang
27ca48b369
Merge pull request #2984 from MetaMask/RenameLockToLogout
Rename lock to log out
2018-01-16 09:48:23 -08:00
Dan J Miller
77eb7b2db6 [NewUI-flat] Fix gulp build (#2975)
* Only run uglify when building for prod; set environment when building for prod; use gulp-uglify-es.

* Revert change of dist script.
2018-01-15 19:00:07 -08:00
Dan
a4fd4f013f Restore display of all unconfirmed transactions. 2018-01-15 18:32:25 -08:00
Alexander Tseung
baebf64afd Fix send screen value input 2018-01-15 18:28:21 -08:00
Alexander Tseung
644adeccf6 Fix Hide Token modal styling, popup positioning 2018-01-15 18:26:16 -08:00
Dan Finlay
1a8beb13e6
Merge pull request #2962 from MetaMask/open-popup
Open popup before estimateGas finishes
2018-01-15 16:17:56 -08:00
Dan Finlay
0121892141
Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight 2018-01-15 16:15:50 -08:00
Dan Finlay
58be1742e1 Rename lock to log out
Fixes #2475
2018-01-15 16:04:49 -08:00
Frankie
f18ed8bfd4
Merge branch 'master' into open-popup 2018-01-15 15:25:14 -08:00
frankiebee
724197b95f add to CHANGELOG.md 2018-01-15 15:23:11 -08:00
Dan Finlay
845917b2d5
Merge branch 'master' into i2907-NoCodeGasLimit 2018-01-15 15:10:50 -08:00
Dan Finlay
cd7eaaa735 Set gas limit to 21k for recipients with no code
Fixes #2907
2018-01-15 15:08:07 -08:00
Frankie
a18524300a
Merge pull request #2953 from MetaMask/i2826-SignBytes
Fix signTypedData bytes signing
2018-01-15 15:03:43 -08:00
Frankie
9d7c635b0a
Merge branch 'master' into i2826-SignBytes 2018-01-15 14:47:48 -08:00
Dan Finlay
582634d9fa
Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation
Improve gas price estimation by backfilling recent-blocks
2018-01-15 14:35:59 -08:00
Dan Finlay
5fb2cfed6a
Merge branch 'master' into i2826-SignBytes 2018-01-15 14:20:50 -08:00
Thomas Huang
23a928bc9d
Edit: Fix Firefox scrollbar Changelog 2018-01-15 14:18:32 -08:00
Dan Finlay
1b3ab71063
Merge pull request #2862 from wbt/UpdateNotice
Update notice
2018-01-15 14:17:44 -08:00
Dan Finlay
93d4b22363 Bump keyringController version 2018-01-15 14:11:59 -08:00
Dan Finlay
85b2012106
Merge pull request #2964 from alextsg/cb-505c
[NewUI] Move blockies option to the bottom of Settings
2018-01-15 13:55:43 -08:00
Dan J Miller
aa833a0928 [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)
* Place all users of extension into old UI (disable auto adding).

* Fix lint errors.
2018-01-15 13:23:44 -08:00
kumavis
bfa10e29a1
Merge pull request #2900 from MetaMask/infura-rest-api
Provider - Use Infura rest api for infura networks
2018-01-15 12:13:59 -08:00
Thomas
cab2216343 Bump Changelog 2018-01-15 10:07:50 -08:00
Alexander Tseung
27cbfa44c3 Move blockies option to the bottom of Settings 2018-01-14 21:39:40 -08:00
frankiebee
7a30950e4d test - fix to match expected behavior 2018-01-14 14:10:16 -08:00
frankiebee
409b49b411 test - create ethJsQuery stub 2018-01-14 14:00:59 -08:00
frankiebee
f0dd4f1923 transactions - emit 'newUnapprovedTx' before estimateGas finishes 2018-01-14 14:00:17 -08:00
frankiebee
d5c311b13e add a loading spinner to conf-tx view 2018-01-14 13:56:54 -08:00
Dan Finlay
6df3261deb Fix signTypedData bytes signing
Fixes #2826
2018-01-13 13:39:21 -08:00
Alexander Tseung
b42baacdf4 Fix confirm Add Token button order 2018-01-12 17:07:10 -08:00
Alexander Tseung
dce6dcf437 Fix Add Token button order, styling 2018-01-12 17:07:10 -08:00
Dan
2bc85ea72f Fix input box padding and select highlight in new account create and import page. 2018-01-12 13:42:51 -08:00
Dan
980e1bfcf8 New add account page with create and import options. 2018-01-12 13:42:51 -08:00
Chi Kei Chan
89a8267fe7
Merge pull request #2928 from alextsg/cb-388
[NewUI] Update main view styling
2018-01-12 13:41:46 -08:00
Chi Kei Chan
613465fe96
Merge branch 'uat' into cb-388 2018-01-12 13:41:33 -08:00
Chi Kei Chan
71a308d98b
Merge branch 'uat' into cb-388 2018-01-12 13:41:03 -08:00