Alexander Tseung
51ad2b03c8
Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254
2018-03-30 16:34:57 -07:00
Alexander Tseung
ba23843f91
Fix merge conflicts
2018-03-30 16:18:48 -07:00
frankiebee
3def45004a
transactions#newUnapprovedTransaction - dont default origin to metamask
2018-03-30 16:00:11 -07:00
frankiebee
03b123a85d
transactions - put the origing on the txMeta to help with debugging
2018-03-30 15:48:39 -07:00
kumavis
b49ad750dd
Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts
2018-03-29 16:54:00 -07:00
Nico
011bdd2d6e
i18n - Update German Locale
2018-03-29 11:18:49 -07:00
Alexander Tseung
ef61ef2ce8
Fix i18n merge conflicts
2018-03-29 09:37:29 -07:00
FBrinkkemper
1b2674119e
changed zaad -> back-up woorden
...
Zaad sounds strange in Dutch. Back-up woorden (back-up words) are a better translation in Dutch. Back-up is also a Dutch phrase, like it is in English.
2018-03-29 12:30:59 +02:00
kumavis
253abd60fc
build - extension - move js files to toplevel
2018-03-28 21:29:57 -07:00
Frankie
650b716f55
Merge pull request #3782 from MetaMask/i3670-FixNonceBug
...
Add test for suspected nonce bug
2018-03-28 14:38:40 -07:00
Dan Finlay
f50a7a8fe8
Rename variable to be more understandable
2018-03-28 14:18:03 -07:00
kumavis
bedc1d1a47
Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts
2018-03-28 14:12:20 -07:00
kumavis
5815de33fb
build - rename 'popup.js' to 'ui.js'
2018-03-28 14:04:33 -07:00
kumavis
5834c13769
ui - change window title 'MetaMask Plugin' to 'MetaMask'
2018-03-28 13:37:02 -07:00
Frankie
8766420f19
Merge pull request #3777 from MetaMask/etc-fixes
...
Sentry spam fix and etc fixes
2018-03-28 12:57:01 -07:00
Frankie
06112b3e30
Merge pull request #3765 from MetaMask/sentry-error-simplify
...
sentry - simplify error message 'Transaction Failed: known transaction'
2018-03-28 12:55:52 -07:00
kumavis
c4c459c8d7
controllers - currency - warn currency and encountered error
2018-03-28 09:41:25 -07:00
kumavis
21fbaed97c
tx controller - explode on non-hex txParams + dont add chainId to txParams + sign with chainId as number
2018-03-27 23:55:18 -07:00
kumavis
97e1fcd331
sentry - simplify error message 'Transaction Failed: known transaction'
2018-03-27 20:41:10 -07:00
Frankie
76e83365ca
Merge pull request #3752 from MetaMask/sentry-error-fix
...
sentry - simplify all ethjs errors for better batching
2018-03-27 19:13:42 -07:00
kumavis
f7a2dc984e
Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset
...
Fix bug where resetAccount does not clear network cache
2018-03-27 19:10:31 -07:00
kumavis
d8357413ac
metamask-controller - fix typo
2018-03-27 19:04:28 -07:00
kumavis
b4ec68b2d4
i18n - fix locales inde
2018-03-27 18:29:54 -07:00
Dan Finlay
729a473210
Fix bug where resetAccount does not clear network cache
...
Fixes #3439
2018-03-27 18:07:51 -07:00
kumavis
165ae7d193
i18n - derrive locale codes from index
2018-03-27 18:07:24 -07:00
kumavis
9482af6157
i18n - add locales index json
2018-03-27 17:52:26 -07:00
kumavis
5290570c8f
Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux
2018-03-27 17:17:04 -07:00
frankiebee
fefbf40a06
Merge branch 'master' into i#3731
2018-03-27 16:50:57 -07:00
frankiebee
f0f45e6fe1
migration for removing unnecessary transactions from state
2018-03-27 16:49:13 -07:00
kumavis
914a098c8a
Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux
2018-03-27 14:28:37 -07:00
kumavis
651e48dbd6
sentry - simplify all ethjs errors for better batching
2018-03-27 12:37:30 -07:00
kumavis
0fe0d8b7a5
Merge pull request #3739 from gasolin/zhtwfix
...
[zh-TW] fix translation and add missing strings
2018-03-27 09:21:40 -07:00
Dan
f74e802026
Undo unnecessary line removals.
2018-03-27 10:52:19 -02:30
Dan
be2254b880
Remove comments and console.logs
2018-03-27 10:37:45 -02:30
R.IIzuka
bfa62f719f
Update messages.json
...
Fixed Japanese phrases.
Add some translations.
2018-03-27 22:05:37 +09:00
Dan
d2bd5687e8
Merge branch 'master' into i18n-translator-redux
2018-03-27 10:17:48 -02:30
Alexander Tseung
6f367a5a6b
Fix merge conflicts
2018-03-27 00:20:35 -07:00
gasolin
81e2ab20d9
[zh-TW] fix translation and add missing strings
2018-03-27 10:27:19 +08:00
frankiebee
0a2616a37f
include migration 22
2018-03-26 18:12:16 -07:00
kumavis
e0576d0526
v4.4.0
2018-03-26 17:05:52 -07:00
frankiebee
43dde3cbde
transactions - only save up to 40 txs totall across all networks
2018-03-26 15:58:36 -07:00
Dan Finlay
e196b6dcb7
Fix bug where full localStorage would crash on start
2018-03-26 15:25:26 -07:00
Thomas Huang
b0fae2ca39
Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate
...
Updates Add token screen to latest design.
2018-03-26 14:55:30 -07:00
Frankie
5a61a6d57a
migration for adding submittedTime to the txMeta ( #3727 )
...
* test for migration 022
* write migration 022 adding submittedTime to txMetas whove been submitted
2018-03-26 14:24:12 -07:00
Dan
1779cff65b
Merge branch 'master' into i3326-addtokenscreendesignupdate
2018-03-26 16:51:02 -02:30
Filip Š
b2f454a03c
i18n - sl Slovenian translation ( #3724 )
2018-03-26 11:57:04 -07:00
gasolin
d1927d1407
i18n - zh_tw traditional chinese (taiwanese)
...
* translate to Traditional Chinese, fix #3529
2018-03-26 11:53:36 -07:00
kumavis
1941260f66
Merge pull request #3711 from artiya4u/feature/thai_locale
...
Add Translate to Thai #3543
2018-03-26 11:50:21 -07:00
Dan
4f0881e41b
Merge branch 'master' into i18n-translator-redux
2018-03-26 16:13:49 -02:30
artiya4u
47ee86e9fd
Update Thai translate.
2018-03-24 11:59:23 +07:00
