m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-20 08:23:21 +01:00
Code
7,207 Commits 2 Branches 0 Tags 265 MiB
94d1d846fb
Commit Graph

7207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Tseung
f96c13d616 Refactor page-container component structure 2018-04-10 15:28:52 -07:00
frankiebee
5494aa4f9c transactions - lint fixes 2018-04-10 14:54:30 -07:00
frankiebee
2d7c3c2b00 meta - transactions - create a transactions dir in controller and move relevant files into it 2018-04-10 14:28:05 -07:00
nyatla
c9a4077207 Reduced button padding. 
Title overflowed in Japanese.
 2018-04-10 18:51:44 +09:00
Dan
f4d8da9277 Merge branch 'master' into i3725-refactor-send-component 2018-04-10 07:19:01 -02:30
nyatla
5166e1a9fd Expanded dropdown menu width of title. 
Title overflowed in Japanese.
 2018-04-10 18:47:59 +09:00
nyatla
2ccd9ca29d Changed mouse cursor to "pointer" on the cancel text at the top left of the page. 2018-04-10 18:46:09 +09:00
kumavis
f15b81089e
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-10 02:13:05 -07:00
kumavis
29dab1e9e0
Merge pull request #3938 from nyatla/master 
Japanese langurge Transration
 2018-04-10 02:08:51 -07:00
kumavis
224e6e1696
Merge pull request #3894 from danjm/i3696-disablefirsttimeimportloading 
Disable the first time flow import button while isLoading is true.
 2018-04-10 02:05:51 -07:00
nyatla
311d3530e3 ローカライズファイル以外を元に戻した 2018-04-10 17:23:56 +09:00
nyatla
cc246528b5 Merge tag 'v4.5.5' 
# Conflicts:
#	app/_locales/ja/messages.json
#	package-lock.json

messages.jsonのローカライズ
 2018-04-10 17:14:28 +09:00
R.IIzuka
bc0487006c Update messages.json 
Fixed Japanese phrases.
Add some translations.
 2018-04-10 10:46:12 +09:00
Dan
285265ce8a Add basic currency localization test. 2018-04-09 21:31:27 -02:30
Dan
4e6c0574dd Fix integration tests so that they check for localize currency. 2018-04-09 19:22:07 -02:30
kumavis
50dfa2b7d3
Merge pull request #3852 from MetaMask/i3621-LogoPerformance 
Improve fox logo performance
 2018-04-09 14:20:01 -07:00
kumavis
df1f891585
Merge branch 'master' into i3621-LogoPerformance 2018-04-09 13:56:59 -07:00
kumavis
4a2db1d9e1 ci - complete all tests before running extras 2018-04-09 13:55:19 -07:00
Mert Ozdag
305f5f0034 Translate to Turkish (#3876) 2018-04-09 13:42:40 -07:00
kumavis
e201ebaf58
Merge pull request #3895 from MetaMask/greenkeeper/gulp-sass-4.0.0 
Update gulp-sass to the latest version 🚀
 2018-04-09 13:40:35 -07:00
kumavis
2a3e634ab9 package.json - update engines field to require node v8.x.x 2018-04-09 13:40:15 -07:00
kumavis
5d7f300af7
Merge pull request #3925 from MetaMask/greenkeeper/ethjs-0.3.4 
Update ethjs to the latest version 🚀
 2018-04-09 13:14:50 -07:00
Dan
d8adc527f1 Lint fix. 2018-04-09 16:54:52 -02:30
Dan
2c4426e4de Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-09 16:52:26 -02:30
Dan
9dbb9d12ad Internationalize converted value in confirm screens 2018-04-09 16:45:23 -02:30
kumavis
4cae3d3b0d
Merge pull request #3921 from MetaMask/gh-3736-react-router 
Add react-router integration
 2018-04-09 10:55:46 -07:00
Dan
1382de2cda Internationalize converted value in currency-input.js 2018-04-09 14:14:09 -02:30
Dan
4011dac6f6 Improve display of crypto currencies when selected as the 'Current Conversion' 2018-04-09 13:41:40 -02:30
Dan
077fc5eab6 Disable the first time flow import button while isLoading is true. 2018-04-09 11:20:03 -02:30
greenkeeper[bot]
743fb13472 fix(package): update ethjs to version 0.3.4 2018-04-06 23:04:44 +00:00
Dan
284dd85a99 first commit 2018-04-06 19:59:51 -02:30
kumavis
2511a9e634
Merge pull request #3922 from MetaMask/empty-vault-fix 
Empty vault - attempt recovery
 2018-04-06 13:18:48 -07:00
kumavis
f9a6feb263 metamask - never persist if state is missing 2018-04-06 12:10:39 -07:00
kumavis
6f4dbd6d4a metamask - never persist if state is missing data 2018-04-06 12:09:26 -07:00
kumavis
0685381fdc metamask - attempt recovery from empty vault 2018-04-06 12:05:24 -07:00
Alexander Tseung
1e6f062bb6 Fix integration tests 2018-04-06 11:25:05 -07:00
Frankie
2b787f2833
Merge pull request #3917 from MetaMask/kumavis-patch-3 
tx-state-manager - dont remove old tx history if candidate is not found
 2018-04-06 10:34:37 -07:00
Frankie
23cc989d80
Merge pull request #3916 from MetaMask/4.5.5 
Version 4.5.5
 2018-04-06 10:32:00 -07:00
kumavis
26fe638377
tx-state-manager - dont remove old tx history if candidate is not found 2018-04-06 10:18:00 -07:00
kumavis
b91bd818c7 4.5.5 2018-04-06 09:58:51 -07:00
kumavis
2953429fed changelog - add changes for v4.5.5 2018-04-06 09:58:09 -07:00
kumavis
000aa55dd3 v4.5.4 2018-04-06 09:02:56 -07:00
kumavis
89415e40d5 changelog - add missing entries 2018-04-06 09:02:48 -07:00
kumavis
054dce8d66
Merge pull request #3901 from MetaMask/MM-QA-Guide 
Commit Metamask QA Guide
 2018-04-06 08:49:59 -07:00
kumavis
90bcf9f7d2
Merge pull request #3907 from MetaMask/fix-all-migrations 
migrations - back fixes
 2018-04-06 08:32:21 -07:00
Alexander Tseung
4c15c0d3ba Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-05 23:17:22 -07:00
frankiebee
d4e30040a2 migrations - back fixes 2018-04-05 19:33:10 -07:00
Thomas Huang
77486a2365
Merge pull request #3906 from MetaMask/migration-25 
Migration 25
 2018-04-05 18:53:34 -07:00
frankiebee
7d243aacf9 create migration 25 2018-04-05 18:05:03 -07:00
frankiebee
1ba74c1566 test - run live migrations over first time state 2018-04-05 17:49:50 -07:00