Commit graph

2142 commits

Author SHA1 Message Date
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
Jeremy Kauffman
0350dd1610 Bump version: 0.11.3rc1 → 0.11.3 2017-05-26 10:03:56 -04:00
Jeremy Kauffman
05e78eba2d Revert "Bump version: 0.11.3rc1 → 0.11.3"
This reverts commit 94de80a539.
2017-05-26 10:01:28 -04:00
Intnick
73e7419bf2 fileList component translated 2017-05-26 15:55:59 +02:00
Jeremy Kauffman
434485b0aa update changelog 2017-05-26 09:50:02 -04:00
Jeremy Kauffman
94de80a539 Bump version: 0.11.3rc1 → 0.11.3 2017-05-26 09:45:08 -04:00
Jeremy Kauffman
ecc14e0b32 Merge pull request #141 from lbryio/fix-publish-claim-info-format
Fix Publish page to use new claim info format
2017-05-26 09:42:31 -04:00
Jeremy Kauffman
0e90b02516 Bump version: 0.11.2 → 0.11.3rc1 2017-05-26 09:33:07 -04:00
Alex Liebowitz
fc652e221a Fix Publish page to use new claim info format 2017-05-26 04:16:25 -04:00
Intnick
0119ed8edc filaActions and fileCard components translated 2017-05-26 09:02:37 +02:00
Intnick
a000058bf6 page settings, show, wallet, report translated 2017-05-26 08:40:35 +02:00
Jeremy Kauffman
c03f48384e Bump version: 0.11.2rc1 → 0.11.2 2017-05-25 22:57:32 -04:00
Intnick
6bd1dccbb8 search page translated 2017-05-26 02:38:55 +02:00
Intnick
85aa35122e help page trans 2017-05-26 02:27:05 +02:00
Intnick
8917d9e7e7 moved the import of y18n component before some other imports; translations for auth developer 2017-05-26 02:16:25 +02:00
Jeremy Kauffman
3bb08fd987 Bump version: 0.11.1rc1 → 0.11.2rc1 2017-05-25 16:12:22 -04:00
Jeremy Kauffman
58c18b2b7a Merge pull request #135 from 6ea86b96/bug/production-redux-logger
set ENV to production webpack.config.js
2017-05-25 16:09:20 -04:00
Jeremy Kauffman
260980ff38 fix app upgrades? 2017-05-25 16:07:32 -04:00
Jeremy Kauffman
24759b3ab9 Bump version: 0.11.0 → 0.11.1rc1 2017-05-25 15:12:40 -04:00
Jeremy Kauffman
aee0603dc9 fix version info on help 2017-05-25 14:29:28 -04:00
Jeremy Kauffman
a899d623d0 fix reward check on startup 2017-05-25 13:38:53 -04:00
Intnick
df2192116c finalization of i18n setup to i18n branch 2017-05-25 19:31:10 +02:00