Dan
|
798988597b
|
Merge branch 'master' into retry-tx-refractor
|
2018-03-14 00:02:27 -02:30 |
|
Dan
|
cc267d6c81
|
Fix more lint errors.
|
2018-03-13 23:56:45 -02:30 |
|
Dan
|
c37684d7bd
|
Remove unnecessary addition of nonce to state.
|
2018-03-13 23:49:10 -02:30 |
|
Dan
|
e94a14ef8a
|
Make token confirmations compatible.
|
2018-03-13 23:44:05 -02:30 |
|
Dan
|
0d33aed20e
|
Fix tx-list-item submitted check.
|
2018-03-13 23:29:47 -02:30 |
|
Dan
|
bf3c5add08
|
Adds styles for dropped txs in old-ui.
|
2018-03-13 22:17:08 -02:30 |
|
Dan
|
80a2e59194
|
Correctly set latest submitted retry with nonces that matches others in old-ui transaction-list-item.
|
2018-03-13 22:08:27 -02:30 |
|
Dan
|
c52253bb0e
|
Use correct name for submittedTime field in tx-list.js
|
2018-03-13 21:57:23 -02:30 |
|
Dan
|
46ded45b81
|
Use correct var name in new-ui showRetryButton
|
2018-03-13 21:38:08 -02:30 |
|
Dan
|
8c7988978f
|
Undefined check in showRetryButton
|
2018-03-13 21:32:22 -02:30 |
|
Dan
|
e293b6349c
|
Styling for dropped.
|
2018-03-13 21:15:35 -02:30 |
|
Dan
|
d6e4d2e80d
|
Use new submittedTime field to correctly show retry button in old and new ui.
|
2018-03-13 21:15:35 -02:30 |
|
kumavis
|
5fbfb0b67c
|
Merge pull request #3083 from MetaMask/i3076-UseStorageLocalInstead
Use storage.local instead of localStorage
|
2018-03-13 15:47:52 -07:00 |
|
kumavis
|
dc5fbf5eb2
|
Merge branch 'master' into i3076-UseStorageLocalInstead
|
2018-03-13 15:43:37 -07:00 |
|
kumavis
|
b7a24840f2
|
Merge pull request #3551 from MetaMask/i#3509
fix for where null is not supported in txParams
|
2018-03-13 15:42:50 -07:00 |
|
kumavis
|
22cd788203
|
tx-gas-utils - fix code style
|
2018-03-13 15:39:33 -07:00 |
|
Thomas Huang
|
b183d879d6
|
Merge pull request #3552 from MetaMask/danfinlay-patch-1
Fix grammar
|
2018-03-13 15:33:08 -07:00 |
|
frankiebee
|
bee3e57b28
|
Merge branch 'i#3509' of https://github.com/MetaMask/metamask-extension into i#3509
|
2018-03-13 15:32:32 -07:00 |
|
frankiebee
|
e5a83d3f1a
|
transactions move validation of the to field to validateRecipient
|
2018-03-13 15:32:03 -07:00 |
|
kumavis
|
16deea3927
|
changelog - update "txParams.to" validation note
|
2018-03-13 15:29:33 -07:00 |
|
frankiebee
|
a2c14ad02b
|
Merge remote-tracking branch 'origin/i#3509' into i#3509
|
2018-03-13 15:27:26 -07:00 |
|
frankiebee
|
c465d510b1
|
fix error message
|
2018-03-13 15:26:45 -07:00 |
|
Dan Finlay
|
26231a42b6
|
Fix grammar
|
2018-03-13 15:24:35 -07:00 |
|
kumavis
|
28a41c203f
|
Update CHANGELOG.md
|
2018-03-13 15:24:26 -07:00 |
|
Frankie
|
c83a9ceb04
|
Merge branch 'master' into i#3509
|
2018-03-13 15:23:46 -07:00 |
|
frankiebee
|
d7bf6e36b1
|
add to CHANGELOG.md
|
2018-03-13 15:17:13 -07:00 |
|
frankiebee
|
d195cfab50
|
transactions - insure if a to field in tx params has a truthy valu that it is a valid addres and if it is falsy that it is not null to fix issue #3509
|
2018-03-13 15:13:05 -07:00 |
|
Thomas Huang
|
578139be4a
|
Merge pull request #3546 from MetaMask/TheCriw-patch-1
improved verification of restore from seed phrase
|
2018-03-13 15:02:07 -07:00 |
|
kumavis
|
e48934dc04
|
Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead
|
2018-03-13 14:49:26 -07:00 |
|
frankiebee
|
9d7640996a
|
transactions - return the txMeta in retryTransaction
|
2018-03-13 14:42:26 -07:00 |
|
kumavis
|
a52ef7a06a
|
ui - lint fix
|
2018-03-13 14:41:54 -07:00 |
|
kumavis
|
34fe88af8f
|
Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characters
improved verification of restore from seed phrase
|
2018-03-13 14:39:59 -07:00 |
|
frankiebee
|
c6dff98ee1
|
tests - add tests for transactions#retryTransaction and transactions#_markNonceDuplicatesDropped
|
2018-03-13 14:30:59 -07:00 |
|
Dan Finlay
|
239d7106ab
|
Merge pull request #3538 from MetaMask/lazaridiscom-patch-1
cross platform - use 'cross-env' for env-variables within npm scripts
|
2018-03-13 11:41:13 -07:00 |
|
kumavis
|
9378ac5d62
|
deps - update package-lock
|
2018-03-13 11:35:53 -07:00 |
|
Lazaridis
|
af4116cf39
|
use 'cross-env' for env-variables within npm scripts, re #3426
|
2018-03-13 11:31:11 -07:00 |
|
kumavis
|
15722b4e6c
|
Merge pull request #3456 from MetaMask/i18n
Add i18n
|
2018-03-13 11:25:31 -07:00 |
|
Thomas
|
5a1b2093f8
|
Update Changelog
|
2018-03-13 11:20:15 -07:00 |
|
Thomas Huang
|
508d2c3eb7
|
Merge branch 'master' into i18n
|
2018-03-13 11:16:26 -07:00 |
|
Thomas
|
13c3166f38
|
Update Changelog
|
2018-03-13 11:15:40 -07:00 |
|
Thomas
|
9bb7fa365d
|
Remove windows.h from i18n.js
|
2018-03-13 11:15:10 -07:00 |
|
Thomas
|
b1871bf32d
|
Add closing parens to appName
|
2018-03-13 11:04:41 -07:00 |
|
Thomas Huang
|
1d2cb46eff
|
Merge branch 'master' into i18n
|
2018-03-13 11:00:52 -07:00 |
|
kumavis
|
3cbf66a6de
|
Merge pull request #3527 from danjm/changelog-updates-march13
Changlog updates for PRs 3468, 3470 and 3495.
|
2018-03-13 10:54:39 -07:00 |
|
kumavis
|
6a17a0cdf1
|
Merge pull request #3468 from danjm/i3033-responsive-newui-onboarding
Make new-ui create password screen responsive.
|
2018-03-13 10:53:21 -07:00 |
|
Dan
|
e99644afd5
|
Changlog updates for PRs 3468, 3470 and 3495.
|
2018-03-13 15:20:58 -02:30 |
|
kumavis
|
572234e383
|
Merge branch 'master' into i3033-responsive-newui-onboarding
|
2018-03-13 10:46:14 -07:00 |
|
kumavis
|
1fa5cec2ec
|
Merge pull request #3470 from danjm/newui-onboarding-fonts
Change fonts in new-ui onboarding to Roboto, with weight 400.
|
2018-03-13 10:44:08 -07:00 |
|
kumavis
|
c1387cdc54
|
Merge pull request #3495 from alextsg/cb-290
Increase tap areas for menu buttons on mobile
|
2018-03-13 10:42:59 -07:00 |
|
kumavis
|
50e21fa9d3
|
Merge pull request #3525 from anticlimactic/move-dev-files
Moved mock-dev.js and ui-dev.js to development folder.
|
2018-03-13 10:40:19 -07:00 |
|