Thomas Huang
a9ecf9c6fc
Merge branch 'master' into uat
2018-01-23 10:55:21 -08:00
Dan J Miller
62ce65c99e
Merge pull request #3069 from tmashuang/uat
...
Revert integration tests to uat to oldUI
2018-01-23 15:08:39 -03:30
Thomas
97ca86733c
Merge branch 'master' into uat
2018-01-23 01:12:50 -08:00
Dan Finlay
03fbf75b4e
Merge pull request #3065 from MetaMask/Version-3.13.7
...
Version 3.13.7
2018-01-22 16:34:40 -08:00
Thomas
b62ec394f5
Revert integration to oldUi
2018-01-22 16:10:07 -08:00
Thomas
ce0de5feed
String interpolate version in settings
2018-01-22 16:09:23 -08:00
Dan Finlay
f6fb1bc08f
Merge branch 'Version-3.13.7' of github.com:MetaMask/metamask-plugin into Version-3.13.7
2018-01-22 16:09:00 -08:00
Dan Finlay
022b125495
Merge remote-tracking branch 'origin/master' into Version-3.13.7
2018-01-22 16:08:14 -08:00
Thomas
baba179ccb
Remove duplicate eth-contract-metadata
2018-01-22 16:08:00 -08:00
Thomas
d59136eb49
Add ExtensionPlatform = 'development' to mockUi
2018-01-22 16:06:35 -08:00
Dan Finlay
5568053cd8
Version 3.13.7
2018-01-22 16:06:20 -08:00
kumavis
f26933493c
Merge branch 'master' into Version-3.13.7
2018-01-22 16:05:34 -08:00
kumavis
b1c34639f8
Merge pull request #3066 from MetaMask/sentry-failed-tx
...
sentry - report failed txs
2018-01-22 16:04:10 -08:00
kumavis
7e32ba2833
changelog - add note on sentry
2018-01-22 15:57:25 -08:00
kumavis
b91e2b5eb1
sentry - report failed txs
2018-01-22 15:54:26 -08:00
Dan Finlay
4b9c166a64
Version 3.13.7
2018-01-22 15:46:09 -08:00
Kevin Serrano
0373a3840b
Merge pull request #3047 from MetaMask/fix-provider-json-parse
...
Fix providers retry logic and retries expired error messages
2018-01-22 15:12:56 -08:00
Dan Finlay
222748fbde
Merge pull request #3064 from MetaMask/engine-patch
...
deps - bump json rpc engine for bugfix
2018-01-22 14:14:20 -08:00
kumavis
2b7542054e
deps - bump json rpc engine for bugfix
2018-01-22 12:52:15 -08:00
kumavis
b76f590043
Merge pull request #3025 from MetaMask/i#3018
...
add a `x` close button to gas calc loding screen on conf-tx
2018-01-22 11:40:22 -08:00
Dan Finlay
128b64cc2c
Bump changelog
2018-01-22 11:15:05 -08:00
Chi Kei Chan
338ebe5f40
Merge pull request #3049 from chikeichan/newmaster
...
Merge master to uat
2018-01-19 15:58:26 -08:00
Dan
c554e52e82
Get version from manifest instead of hard coding in New UI info page.
2018-01-19 15:31:11 -08:00
Chi Kei Chan
c415b56ce7
update yarn.lock
2018-01-19 15:30:28 -08:00
Chi Kei Chan
77c545336b
Merge branch 'uat' into newmaster
2018-01-19 15:29:36 -08:00
kumavis
4670aad291
deps - bump provider engine and infura-middleware for better retry and error messages
2018-01-19 14:07:38 -08:00
kumavis
02df9a6bd1
deps - bump providers for better JSON parse error messages
2018-01-19 12:16:53 -08:00
kumavis
4e63924e60
4.0.10
2018-01-18 16:02:35 -08:00
Alexander Tseung
b05d21b1ba
Fix transaction list font sizes, padding
2018-01-18 13:34:57 -08:00
Dan Finlay
98b5a62fa7
Merge pull request #3023 from MetaMask/build-lock-gulp
...
build - lock pre-release gulp dep to commit
2018-01-18 13:12:41 -08:00
Dan Finlay
59d0fa2637
Merge pull request #3016 from MetaMask/sentry
...
Stability - Add Sentry Remote Error Reporting
2018-01-18 13:11:15 -08:00
Dan Finlay
098f0ca22c
Merge pull request #3035 from MetaMask/infura-rest-fix
...
BugFix - infura rest api uri length limit fix
2018-01-18 13:02:40 -08:00
Kevin Serrano
5fff2e19d8
Merge pull request #3024 from alextsg/cb-529
...
[NewUI] Update popout to fullscreen icon
2018-01-18 12:39:09 -08:00
kumavis
9f3183ccf3
deps - bump infura provider for uri length limit fix
2018-01-18 11:51:39 -08:00
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
Dan J Miller
4fae461a67
[NewUI] Send screen gas loading fixes ( #3027 )
...
* Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send.
* Fix variable name.
2018-01-17 20:47:01 -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
Alexander Tseung
853e7f8420
Fix lint errors
2018-01-17 18:50:18 -08:00
frankiebee
8bb57f33b1
add a x
close button to gas calc loding screen on conf-tx
2018-01-17 18:47:56 -08:00
greenkeeper[bot]
899ddf0179
chore(package): update mocha to version 5.0.0
2018-01-18 02:21:45 +00: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
Alexander Tseung
f8bf8cb527
Update popout to fullscreen icon
2018-01-17 17:56:18 -08:00