Dan Finlay
b25d4d5cfb
Add platform docs including encryptor param
2017-09-21 15:56:47 -07:00
Dan Finlay
bd117d6b71
Merge branch 'master' into ConfigurableEncryption
2017-09-21 15:56:24 -07:00
Dan Finlay
e9043f22df
Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.
2017-09-21 15:47:25 -07:00
kumavis
73d9434ad6
Merge pull request #2104 from MetaMask/AddPlatformGuide
...
Add guide to porting to new platforms
2017-09-21 15:43:53 -07:00
Dan Finlay
8a874824a8
Version 3.10.3
2017-09-21 11:45:33 -07:00
frankiebee
14b9d16ece
platforms: put context for extension in platform extension class
2017-09-21 11:12:04 -07:00
Alex Lunyov
7256894f51
Fix CORS issues in FireFox
2017-09-21 15:13:53 +08:00
Kevin Serrano
b22783a223
Merge branch 'master' into new-currency-test
2017-09-20 09:40:33 -07:00
frankiebee
418f01411e
mascara: turn off background
2017-09-19 16:48:42 -07:00
Frankie
9bd55f4897
Merge pull request #2129 from MetaMask/json-rpc-engine-bump
...
Json rpc engine bump
2017-09-19 14:37:43 -07:00
frankiebee
daeb7f6ad3
update metamascara
2017-09-19 12:58:51 -07:00
frankiebee
4e57cdf8b3
stub platform
2017-09-19 11:34:19 -07:00
kumavis
3a3e1511e5
changelog - add note on filter fixes
2017-09-19 11:30:06 -07:00
kumavis
77e02d264a
Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-engine-bump
2017-09-19 11:27:49 -07:00
kumavis
b979c6a2f3
deps - bump json-rpc-middleware-stream
2017-09-19 11:22:55 -07:00
kumavis
d2ded61cc9
deps - bump json-rpc-engine
2017-09-19 10:54:41 -07:00
frankiebee
90482934f1
Merge branch 'master' into breakout-mascara
2017-09-19 10:45:51 -07:00
frankiebee
bfd75107f1
add context to platform to not have X-Metamask-Origin in mascara
2017-09-19 10:45:32 -07:00
Frankie
166bd55a43
Merge pull request #2126 from MetaMask/v3.10.2-1
...
v3.10.2
2017-09-19 09:58:09 -07:00
kumavis
0424ab3e48
v3.10.2 - changelog
...
add changelog
2017-09-18 22:44:40 -07:00
kumavis
51b40adecd
v3.10.2
...
published `v3.10.2` as an emergency rollback to `v3.10.0`
2017-09-18 22:42:04 -07:00
frankiebee
29dd81d029
require metamascara
2017-09-18 19:08:02 -07:00
Kevin Serrano
bd8428e9ed
Comply with current currency API and add additional styling.
2017-09-18 16:09:01 -07:00
Frankie
7094d96529
Merge pull request #2121 from MetaMask/i2115-DoNotFailOnRetries
...
Do not mark a retry tx failed that has been broadcast successfully
2017-09-18 14:42:55 -07:00
Dan Finlay
92e738d17c
Bump changelog
2017-09-18 14:37:28 -07:00
Dan Finlay
2b7b1db851
Do not mark a retry tx failed that has been broadcast successfully
...
Fixes #2115
If a tx has been braodcast, the only failures we should accept are:
- Never mined
- On chain failure
We had a section of code that would mark a tx failed during any unknown error during a retry.
Now no retry > 1 will ever mark a tx failed, since it has been broadcast, and may be mined.
2017-09-18 14:34:25 -07:00
Frankie
6204afb156
Merge pull request #2119 from MetaMask/mascara-tests2
...
tests - integration - re-add mascara to normal run
2017-09-18 14:33:40 -07:00
kumavis
eaa85f283d
tests - integration - re-add mascara to normal run
2017-09-18 13:17:08 -07:00
kumavis
30874e074e
Merge pull request #2118 from MetaMask/mascara-tests
...
test - integration - bump timeout
2017-09-18 13:14:52 -07:00
kumavis
9f665d8eda
test - integration - bump timeout
2017-09-18 13:06:35 -07:00
Frankie
bbae8d975e
Merge pull request #2098 from MetaMask/mascara-tests
...
Integration test suite improvements
2017-09-18 12:54:39 -07:00
kumavis
784510f89f
tests - integration - remove failing mascara integration tests from normal run until fixed
2017-09-18 12:31:44 -07:00
Kevin Serrano
51cebcc173
Fix the property query for new currencies.
2017-09-18 12:20:41 -07:00
kumavis
c9ac8f0919
Merge pull request #2117 from MetaMask/Version-3.10.1
...
Version 3.10.1
2017-09-18 12:05:08 -07:00
Kevin Serrano
899a12cb2a
Fix the changelog again.
2017-09-18 12:04:46 -07:00
Kevin Serrano
90e0c10dc2
Add additional attribution to changelog.
2017-09-18 12:02:47 -07:00
Roman Rodov
9af52ee1c5
Another merge conflict resolved.
2017-09-18 12:00:12 -07:00
Roman Rodov
f6f7798828
Resolve merge conflicts for currency sort merge.
2017-09-18 11:51:17 -07:00
Dan Finlay
c90c904f95
Version 3.10.1
2017-09-18 11:47:59 -07:00
Dan Finlay
fa50bf9587
Merge pull request #2075 from MetaMask/mixed-case
...
Specific error for send screen: address checksum fails
2017-09-18 11:46:50 -07:00
Kevin Serrano
51f0911f87
Merge branch 'master' into new-currency-test
2017-09-18 11:46:10 -07:00
Dan Finlay
c463647ad7
Merge pull request #2080 from MetaMask/fix-tooltip
...
Fix position of tooltip to avoid overflow cutoff
2017-09-18 11:44:58 -07:00
Dan Finlay
545cbbebb9
Merge branch 'master' into fix-tooltip
2017-09-18 11:20:00 -07:00
Dan Finlay
67accea693
Merge branch 'master' into mixed-case
2017-09-18 11:17:00 -07:00
Dan Finlay
99856189ed
Merge pull request #2093 from MetaMask/max-validation
...
High GasLimit Validation Warning
2017-09-18 11:14:26 -07:00
kumavis
5d01ca10e4
tests - mascara - increase timeout before test starts
2017-09-15 13:19:31 -07:00
kumavis
a9900be085
test - mascara - move skip reload test flag
2017-09-15 13:13:53 -07:00
kumavis
0ab37b52c0
mascara - proxy - small cleanup
2017-09-15 13:13:13 -07:00
kumavis
d2d6f6a858
tests - integration - add mascara to integration test run
2017-09-15 12:20:43 -07:00
kumavis
779e973b45
tests - integration - mascara - small cleanup and timeout adjustments
2017-09-15 12:19:52 -07:00
