Commit graph

1906 commits

Author SHA1 Message Date
hackrush e3bbb6fcef "Fixed NSFW content showing on filePage"
NSFW content is obscured on show page and gives an overlay to inform
the user. Fixes #286

Added one additional format(epub) in lbry.js.
2017-06-27 14:18:30 -04:00
Jeremy Kauffman 6aad233f66 Merge pull request #294 from lbryio/teardown-focused-listeners
Teardown old window event listeners and don't blow up when window isn't focused
2017-06-27 12:55:23 -04:00
Alex Grintsvayg 0f8edabcc0 Bump version: 0.12.2rc6 → 0.12.2rc7 2017-06-27 10:40:43 -04:00
Alex Grintsvayg 83d387dcfb yarn lock files dont have versions 2017-06-27 10:40:35 -04:00
Alex Grintsvayg db342dd268 upgrade some babel deps, remove npmrc files 2017-06-27 10:25:07 -04:00
Alex Grin e22b44d609 Merge pull request #293 from lbryio/file-info-fix
Two file info fixes since last merge
2017-06-27 09:52:40 -04:00
6ea86b96 28eb490014
Teardown old window event listeners and don't blow up when window isn't focused
at boot/reload
2017-06-27 19:54:25 +07:00
6ea86b96 78be53806b
Two file info fixes since last merge 2017-06-27 15:23:03 +07:00
Alex Grintsvayg fabfc06703 fix some dependency conflicts 2017-06-26 15:18:13 -04:00
Alex Grintsvayg 065d8839fb dont need extractLocals in appveyor 2017-06-26 14:13:27 -04:00
Jeremy Kauffman de5af5d2bc Merge branch 'master' of github.com:lbryio/lbry-app 2017-06-26 13:17:46 -04:00
Jeremy Kauffman 1a36f6683c Merge branch 'dock-badge' 2017-06-26 13:17:14 -04:00
Jeremy Kauffman 6ff423a760 Merge branch 'master' into dock-badge 2017-06-26 13:16:59 -04:00
Jeremy Kauffman e8d7e2dc40 minor copy change 2017-06-26 13:16:36 -04:00
Alex Grintsvayg ada379f873 Merge branch 'yarn'
* yarn:
  forgot to edit appveyor build
  move keytar into main app process, so webpack doesnt package it and fuck up the keytar.node path
  switch to yarn
  devtron
2017-06-26 13:09:24 -04:00
Alex Grintsvayg 9eb448f1bc forgot to edit appveyor build 2017-06-26 13:08:54 -04:00
Alex Grintsvayg 6c3a30eac0 move keytar into main app process, so webpack doesnt package it and fuck up the keytar.node path 2017-06-26 13:08:54 -04:00
Alex Grintsvayg e37fe1f58e switch to yarn 2017-06-26 13:08:54 -04:00
Alex Grintsvayg 8c063f41c4 devtron 2017-06-26 13:08:54 -04:00
Jeremy Kauffman ec31284e7a Merge pull request #285 from lbryio/show-fix
Fix resolving uris on show page
2017-06-26 12:32:35 -04:00
Jeremy Kauffman 23d43b0b99 Merge pull request #284 from lbryio/by-outpoint
Rename fileInfo.fileInfos to fileInfo.byOutpoint
2017-06-26 12:32:20 -04:00
Jeremy Kauffman d072dabead Merge pull request #283 from lbryio/no-history
Don't call history.back when there is no previous history
2017-06-26 12:31:42 -04:00
6ea86b96 5711e99a06
Fix resolving uris on show page 2017-06-25 14:37:09 +07:00
6ea86b96 7ec5f4950a
Rename fileInfo.fileInfos to fileInfo.byOutpoint 2017-06-25 14:24:45 +07:00
6ea86b96 a76ac95f7c
Don't call history.back when there is no previous history 2017-06-25 14:08:29 +07:00
Jeremy Kauffman ee1de52156 Merge pull request #280 from lbryio/player-classes
Use array to build classes in video view
2017-06-24 14:53:24 -04:00
6ea86b96 1b88e70d74
Send desktop notifications when a download has completed 2017-06-24 23:48:01 +07:00
6ea86b96 0214422e6b Add a badge to the dock for downloaded files 2017-06-24 22:21:04 +07:00
Alex Grintsvayg 9c9d685be6 trim verification token 2017-06-23 13:47:07 -04:00
6ea86b96 3a57363b8a Use array to build classes in video view 2017-06-23 23:19:48 +07:00
Alex Grintsvayg 56aa4d2255 dont even make lock files 2017-06-23 11:30:17 -04:00
Alex Grintsvayg aafba60858 only travis on releases 2017-06-23 11:30:17 -04:00
Jeremy Kauffman af68c07931 Merge pull request #273 from lbryio/refreshing
Fix refreshing
2017-06-23 11:26:46 -04:00
Jeremy Kauffman f697b167f8 Merge pull request #274 from lbryio/fix-rewards-page
Fix rewards page
2017-06-23 10:02:33 -04:00
Jeremy Kauffman ade2788d33 Merge pull request #276 from lbryio/trim-search-term
Trim search query
2017-06-23 09:42:31 -04:00
Jeremy Kauffman 5e6c2363bd Merge pull request #275 from lbryio/fix-transaction-links
Fix links from transactions to block explorer
2017-06-23 09:41:33 -04:00
Jeremy Kauffman 17e742a566 Merge pull request #277 from lbryio/permanent-urls
Add claim ids to urls in downloaded/published files
2017-06-23 09:40:49 -04:00
6ea86b96 e67a826314
Add claim ids to urls in downloaded/published files 2017-06-23 13:58:08 +07:00
6ea86b96 717e6c12bf
Trim search query 2017-06-23 13:21:37 +07:00
6ea86b96 23f99d2bb9
Fix links from transactions to block explorer 2017-06-23 13:00:59 +07:00
6ea86b96 9595b1707d Fix refreshing 2017-06-23 12:47:41 +07:00
6ea86b96 d4438914d5
Fetch rewards after authentication success 2017-06-23 12:30:26 +07:00
6ea86b96 83f72a83b0
Fetch rewards on rewards page 2017-06-23 12:29:40 +07:00
Jeremy Kauffman f1f0c15548 Merge pull request #272 from lbryio/file-tile-error
File tile error
2017-06-22 12:00:38 -04:00
6ea86b96 c4827c853d
remove pointless nulls 2017-06-22 22:13:33 +07:00
6ea86b96 d53c3d4db6
Fix this.state.hovered null error 2017-06-22 21:17:01 +07:00
Alex Grintsvayg adbc02838c does removing lock files make it build right? 2017-06-22 10:04:25 -04:00
Jeremy Kauffman 282cf4f708 Merge pull request #269 from intnick/master
Transifex configuration
2017-06-22 08:50:43 -04:00
Jeremy Kauffman b8af474375 Merge branch 'master' into master 2017-06-22 08:50:36 -04:00
Jeremy Kauffman 2285f2f01e Merge pull request #270 from intnick/transiflex
separated page name translations
2017-06-22 08:50:17 -04:00