Frankie
|
4a4338c1f4
|
Merge pull request #2305 from MetaMask/nodeify
nodeify - allow callback to be optional
|
2017-10-06 14:08:58 -07:00 |
|
kumavis
|
fa11bbf996
|
Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit
Update status of pending transactions on startup
|
2017-10-06 13:40:43 -07:00 |
|
kumavis
|
9adf77e3fe
|
Merge pull request #2306 from MetaMask/i2294-MarkTxAsFailedAfterSameNonceIsMined
Mark tx as failed after tx with same nonce is mined
|
2017-10-06 13:17:45 -07:00 |
|
kumavis
|
0b6dab384f
|
Merge branch 'nodeify' of github.com:MetaMask/metamask-extension into nodeify
|
2017-10-06 13:17:06 -07:00 |
|
kumavis
|
3b3120c5f8
|
nodeify - fix test
|
2017-10-06 13:16:44 -07:00 |
|
kumavis
|
bc396a7417
|
lint fix - nodeify
|
2017-10-06 13:02:34 -07:00 |
|
Dan Finlay
|
a417fab0eb
|
When checking pending txs, check for successful txs with same nonce.
If a successful tx with the same nonce exists, transition tx to the failed state.
Fixes #2294
|
2017-10-06 12:51:13 -07:00 |
|
Dan Finlay
|
94513cae7b
|
Provide method for tx tracker to refer to all txs
|
2017-10-06 12:50:33 -07:00 |
|
kumavis
|
be4f7b33f4
|
nodeify - allow callback to be optional
|
2017-10-06 12:36:08 -07:00 |
|
Dan Finlay
|
a32d71e8ed
|
Add failing test for issue #2294
|
2017-10-06 12:29:27 -07:00 |
|
Dan Finlay
|
0146b55d6d
|
Check status of pending transactions on startup
Fixes #1531
|
2017-10-06 11:41:28 -07:00 |
|
kumavis
|
53da368d23
|
Merge pull request #2293 from MetaMask/Version-3.10.9
Version 3.10.9
|
2017-10-05 15:49:27 -07:00 |
|
Dan Finlay
|
8d45b96db6
|
Version 3.10.9
|
2017-10-05 12:44:48 -07:00 |
|
Dan Finlay
|
833d73da56
|
Merge pull request #2292 from MetaMask/rebrocast-by-timeStamp
Rebrocast by time stamp
|
2017-10-05 12:34:56 -07:00 |
|
frankiebee
|
554a3ac4e4
|
add to CHANGELOG.md
|
2017-10-05 12:12:31 -07:00 |
|
frankiebee
|
3cb9da2ae5
|
"fix" hours for message
|
2017-10-05 11:42:01 -07:00 |
|
frankiebee
|
e128e4859f
|
Merge branch 'master' into rebrocast-by-timeStamp
|
2017-10-05 11:08:34 -07:00 |
|
frankiebee
|
ec9c528313
|
pending-tx - check time stamp instead of block number for resubmit
|
2017-10-05 11:07:22 -07:00 |
|
Thomas Huang
|
c880d81ec3
|
Merge pull request #2289 from MetaMask/mascara-tuneups
Mascara tuneups
|
2017-10-05 11:06:17 -07:00 |
|
frankiebee
|
7ec068d279
|
mascara/background: use async await
|
2017-10-04 23:26:56 -07:00 |
|
frankiebee
|
5eca4223b2
|
use log.debug
|
2017-10-04 23:07:40 -07:00 |
|
frankiebee
|
7a9e2aa4f0
|
mascara: linting and code clean up
|
2017-10-04 23:03:47 -07:00 |
|
frankiebee
|
2dba03ffc5
|
dont lint jquery
|
2017-10-04 22:30:28 -07:00 |
|
frankiebee
|
245ab70881
|
add /mascara to linting
|
2017-10-04 22:10:30 -07:00 |
|
frankiebee
|
e7589a099f
|
mascara:exampl/app - add a send tx button
|
2017-10-04 22:09:37 -07:00 |
|
Thomas Huang
|
35f4148343
|
Merge pull request #2282 from MetaMask/Enforce0xPrefixForKeyrings
Enforce 0x prefix on accounts with new hd keyring
|
2017-10-04 16:56:20 -07:00 |
|
Dan Finlay
|
88686a3968
|
Enforce 0x prefix on accounts with new hd keyring
|
2017-10-04 15:35:46 -07:00 |
|
Dan Finlay
|
a142f8913d
|
Merge pull request #2276 from MetaMask/revert-compute
Revert to normal balances.
|
2017-10-04 14:48:42 -07:00 |
|
Frankie
|
852c27bad4
|
Merge pull request #2279 from MetaMask/filter-default-fix
deps - bump eth-json-rpc-filters for log filter fix
|
2017-10-04 14:07:18 -07:00 |
|
kumavis
|
23bc92a8f1
|
deps - bump eth-json-rpc-filters for log filter fix
|
2017-10-04 13:33:50 -07:00 |
|
Kevin Serrano
|
27c72ee565
|
Revert to normal balances.
|
2017-10-04 12:10:01 -07:00 |
|
Thomas Huang
|
f12504cd09
|
Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0
Update coveralls to the latest version 🚀
|
2017-10-03 12:35:25 -07:00 |
|
Thomas Huang
|
4f678c7c34
|
Merge pull request #2264 from MetaMask/greenkeeper/mocha-4.0.0
Update mocha to the latest version 🚀
|
2017-10-03 12:33:11 -07:00 |
|
Kevin Serrano
|
1893c50730
|
Merge pull request #2175 from MetaMask/RemoveSlackLink
Remove slack link
|
2017-10-03 10:46:29 -07:00 |
|
Frankie
|
948a0b1078
|
Merge pull request #2250 from interfect/master
Don't pass origin as an HTTP header
|
2017-10-03 10:36:39 -07:00 |
|
Kevin Serrano
|
44949813de
|
Merge pull request #2251 from BrandenSoropia/remove-metamask-title
Removed MetaMask title. Fixed #1730.
|
2017-10-03 10:15:33 -07:00 |
|
greenkeeper[bot]
|
98641f6f66
|
chore(package): update mocha to version 4.0.0
|
2017-10-03 04:33:04 +00:00 |
|
Frankie
|
62a022336a
|
Merge pull request #2261 from MetaMask/retry-warn-not-fail
Resubmit - warn not fail on error
|
2017-10-02 16:09:19 -07:00 |
|
kumavis
|
2113d83489
|
ui - tx history - simplify error+warning display code
|
2017-10-02 15:39:44 -07:00 |
|
kumavis
|
062eaa6a82
|
pending tx tracker - on tx:warn append error message instead of error obj
|
2017-10-02 15:39:11 -07:00 |
|
Kevin Serrano
|
4b0e6a0a77
|
Merge branch 'master' into RemoveSlackLink
|
2017-10-02 15:23:27 -07:00 |
|
kumavis
|
25a80932a6
|
pending tx tracker - test - expect warning event on resubmit failure
|
2017-10-02 15:20:18 -07:00 |
|
kumavis
|
ed77304e73
|
pending tx tracker - tx:warning event includes err obj
|
2017-10-02 15:20:01 -07:00 |
|
kumavis
|
a86f6d6d90
|
pending tx tracker - test - rename tests to match event name
|
2017-10-02 15:14:15 -07:00 |
|
kumavis
|
22eaf92ec2
|
pending tx tracker - resubmit - warn dont error on unknown error
|
2017-10-02 15:00:23 -07:00 |
|
kumavis
|
7af696bfbe
|
pending tx tracker - dont throw on load failure
|
2017-10-02 14:56:59 -07:00 |
|
kumavis
|
b7c1951602
|
Merge pull request #2260 from MetaMask/history-notes
transaction - provide notes for history
|
2017-10-02 14:11:50 -07:00 |
|
kumavis
|
167ad729fd
|
Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes
|
2017-10-02 13:45:47 -07:00 |
|
frankiebee
|
e08a727d44
|
Merge branch 'master' into history-notes
|
2017-10-02 13:44:15 -07:00 |
|
kumavis
|
df59ef9942
|
tx state history - append note to first op of diff
|
2017-10-02 13:44:11 -07:00 |
|