1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

4641 Commits

Author SHA1 Message Date
Thomas Huang
e561740133
Merge branch 'master' into build-lock-gulp 2018-01-18 10:13:31 -08:00
Thomas Huang
d8d11ec764
Merge pull request #3029 from MetaMask/test-provider-stub
Tests - Improved provider stubbing with test-block-middleware
2018-01-18 10:07:41 -08:00
kumavis
ab3423d00d deps - re-add eth-block-tracker 2018-01-17 22:07:08 -08:00
kumavis
899e839e7c test - createTestProviderTools includes block tracker layer 2018-01-17 21:43:34 -08:00
kumavis
d7c8ec22a4 test - tx controller - fix txGasUtil reference 2018-01-17 20:09:13 -08:00
kumavis
b70d3a9b6e deps - bump json-rpc-engine for better errors 2018-01-17 20:02:43 -08:00
kumavis
d1d745eef4 test - typo - fix spelling of word stubbed 2018-01-17 19:47:35 -08:00
kumavis
3cbf2b7e3e test - remove createEthJsQueryStub 2018-01-17 19:44:11 -08:00
kumavis
2b9781ab4c test - stub provider needs to handle errors 2018-01-17 19:19:20 -08:00
kumavis
b259c29374
Merge pull request #3021 from MetaMask/i#3020
transactions - transition approved transactions to failed transactions…
2018-01-17 18:03:52 -08:00
kumavis
96fc916024
Update transactions.js 2018-01-17 17:56:31 -08:00
kumavis
29a6da0d01 build - lock pre-release gulp dep to commit 2018-01-17 17:50:55 -08:00
frankiebee
234c2417ca transactions - transtion approved transactions to failed transactions on boot 2018-01-17 16:49:38 -08:00
Frankie
7c380547b7
Merge pull request #3019 from MetaMask/i#3015
transactions - wrap addTxDefaults in a try catch and re try addTxDefa…
2018-01-17 16:36:18 -08:00
frankiebee
be8d924432 transactions - fail txs on boot who fail addTxDefaults 2018-01-17 15:48:37 -08:00
frankiebee
9f19fea8e0 transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on boot if they did not complete 2018-01-17 15:42:01 -08:00
Frankie
5e4dd7118f
Merge pull request #3012 from MetaMask/AddNetworkIndicatorClasstoLoading
Add network-indicator classname to network loading spinner
2018-01-17 11:37:46 -08:00
Thomas
8c792ba3ee Add network-indicator classname to network loading spinner 2018-01-17 10:51:23 -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
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 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
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
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
Kevin Serrano
20981f655b
Merge pull request #2909 from MetaMask/UpdateSupportLinks
Update support links for helpscout
2018-01-12 13:07:54 -08:00
Dan Finlay
429db74508 Use https 2018-01-12 11:03:03 -08:00