Commit graph

1734 commits

Author SHA1 Message Date
Jeremy Kauffman
659473bbbb Merge pull request #191 from krrishnarraj/master
Add timeout for jayson client requests
2017-06-04 19:06:37 -04:00
Mayesters
77aa8c61b0 Fix commenting out of setting 2017-06-03 13:34:32 +02:00
Mayesters
a539b58829 Include y18n without creating files + fix modal 2017-06-03 13:27:37 +02:00
Mayesters
4e86023bf1 Merge remote-tracking branch 'upstream/intnick-i18n' into i18n 2017-06-03 13:10:54 +02:00
Mayesters
f59731ff41 Added y18n as dependency 2017-06-03 13:08:45 +02:00
Mayesters
fb36cf12f1 Merge branch 'master' into i18n 2017-06-03 13:06:53 +02:00
Mayesters
e36fa6623b Merge remote-tracking branch 'upstream/master' 2017-06-03 13:06:41 +02:00
Krishnaraj Bhat
db64723c24 Add timeout for jayson client requests
request() didn't hit the callback sometimes
fixes #19
fixes #188
2017-06-03 13:34:58 +05:30
6ea86b96
1fd1b3c064 Render all file types that render-media can handle 2017-06-03 01:29:08 +07:00
Jack Robison
448088a134 update deprecated get_settings call 2017-06-02 12:57:23 -04:00
Jeremy Kauffman
f84c738018 changes to global declaration, eliminate translation files 2017-06-02 12:40:26 -04:00
Jeremy Kauffman
8ab629de01 Merge branch 'i18n' of https://github.com/intnick/lbry-app into intnick-i18n 2017-06-02 12:25:56 -04:00
Mayesters
81afbf8d70 Merge branch 'master' into i18n 2017-06-02 18:11:54 +02:00
Mayesters
f2e87bc8f6 Merge remote-tracking branch 'upstream/master' 2017-06-02 18:10:42 +02:00
Jeremy Kauffman
3a89b01998 Merge pull request #185 from 6ea86b96/play-more-file-types
Play more file types
2017-06-02 08:56:21 -04:00
6ea86b96
912933d4e7
Sync loading between file actions and video player 2017-06-02 14:40:40 +07:00
6ea86b96
8505959c22 Use render-media to render audio and images 2017-06-02 14:11:59 +07:00
6ea86b96
b1bbf7ee4e Scroll to top of page when changing path 2017-06-02 14:11:59 +07:00
6ea86b96
fa66f4e918 Fix download progress for recontructing files 2017-06-02 14:11:59 +07:00
Jeremy Kauffman
7d9621f850 add screenshot 2017-06-01 18:24:20 -04:00
Jeremy Kauffman
ced93942f5 fix typo 2017-06-01 18:21:07 -04:00
Jeremy Kauffman
8bdcaa75c8 update README 2017-06-01 18:20:29 -04:00
Alex Grintsvayg
c115e9c923 fix whitespace in access token 2017-06-01 16:40:18 -04:00
Alex Grintsvayg
5d09bcc550 rename deprecated call 2017-06-01 14:39:28 -04:00
Mayesters
c658211e2c merge translations fixed 2017-06-01 17:49:07 +02:00
Mayesters
0153a6dab5 Merge branch 'master' into i18n 2017-06-01 17:41:49 +02:00
Mayesters
bca5815c83 Merge remote-tracking branch 'upstream/master' 2017-06-01 17:24:28 +02:00
Mayesters
4097a13c08 Merge remote-tracking branch 'origin/i18n' into i18n 2017-06-01 17:24:10 +02:00
Jeremy Kauffman
2958500875 Bump version: 0.11.9rc1 → 0.11.9 2017-06-01 11:03:39 -04:00
Intnick
02ed8145ca Merge branch 'i18n' of github.com:intnick/lbry-app into i18n 2017-06-01 17:02:16 +02:00
Intnick
addf29f3bc global i18n object defined in app.js; smaller translation improvements 2017-06-01 17:02:02 +02:00
Jeremy Kauffman
b0c87e064a Bump version: 0.11.8 → 0.11.9rc1 2017-06-01 10:24:44 -04:00
Jeremy Kauffman
cba11210c4 update changelog 2017-06-01 10:24:29 -04:00
Jeremy Kauffman
7d3ff96dd7 Merge pull request #176 from lbryio/fix-upgrades-may
Upgrades fixes
2017-06-01 08:21:00 -04:00
Alex Liebowitz
df9391da76 On Windows, open installer using shell (allows elevation)
When you're just running a bare process, Windows can't show the "this
app wants elevated permissions" box and child_process.spawn throws an
error.
2017-06-01 05:51:37 -04:00
Alex Liebowitz
e9dc3324cb Fix upgrade filenames on Mac and Windows 2017-06-01 05:03:37 -04:00
Alex Liebowitz
c7bab43b7b Open full path instead of directory during upgrade
This was how it was before the Redux refactor
2017-06-01 05:03:37 -04:00
Jeremy Kauffman
fcfce1bf64 Bump version: 0.11.8rc1 → 0.11.8 2017-05-31 18:21:09 -04:00
Jeremy Kauffman
60d50fc63b Bump version: 0.11.7 → 0.11.8rc1 2017-05-31 18:20:54 -04:00
Jeremy Kauffman
0a188e61db update changelog 2017-05-31 18:20:34 -04:00
Jeremy Kauffman
9f1e5489a1 fix multiple install ids 2017-05-31 18:19:48 -04:00
Jeremy Kauffman
149d1ef61f fix version check on help 2017-05-31 12:22:50 -04:00
Mayesters
eb1227fa21 add i18n to README 2017-05-31 12:59:58 +02:00
Mayesters
313cea5580 fix master merge translations 2017-05-31 12:55:32 +02:00
Mayesters
31190ea5b0 Merge branch 'master' into i18n 2017-05-31 12:48:49 +02:00
Mayesters
2136299cd3 Merge remote-tracking branch 'upstream/master' 2017-05-31 12:41:49 +02:00
Mayesters
51adcc1d1e Merge remote-tracking branch 'origin/i18n' into i18n 2017-05-31 12:41:09 +02:00
Maximilian Böther
da46487372 remove windows dev files 2017-05-31 12:40:31 +02:00
Maximilian Böther
2d5da067de delete windows dev files 2017-05-31 12:40:13 +02:00
Mayesters
fe7b5eb4e0 removed unnecessary y 2017-05-31 12:34:39 +02:00