Commit graph

1613 commits

Author SHA1 Message Date
Mayesters
a8a42cee2e wunderbar translated 2017-05-28 21:35:21 +02:00
Mayesters
1a3c20a637 Translated updated components 2017-05-28 18:56:01 +02:00
Mayesters
804c9a646b Merge branch 'master' into i18n 2017-05-28 18:46:31 +02:00
Mayesters
7ef9806542 Merge remote-tracking branch 'upstream/master' 2017-05-28 18:43:35 +02:00
Mayesters
449ef335a5 Merge remote-tracking branch 'origin/i18n' into i18n 2017-05-28 18:42:36 +02:00
Intnick
f72f5a0661 Merge branch 'i18n' of github.com:intnick/lbry-app into i18n 2017-05-28 18:39:18 +02:00
Intnick
02b13fc252 i18n ready for testing 2017-05-28 18:36:35 +02:00
Jeremy Kauffman
eefc3a5826 Bump version: 0.11.4 → 0.11.5rc1 2017-05-28 12:31:09 -04:00
Jeremy Kauffman
ae583e98bb update changelog 2017-05-28 12:30:53 -04:00
Intnick
13989632a7 language switch implementation. Needs more testing 2017-05-28 17:52:23 +02:00
Mayesters
469e769e01 lots of stuff translated 2017-05-28 17:52:23 +02:00
Intnick
1d09f08392 header and tranactionList component translated 2017-05-28 17:46:08 +02:00
Intnick
972ac78595 fileListSearch and fileTitle component translated 2017-05-28 17:46:08 +02:00
Intnick
7d6368aeca fileList component translated 2017-05-28 17:46:08 +02:00
Intnick
ff02e0452b filaActions and fileCard components translated 2017-05-28 17:45:40 +02:00
Intnick
0cf1da36ea page settings, show, wallet, report translated 2017-05-28 17:45:03 +02:00
Intnick
3ba79fff32 search page translated 2017-05-28 17:44:10 +02:00
Intnick
c7d7a532ac help page trans 2017-05-28 17:42:59 +02:00
Intnick
d30d4353e8 moved the import of y18n component before some other imports; translations for auth developer 2017-05-28 17:33:25 +02:00
Jeremy Kauffman
6bccb67585 Merge pull request #153 from 6ea86b96/double-fetch-cost
Don't try to fetch cost info if it's already fetching
2017-05-28 11:28:14 -04:00
Jeremy Kauffman
fd093f0a95 Merge pull request #152 from 6ea86b96/file-actions-cost-info
Stop blowing up if user attempts to download before cost info fetched
2017-05-28 11:27:35 -04:00
Intnick
1e311905b8 finalization of i18n setup to i18n branch 2017-05-28 17:25:21 +02:00
Intnick
e8bfd592a6 initial merge 2017-05-28 17:25:21 +02:00
Intnick
59aa56b7ef initial merge 2017-05-28 17:25:21 +02:00
Intnick
d5a4032b9f initial merge 2017-05-28 17:25:21 +02:00
Jeremy Kauffman
08ba2f49f6 Merge pull request #150 from 6ea86b96/reconstructing-message
Add a message for when we're reconstructing a moved/deleted file before playback
2017-05-28 11:24:28 -04:00
Jeremy Kauffman
a8667d18de Merge pull request #148 from 6ea86b96/remove-batching
Turns out that batchActions doesn't play nicely with thunk
2017-05-28 11:24:09 -04:00
6ea86b96
b2b99b31b9
Don't try to fetch cost info if it's already fetching 2017-05-28 19:16:07 +04:00
6ea86b96
37344b3517
Stop blowing up if user attempts to download before cost info fetched 2017-05-28 18:24:10 +04:00
Intnick
b68f24f5fd Merge remote-tracking branch 'upstream/master' 2017-05-28 16:10:47 +02:00
6ea86b96
862d711391
Add a message for when we're reconstructing a moved/deleted file before playback 2017-05-28 17:38:36 +04:00
6ea86b96
3d700f470c
Turns out that batchActions doesn't play nicely with thunk 2017-05-28 15:35:11 +04:00
Jeremy Kauffman
89c4402d67 Merge pull request #145 from 6ea86b96/bug/no-cost-info-required
Fix playing videos that were deleted and require no cost info
2017-05-26 16:42:19 -04:00
Mayesters
b41b35de13 Merge branch 'master' into i18n 2017-05-26 22:29:31 +02:00
Mayesters
b124fe8b0f Merge remote-tracking branch 'upstream/master' 2017-05-26 22:28:22 +02:00
Mayesters
01cb3f583e lots of stuff translated 2017-05-26 22:26:06 +02:00
6ea86b96
2bb5f9acc6 Fix playing videos that were deleted and require no cost info 2017-05-26 22:50:43 +04:00
Jeremy Kauffman
d878d3b693 Bump version: 0.11.4rc1 → 0.11.4 2017-05-26 14:26:53 -04:00
Jeremy Kauffman
8ba2e96b24 Bump version: 0.11.3 → 0.11.4rc1 2017-05-26 14:22:15 -04:00
Jeremy Kauffman
2c42097eeb add changelog 2017-05-26 14:21:55 -04:00
Jeremy Kauffman
66bbf30482 fix claim id parameter 2017-05-26 14:19:45 -04:00
Jeremy Kauffman
dff389d8cf Merge pull request #144 from 6ea86b96/bug/cost-info-lookup
Lookup cost info on file page if it hasn't already been looked up
2017-05-26 14:19:16 -04:00
6ea86b96
82bdf6324d
Lookup cost info on file page if it hasn't already been looked up 2017-05-26 22:17:01 +04:00
Jeremy Kauffman
526881c261 move up time of rewad claim for downloads 2017-05-26 11:58:56 -04:00
Jeremy Kauffman
ca4442f767 featured download reward 2017-05-26 11:56:32 -04:00
Mayesters
dbb118c8ee Fix small error in merge master -> i18n 2017-05-26 17:30:18 +02:00
Mayesters
636a302e70 Merge branch 'master' into i18n + Windows development batch files 2017-05-26 17:21:52 +02:00
Mayesters
0bf24f3110 Merge remote-tracking branch 'upstream/master' 2017-05-26 17:05:53 +02:00
Intnick
c5df087504 header and tranactionList component translated 2017-05-26 16:19:49 +02:00
Intnick
9ba4da4032 fileListSearch and fileTitle component translated 2017-05-26 16:13:16 +02:00