LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Packages Projects Releases 238 Wiki Activity
737 commits 144 branches 725 tags 262 MiB
Commit graph

737 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Liebowitz a114f81543 Merge branch 'master' into development 2017-02-20 01:09:35 -05:00
Alex Grintsvayg fbb11d78c7 Revert "Revert "Use get_availability to determine stream availability"" 
This reverts commit 24e43ba42e.

Ok, that wasn't it.
 2017-02-18 09:59:13 -05:00
Alex Grintsvayg 24e43ba42e Revert "Use get_availability to determine stream availability" 
This reverts commit c209c1f84f.

This commit may have broken downloading/watching by never showing the download button.
Let's see if reverting it fixes the issue. --grin
 2017-02-18 09:53:05 -05:00
alexliebowitz d0a730f29f Merge pull request #170 from lbryio/use-get-availability 
Use get_availability to determine stream availability
 2017-02-17 17:56:54 -05:00
Alex Liebowitz c209c1f84f Use get_availability to determine stream availability 
More info than peer_count, and now has built-in timeout
 2017-02-17 17:54:45 -05:00
alexliebowitz d904744a31 Merge pull request #169 from lbryio/update-publish-poll 
Update how Publish page polls for file appearing in file manager
 2017-02-17 15:45:33 -05:00
Alex Liebowitz fd0439bf0b Update requirements.txt for My Files publish polling changes 2017-02-17 15:46:00 -05:00
Alex Liebowitz c9a171ae28 Update how Publish page polls for file appearing in file manager 
Formerly polled the full list of files; now looks up the specific file
by name.
 2017-02-17 15:45:52 -05:00
alexliebowitz 337cf5a426 Merge pull request #164 from lbryio/featured_names_api 
Use remote source for featured names
 2017-02-16 13:34:28 -05:00
Jeremy Kauffman 5099fe3ab2 use remote api to fetch featured names 2017-02-16 13:30:57 -05:00
alexliebowitz d628b9bda9 Merge pull request #168 from lbryio/fix-status-check-logic 
Correct status check logic on Watch page
 2017-02-16 01:29:36 -05:00
Alex Liebowitz 38fdcd1e1b Watch: correct status check logic 2017-02-16 01:01:38 -05:00
Alex Liebowitz ee44ce5001 Watch: correct status check logic 2017-02-16 00:19:10 -05:00
Alex Liebowitz f070baf914 Watch: correct status check to look for "stopped" instead of "paused" 2017-02-15 17:24:30 -05:00
alexliebowitz 49720be076 Merge pull request #166 from lbryio/fix-watch-page-status-check 
Fix status check on Watch page
 2017-02-15 17:19:35 -05:00
Alex Liebowitz 77830d1fb2 Change Watch page to recognize "stopped" status as playable 2017-02-15 17:19:47 -05:00
Alex Liebowitz 5292b069eb Change Watch page to recognize "paused" status as playable 2017-02-15 16:46:16 -05:00
Jeremy Kauffman 227e23653d Merge pull request #165 from lbryio/fix-clamp-js-firefox 
Fix line clamping on Firefox
 2017-02-10 12:13:07 -05:00
alexliebowitz 6748534cd1 Merge pull request #162 from lbryio/add-changelog 
Add changelog and check
 2017-02-09 19:44:06 -05:00
Alex Liebowitz bd922f0f45 Make TruncatedText elements display: inline-block 
Needed because clamp.js sets a height on browsers that don't have
native clamping.
 2017-02-09 19:14:08 -05:00
Alex Liebowitz c8754e4351 Round up line heights in TruncatedText (workaround for Clamp.js bug) 
Clamp.js doesn't handle fractional-pixel line heights reliably. It
always rounds down the line height when calculating the target height
for the element, and you end up with one less line than you asked for.
 2017-02-09 19:14:06 -05:00
