Commit Graph

6402 Commits

Author SHA1 Message Date
Dan Finlay e4eb69dcc2
Merge pull request #3982 from MetaMask/i3981-contract-rates
Fetch token prices based on contract address
2018-04-16 16:49:53 -07:00
Dan Finlay 0668976514
Merge branch 'master' into i3981-contract-rates 2018-04-16 16:32:56 -07:00
bitpshr 6e1fcefdf1 Update CHANGELOG with information about rate fetching 2018-04-16 19:24:31 -04:00
Dan Finlay 6a7fd3c774
Merge pull request #3967 from MetaMask/AddTeamDocs
Add team member documentation
2018-04-16 15:19:23 -07:00
Dan Finlay 26d2f5cd0e
Merge pull request #3970 from MetaMask/i3651-removeGlobalLog
Remove reliance on window.log
2018-04-16 15:16:45 -07:00
bitpshr b4912f29cd Disable token price polling when no client is active 2018-04-16 18:12:05 -04:00
Dan Finlay b3bf7cd970
Fix spelling typo 2018-04-16 15:08:43 -07:00
Dan Finlay 641e7eb38b
Merge pull request #3978 from espoem/cs-lang
Czech translation
2018-04-16 14:07:53 -07:00
Dan Finlay 458fc3ff96
Merge pull request #3985 from whymarrh/unused-jshint
Remove unused JSHint file
2018-04-16 12:01:02 -07:00
Whymarrh Whitby b542426c62 Remove unused JSHint file, ESLint is the standard 2018-04-16 13:43:29 -02:30
kumavis 603d6ab416
Merge pull request #3976 from MetaMask/i3973-FixLocaleSettings
Fix action for setting locale
2018-04-16 09:01:26 -07:00
bitpshr d0447f9058 Maintain token prices using a background service 2018-04-16 11:47:06 -04:00
bitpshr a350e80fee Fetch token prices based on contract address 2018-04-15 23:46:40 -04:00
Martin Šmíd edc6797e75 Fix vault translation 2018-04-14 09:20:00 +02:00
Martin Šmíd 1d7e6d5298 Add czech translation 2018-04-14 09:20:00 +02:00
Dan Finlay 34692acdf9 Fix action for setting locale 2018-04-13 16:14:23 -07:00
bitpshr 7129d7c0f3 Require loglevel singleton in each module that uses it 2018-04-13 17:56:28 -04:00
Dan Finlay 3afe76bcba
Merge pull request #3975 from MetaMask/i3947-composableStore
Add ComposableObservableStore for subscription management
2018-04-13 11:57:19 -07:00
bitpshr 8974f933fc Add tests for ComposableObservableStore 2018-04-13 14:32:58 -04:00
bitpshr 4780f825b1 Add ComposableObservableStore for subscription management 2018-04-13 10:20:44 -04:00
Dan Finlay 153a26752f Add Herman team documentation 2018-04-12 13:47:25 -07:00
Dan Finlay 174fb1691d Linted 2018-04-12 13:43:58 -07:00
Dan Finlay 044ac11225 Add Paul to team docs 2018-04-12 13:42:59 -07:00
Dan Finlay e841197141 Add team member documentation
To help exeternal contributors make sense of who is active on the
project, and who they should go to to ask certain questions.
2018-04-12 13:40:59 -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
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
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 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
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 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
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