Commit graph

2233 commits

Author SHA1 Message Date
Jack Robison 29e45d6e2d build branches with prs on appveyor 2017-06-30 15:04:31 -04:00
Jeremy Kauffman 8a2756112c Bump version: 0.13.0rc1 → 0.13.0 2017-06-30 10:31:51 -04:00
Jeremy Kauffman 888cc33192 remove language widget 2017-06-29 15:17:07 -04:00
Jeremy Kauffman ba632b5876 Bump version: 0.12.2rc9 → 0.13.0rc1 2017-06-29 09:24:53 -04:00
Jeremy Kauffman 70d2b23add Merge pull request #307 from hackrush01/master
Renamed links files.
2017-06-29 09:11:44 -04:00
hackrush 80b54c27f8 Renamed links files.
Fixed some incorrectly named files.
2017-06-29 18:29:06 +05:30
Jeremy Kauffman 080b693e63 Merge pull request #305 from lbryio/cancel-resolve
Cancel resolving URis when unmounting discover page
2017-06-29 08:46:42 -04:00
6ea86b96 ef8bd5f986 Cancel resolving URis when unmounting discover/file list pages 2017-06-29 15:38:01 +07:00
alexliebowitz fce702f737 Merge pull request #304 from lbryio/fix-link-focus-2
On Windows, denormalize URI when opening link with app closed
2017-06-29 01:26:48 -04:00
Alex Liebowitz ac5df086a9 On Windows, denormalize URI when opening link with app closed 2017-06-29 00:56:59 -04:00
Jeremy Kauffman e6f1dea9d5 Bump version: 0.12.2rc8 → 0.12.2rc9 2017-06-28 18:08:58 -04:00
Jeremy Kauffman b815f78a50 more pending and publishing fixes 2017-06-28 18:08:16 -04:00
Jeremy Kauffman 8d62b4d1fc clarify why channels are empty, fixes #299 2017-06-28 16:17:22 -04:00
Jeremy Kauffman df286da300 stupid pending publish hacks 2017-06-28 15:54:33 -04:00
Jeremy Kauffman 429ca37e55 fix undefined count 2017-06-28 15:45:24 -04:00
Jeremy Kauffman ed80d9fa2e Bump version: 0.12.2rc7 → 0.12.2rc8 2017-06-28 14:22:45 -04:00
Jeremy Kauffman 91ba6f1773 fix requirements, update changelog 2017-06-28 14:21:21 -04:00
Jeremy Kauffman bab2f7d53c fix initial reward showing 2017-06-28 14:00:10 -04:00
Jeremy Kauffman 289bb0b4ae hackish fix for pending publishes not working 2017-06-28 11:24:16 -04:00
Jeremy Kauffman 020f437a63 Merge pull request #302 from lbryio/fix-link-focus
Reliably focus app window when opening lbry:// links (WIP)
2017-06-28 10:07:42 -04:00
Jeremy Kauffman c011783003 Merge pull request #301 from lbryio/nsfw
Move client settings into redux
2017-06-28 09:05:25 -04:00
Alex Liebowitz c8cbf61f94 Reliably focus app window when opening lbry:// links
Also refactors and simplifies the code for handling URIs requested from
outside apps.
2017-06-28 03:28:30 -04:00
6ea86b96 500fdd282c
Move client settings into redux 2017-06-28 14:12:01 +07:00
Jeremy Kauffman e42aa217d0 update CHANGELOG 2017-06-27 17:27:27 -04:00
Jeremy Kauffman 0db0fd1307 Merge pull request #296 from lbryio/claim-id-dmca
Add claim_id to DMCA links
2017-06-27 14:24:06 -04:00
Jeremy Kauffman 1ce926dd98 fix nsfw not refreshing 2017-06-27 14:19:33 -04:00
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
6ea86b96 ad931b5871
Add claim_id to DMCA links 2017-06-28 00:12:17 +07: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