Alex Liebowitz e6f473e275 Switch to maintained fork of clamp.js 2017-02-09 19:11:25 -05:00
jobevers 820060eb44 try installing rvm earlier to get around https://github.com/travis-ci/travis-ci/issues/5092 2017-02-08 00:31:21 -06:00
jobevers cea2fc6e73 build PRs and master/dev branches 2017-02-08 00:28:44 -06:00
jobevers e01bd6c1e3 combining languages on travis is too hard 2017-02-08 00:22:42 -06:00
jobevers 7ae5bf97bd why is travis a pain 2017-02-08 00:12:08 -06:00
jobevers 5a86b68893 had boolean logic backwards 2017-02-08 00:05:24 -06:00
jobevers 1c2eab4b40 install and use a more recent ruby 2017-02-08 00:02:58 -06:00
jobevers 96ace874ce see what rubies are available 2017-02-07 23:59:27 -06:00
jobevers 4a060f120a add changelog and check 2017-02-07 23:56:25 -06:00
alexliebowitz 6ee45e2935 Merge pull request #161 from lbryio/development 
Merge development into master
 2017-02-06 16:40:02 -05:00
Alex Grin ca5540da4b Merge pull request #159 from reillysmith/patch-3 
Update discover.js
 2017-02-03 12:20:53 -05:00
reillysmith b1c320264e Update discover.js 2017-02-03 09:11:36 -08:00
alexliebowitz 181d267bd2 Merge pull request #143 from lbryio/development 
Release
 2017-02-01 14:11:30 -05:00
Alex Liebowitz ac5a588490 Referral: Fix ARIA label on "lookup failed" modal 2017-02-01 04:27:36 -05:00
alexliebowitz 04fe213c6c Merge pull request #155 from lbryio/fix-space-claim-code-page 
Fix missing space in confirm modal on Claim Code page
 2017-02-01 04:17:51 -05:00
Alex Liebowitz fc6cd35025 Claim Code: fix missing space in confirm modal 2017-02-01 04:16:32 -05:00
alexliebowitz 7e77f52976 Merge pull request #154 from lbryio/remove-publish-timeout 
Don't time out on Publish page
 2017-02-01 04:11:18 -05:00
Alex Liebowitz deb67e6556 Don't time out on Publish page 
lbry.getFileInfoWhenListed() now only times out if a timeout callback
is provided.
 2017-02-01 04:11:16 -05:00
alexliebowitz ea1a10860e Merge pull request #153 from lbryio/fix-uris-file-tile 
Fix display of LBRY URIs in FileTile
 2017-02-01 03:43:12 -05:00
Alex Liebowitz 4f9e1a7c46 Fix display of LBRY URIs in FileTile 2017-02-01 03:43:19 -05:00
alexliebowitz edd92c3c89 Merge pull request #152 from lbryio/fix-load-screen-colors 
Fix colors on loading screen
 2017-02-01 03:28:07 -05:00
Alex Liebowitz df1c6ed97c Fix colors on loading screen 2017-02-01 03:27:18 -05:00
alexliebowitz fe5193ad84 Merge pull request #151 from lbryio/fix-watch-screen-debug 
Remove debug logic in load_screen.js
 2017-01-31 13:46:24 -05:00
Alex Liebowitz e7209aa19a Remove debug logic in load_screen.js 
There were some !s in there that were only for debugging
 2017-01-31 13:45:36 -05:00
Jeremy Kauffman c2c45fc53e Merge pull request #150 from lbryio/watch-screen-cancel-link 
Add Cancel link when loading screen is lagging
 2017-01-31 10:11:36 -08:00
Alex Liebowitz 810b94fa77 Add Cancel link when loading screen is lagging 2017-01-31 02:17:53 -05:00
Alex Liebowitz 34d04255de Convert load screens to use CSS 2017-01-31 02:06:53 -05:00
Jeremy Kauffman e97a81e7d5 Merge pull request #148 from lbryio/published-file-tile-fixes 
Fix bugs in display of published files
 2017-01-30 12:26:39 -05:00
Jeremy Kauffman c1922d097e Merge pull request #149 from lbryio/show-page-file-actions 
Update Show page to use new FileActions component
 2017-01-30 12:26:17 -05:00