Chi Kei Chan
|
373f8b72d0
|
Merge branch 'master' into NewUI-flat
|
2017-12-06 21:13:29 -08:00 |
Dan
|
ec6c3c33bd
|
Merge branch 'master' into NewUI-flat-merge-with-master
|
2017-12-06 21:11:52 -08:00 |
Frankie
|
a78cc013d1
|
Merge pull request #2670 from danjm/MM-2669-tx-retry-exponential-backoff
Exponentional backoff on transaction retry in pending-tx-tracker
|
2017-12-06 15:57:19 -05:00 |
|
Dan
|
3356c15d04
|
Add tests for exponential backoff code in _resubmitTx
|
2017-12-06 14:11:14 -03:30 |
|
Dan
|
af8fcb6777
|
Update resubmitPendingTxs tests.
|
2017-12-06 14:10:11 -03:30 |
|
Dan
|
f58aae3f2b
|
firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in _resubmitTx
|
2017-12-06 13:21:09 -03:30 |
|
Dan
|
ea23da9e75
|
Correct note for updateTx after block-update event in transaction.js
|
2017-12-06 13:07:31 -03:30 |
|
Dan
|
871d9fd9fb
|
Fix undefined latestBlockNumber in _resubmitTx
|
2017-12-06 13:02:38 -03:30 |
|
Dan
|
ae2a4d78e8
|
Exponentional backoff on transaction retry in pending-tx-tracker
|
2017-12-05 17:21:14 -03:30 |
Thomas Huang
|
c30b543a80
|
Merge pull request #2630 from MetaMask/i2624-VersionedNotices
Versioned notices
|
2017-11-29 17:25:10 -06:00 |
Dan Finlay
|
91817573c9
|
Bump changelog
|
2017-11-29 13:54:53 -08:00 |
|
Dan Finlay
|
10459ebaf4
|
Remove debugger
|
2017-11-29 13:35:48 -08:00 |
|
Dan Finlay
|
adc66974ff
|
Add markdown class to mascara ui markdown field
|
2017-11-29 13:34:19 -08:00 |
|
Dan Finlay
|
9ca6f93eca
|
Bump version to 3.12.1
|
2017-11-29 12:50:12 -08:00 |
|
Dan Finlay
|
f725bc6ab7
|
Fix test reference
|
2017-11-29 12:41:55 -08:00 |
|
Dan Finlay
|
42108ba3bc
|
Make notice skipping async
|
2017-11-29 12:39:48 -08:00 |
kumavis
|
23a5ea9321
|
Merge pull request #2627 from MetaMask/reload-fix
Fix dapp reload via obs-store@3
|
2017-11-29 10:31:52 -10:00 |
|
Dan Finlay
|
9276fea6bc
|
Redundantly skip notices
|
2017-11-29 12:30:10 -08:00 |
|
Dan Finlay
|
119c0fdecf
|
Make test more resilient
|
2017-11-29 12:23:31 -08:00 |
|
Dan Finlay
|
6d63720f87
|
Remove duplicate button declaration
|
2017-11-29 12:11:09 -08:00 |
|
Dan Finlay
|
4e6946f47c
|
Fix test selector
|
2017-11-29 11:52:26 -08:00 |
|
Dan Finlay
|
8192c0b58c
|
Fix migration comment
|
2017-11-29 11:51:27 -08:00 |
|
Dan Finlay
|
e35cd77eee
|
Accept all notices in integration tests
|
2017-11-29 11:49:53 -08:00 |
kumavis
|
327651e7fb
|
Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix
|
2017-11-29 08:27:47 -10:00 |
|
Dan Finlay
|
45c5a26405
|
Fix test to skip screens before privacy notice
|
2017-11-28 17:25:09 -08:00 |
|
Dan Finlay
|
ab35a76a24
|
Migrate old data to include firstVersion info
|
2017-11-28 16:56:45 -08:00 |
|
Dan Finlay
|
80dedcc01c
|
Bump changelog
|
2017-11-28 15:37:29 -08:00 |
|
Dan Finlay
|
bd82b17310
|
Linted
|
2017-11-28 15:35:20 -08:00 |
|
Dan Finlay
|
049ec52a95
|
Add seed phrase bounty award notice
Only shows to people who installed before or equal to MetaMask 3.12.1
|
2017-11-28 15:31:49 -08:00 |
|
Dan Finlay
|
f0f6bb28e0
|
Get notice version filtering working nicely
|
2017-11-28 15:16:04 -08:00 |
|
kumavis
|
f64bc3c01a
|
deps - obs-store@3 + migrate stream plumbing
|
2017-11-28 11:09:18 -10:00 |
|
Thomas Huang
|
2b1f2557c7
|
Merge pull request #2615 from jpclark/NewUI-flat
Provide blockie identicon option
|
2017-11-28 13:58:06 -06:00 |
|
Thomas Huang
|
f131468353
|
Remove useBlockie in props for render
Removed unused useBlock for Lint validation.
|
2017-11-28 13:37:45 -06:00 |
|
Dan Finlay
|
ec4b7de962
|
Add firstVersion field to notices selector
|
2017-11-28 11:22:09 -08:00 |
|
Dan Finlay
|
e89f82399f
|
Add optional version field to notices
Allows notices to only show to users who are on a certain version.
|
2017-11-28 11:14:57 -08:00 |
Dan Finlay
|
9a3ca5d502
|
Merge pull request #2618 from MetaMask/NewUI-flat-update-deps
New ui flat update deps
|
2017-11-28 10:25:44 -08:00 |
|
Dan Finlay
|
4d6bae774a
|
Merge pull request #2620 from MetaMask/update-deps
Update greenkeeper deps for master
|
2017-11-28 10:24:54 -08:00 |
|
Dan Finlay
|
725277dbdb
|
Merge pull request #2441 from MetaMask/kumavis-patch-3
NetworkController - add warning when aborting lookupNetwork
|
2017-11-27 16:21:25 -08:00 |
|
kumavis
|
634102df63
|
network controller - warn via log.warn
|
2017-11-27 13:59:32 -10:00 |
Thomas Huang
|
698e9ba441
|
Update greenkeeper deps for master
|
2017-11-27 13:49:49 -06:00 |
|
Thomas Huang
|
e71115735c
|
Merge pull request #2605 from MetaMask/i2577-SeedPhraseBug
Fix a possible seed phrase bug
|
2017-11-27 13:37:42 -06:00 |
|
Thomas Huang
|
9b25f89728
|
Update babelify to 8.0.0
|
2017-11-27 12:35:19 -06:00 |
|
Thomas Huang
|
94fe294caf
|
Merge pull request #2607 from MetaMask/i2504-OperaFix
Ensure Opera build excludes chromereload file
|
2017-11-27 11:38:58 -06:00 |
Jason Clark
|
a34362b776
|
Fixes changes requested in pullrequestreview-79088534
|
2017-11-27 08:11:48 -07:00 |
|
Thomas Huang
|
109050817a
|
Update react, react-dom, and react-test-renderer to 15.6.2
|
2017-11-27 08:46:47 -06:00 |
|
Thomas Huang
|
1ee91a51cc
|
Update ethjs-query to v0.3.1
|
2017-11-26 10:46:28 -06:00 |
|
Thomas Huang
|
178b657c75
|
Update Qunit to QunitJS v2.4.1
|
2017-11-26 10:03:17 -06:00 |
|
Thomas Huang
|
cefe6cded6
|
Update to Enzyme 3.2.0
|
2017-11-25 18:37:12 -06:00 |
|
Jason Clark
|
abefcc9612
|
more eslint fixes
|
2017-11-25 15:57:54 -07:00 |
|
Jason Clark
|
6f5c32b7ce
|
adding blockies lib to eslint ignore so it doesn't blow up the style checker and fail the build
|
2017-11-25 15:52:46 -07:00 |