Commit graph

708 commits

Author SHA1 Message Date
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
db342dd268 upgrade some babel deps, remove npmrc files 2017-06-27 10:25:07 -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
Jeremy Kauffman
de5af5d2bc Merge branch 'master' of github.com:lbryio/lbry-app 2017-06-26 13:17:46 -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
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
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
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
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
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
2285f2f01e Merge pull request #270 from intnick/transiflex
separated page name translations
2017-06-22 08:50:17 -04:00
Alex Grintsvayg
d9bc7f9777 Bump version: 0.12.2rc5 → 0.12.2rc6 2017-06-21 20:12:35 -04:00
Alex Grintsvayg
89b5e20b15 iron out auth issues 2017-06-21 20:09:30 -04:00
Intnick
b14293cd14 separated page name translations 2017-06-22 01:15:24 +02:00
Alex Grintsvayg
0d5a04b451 pass the function, dont call it 2017-06-21 18:49:23 -04:00
Alex Grintsvayg
a9fe3a0ed2 those arent real functions anymore 2017-06-21 18:27:07 -04:00
Alex Grintsvayg
f12a39352a Bump version: 0.12.2rc4 → 0.12.2rc5 2017-06-21 14:20:38 -04:00
Alex Grintsvayg
c539544778 bump versions in package lock files 2017-06-21 14:20:14 -04:00
Jeremy Kauffman
d389292ef3 Bump version: 0.12.2rc3 → 0.12.2rc4 2017-06-21 12:59:30 -04:00
Jeremy Kauffman
19eb1eda13 Merge pull request #266 from zestyr/patch-1
Support more file extensions
2017-06-21 12:07:24 -04:00
Alex Grintsvayg
efb7876b93 fixed package-lock and electron-rebuild 2017-06-21 09:16:23 -04:00
Alex Grintsvayg
cb68c538ee prettier 2017-06-21 08:42:22 -04:00
Alex Grintsvayg
d67f07bcbb i need shebang-command to get the precommit hook working 2017-06-21 08:41:07 -04:00
Alex Grintsvayg
e37472aeca update locks 2017-06-21 08:41:07 -04:00
Alex Grintsvayg
4376c34678 store auth token in OS keyring, not in local storage 2017-06-21 08:41:07 -04:00
Alex Grintsvayg
d4e572a2b6 minor cleanup 2017-06-21 08:34:50 -04:00
Alex Grintsvayg
024ff3cb50 create locales dir if it doesnt exist 2017-06-21 08:23:21 -04:00
Zed
c27d492d48 Support more file extensions 2017-06-20 20:34:00 +02:00
Alex Grintsvayg
741a88a7b4 added i18n-extract to package-lock 2017-06-20 10:08:28 -04:00
Alex Grintsvayg
aaec1f3a48 prettify all the files 2017-06-20 08:08:52 -04:00
Jeremy Kauffman
02f226e484 Merge pull request #258 from intnick/transiflex
fix i18n stuff + string extraction script for Transifex
2017-06-19 15:13:19 -04:00
Mayesters
0540b3d3b8 welcome modal i18n simplification 2017-06-19 15:51:28 +02:00
Mayesters
7fd9c25af2 fix publish again cuz im stupid 2017-06-19 15:50:10 +02:00
Mayesters
51ea169329 fix publish page 2017-06-19 15:49:26 +02:00
Mayesters
95a37e3f88 fix components + pages 2017-06-19 14:58:39 +02:00
Mayesters
df19708a5c fix components 2017-06-19 14:42:24 +02:00
Mayesters
25589a6a45 Merge branch 'master' into transiflex 2017-06-19 14:26:35 +02:00
Alex Liebowitz
a5968c2c20 Remove unnecessary load of Discover page during startup
We were loading the Discover page at the end of the launch screen.
That meant that if a user started with LBRY closed and started it by
clicking on a lbry:// link, it would load during the launch screen
but then get overridden by the Discover page as soon as the launch
screen finished.

Fortunately, this load was redundant anyway as the necessary state is
already being set in the default state for the App component:
902fb96878/ui/js/reducers/app.js (L5)
2017-06-19 08:12:00 -04:00
Jeremy Kauffman
ac067b78d1 Bump version: 0.12.2rc2 → 0.12.2rc3 2017-06-18 10:53:17 -04:00
Jeremy Kauffman
eb3f1086a2 Merge branch 'master' of github.com:lbryio/lbry-app 2017-06-18 10:34:54 -04:00
Jeremy Kauffman
dd444744ad Merge pull request #246 from lbryio/refresh-claims-fix
Refresh claims fix
2017-06-16 17:19:53 -04:00
6ea86b96
cf532b4e98
Add a way for users to clear their own cache 2017-06-16 12:43:43 +07:00
6ea86b96
5595b5b5b2
Remove doCancelResolveUri, it deletes claims from the store 2017-06-16 09:51:02 +07:00
6ea86b96
5074b368ee
Fix loading state on file card and uri indicator when claim is already available 2017-06-16 09:48:55 +07:00
Jeremy Kauffman
620ac04db2 remove deprecated metadata field 2017-06-15 20:05:15 -04:00
Jeremy Kauffman
f95853892b disable availability check 2017-06-15 20:02:57 -04:00
Jeremy Kauffman
f975ef4b1b Merge branch 'master' into redux-persist 2017-06-15 10:13:22 -04:00
Jeremy Kauffman
2cecd20c16 Merge pull request #239 from seanyesmunt/master
allow user to create new directory when choosing download directory
2017-06-15 09:37:26 -04:00
Jeremy Kauffman
b0959502ef Merge branch 'master' into refresh-claim-list-mine 2017-06-15 09:36:25 -04:00
6ea86b96
1063d2fc9d Always refresh claims/file info on downloaded/published pages 2017-06-15 19:46:27 +07:00
6ea86b96
28ea648215 Fixes after rebasing on master 2017-06-15 11:27:38 +07:00
6ea86b96
e5260612d6 Fix removing busy message after discovered content is fetched 2017-06-15 11:27:38 +07:00
6ea86b96
b596806fbc Refresh claim data when show page is mounted 2017-06-15 11:27:38 +07:00
6ea86b96
8f786baacd Make search page updates more efficient with batch actions 2017-06-15 11:27:38 +07:00
6ea86b96
193738083f Always resolve claims on discover page 2017-06-15 11:27:38 +07:00
6ea86b96
04c4988a9a Always refresh claims/file info on downloaded/published pages 2017-06-15 11:27:38 +07:00
6ea86b96
aa30aec997 Cache claims in indexedDB (via LocalForage) 2017-06-15 11:27:38 +07:00
Sean Yesmunt
0798f60c70 allow user to create new directory when choosing download directory 2017-06-14 21:03:20 -07:00
Jeremy Kauffman
e9ece65d68 Bump version: 0.12.2rc1 → 0.12.2rc2 2017-06-14 20:38:14 -04:00
Jeremy Kauffman
521b368cb0 fix error reporting 2017-06-14 20:37:42 -04:00
Jeremy Kauffman
4b095c3ea6 kill lbry.call 2017-06-14 20:21:31 -04:00
Jeremy Kauffman
a6b8ae2ce4 Bump version: 0.12.1rc1 → 0.12.2rc1 2017-06-14 18:01:22 -04:00
Jeremy Kauffman
c6603a4e80 daemon v0.13 support 2017-06-14 18:01:04 -04:00
Jeremy Kauffman
ce6284219c Bump version: 0.12.0 → 0.12.1rc1 2017-06-14 17:50:29 -04:00
Jeremy Kauffman
4c8d649830 updates required for lbry daemon 0.12 2017-06-14 17:49:23 -04:00
Jeremy Kauffman
efd289b1ed increase wait time for daemon to launch 2017-06-14 11:21:16 -04:00
Jeremy Kauffman
6d41006918 Merge branch 'fix_loading_help_menu' of https://github.com/longle255/lbry-app into longle255-fix_loading_help_menu 2017-06-13 15:45:13 -04:00
Le Long
d52d8872be use ipcRenderer as bridge for communication between electron and ui app 2017-06-13 17:02:06 +02:00
6ea86b96
d59f5f1005
Regenerate lock files 2017-06-13 11:19:56 +07:00
Mayesters
148392d49a update script again 2017-06-12 21:18:20 +02:00
Jeremy Kauffman
c47fb7cb2b Merge pull request #222 from seanyesmunt/webpack-2
webpack@2
2017-06-12 12:07:12 -04:00
Mayesters
ef568ef816 made script easier 2017-06-12 12:34:40 +02:00
Mayesters
9b32c764ac Extract Locals script basic setup 2017-06-12 12:20:50 +02:00
Sean Yesmunt
3a89a75e7d consistent quote type 2017-06-10 21:59:33 -07:00
6ea86b96
03f0c3ae8f Prettier fixes 2017-06-11 00:17:55 +07:00
6ea86b96
bfa9f6581f lock file updates. Are these files more trouble than they're worth? 2017-06-11 00:17:55 +07:00
6ea86b96
afcdd2271e Catch and render files with metadata at the end. Also notify if a file is
unplayable
2017-06-11 00:17:52 +07:00
Jeremy Kauffman
96265b9ae6 Merge pull request #217 from seanyesmunt/master
move why-did-you-update to package.json ui/
2017-06-10 11:30:27 -04:00
Sean Yesmunt
d4afa34d48 update webpack.config for v2 2017-06-09 22:13:11 -07:00
Sean Yesmunt
dd0bb16e58 update webpack.dev.config for v2 2017-06-09 22:03:02 -07:00
Sean Yesmunt
ab6d730091 update package-lock.json 2017-06-09 21:03:38 -07:00
Jeremy Kauffman
6bfce16f2e remove typo in settings page 2017-06-09 17:23:08 -04:00
Jeremy Kauffman
3f68858cf7 Bump version: 0.12.0rc8 → 0.12.0 2017-06-09 14:31:39 -04:00
Jeremy Kauffman
49c255e29a Bump version: 0.12.0rc7 → 0.12.0rc8 2017-06-09 13:13:34 -04:00
Jeremy Kauffman
cfa3aa3bc4 Merge branch 'master' into fix-publish-my-claims-display 2017-06-09 10:49:12 -04:00
Alex Grintsvayg
6cf5c144b0 Bump version: 0.12.0rc6 → 0.12.0rc7 2017-06-09 10:23:47 -04:00
Alex Grintsvayg
668a8b40e9 what is up with these files? 2017-06-09 10:23:36 -04:00
Alex Liebowitz
342afc6873 Fetch claim list on Publish page
Before, it would only receive the list of published claims if it had
already been fetched from previously viewing the My Files page
2017-06-09 06:58:20 -04:00
Sean Yesmunt
11d80c1361 move why-did-you-update to ui 2017-06-08 22:22:45 -07:00
Jeremy Kauffman
9418e78046 restore purecomponent, remove console.log 2017-06-08 20:10:53 -04:00
Jeremy Kauffman
241a0118a2 Merge remote-tracking branch 'origin/master' into tear_down_this_wall 2017-06-08 20:03:11 -04:00
Jeremy Kauffman
69bf1bdfea two more pure components 2017-06-08 19:41:44 -04:00
Jeremy Kauffman
f21bf287d9 Merge branch 'master' into should-component-update 2017-06-08 19:36:17 -04:00
Jeremy Kauffman
360a3d74c3 min of 0.01, fix parse call 2017-06-08 19:25:42 -04:00
Jeremy Kauffman
29e21f8faf Merge branch 'positive-claim-fee-only' of https://github.com/6ea86b96/lbry-app into 6ea86b96-positive-claim-fee-only 2017-06-08 19:23:54 -04:00
Jeremy Kauffman
f2cabfb07a minor correction 2017-06-08 19:16:38 -04:00
Jeremy Kauffman
5d5badd567 Merge branch 'master' of https://github.com/seanyesmunt/lbry-app into seanyesmunt-master 2017-06-08 19:07:50 -04:00
Jeremy Kauffman
09ecae7e0d reviewable 2017-06-08 17:15:34 -04:00
6ea86b96
c78465227a
Don't allow negative numbers for access cost and less than 1 for identity 2017-06-08 23:25:34 +07:00
Sean Yesmunt
e13d7c2149 use React.PureComponent 2017-06-07 21:42:19 -07:00
Sean Yesmunt
4c216d843b add whyDidYouUpdate for dev env 2017-06-07 21:41:33 -07:00
Jeremy Kauffman
18a40defba mostly done? 2017-06-07 20:56:52 -04:00
Jeremy Kauffman
cbf35014cd previously uncommitted copy change 2017-06-07 12:11:47 -04:00
Jeremy Kauffman
4f65957287 not enough progress 2017-06-07 12:11:47 -04:00
Jeremy Kauffman
b6881c829c uncommitted work from last night 2017-06-07 12:08:05 -04:00
Jeremy Kauffman
a17d19038e good chunk of progress towards auth and rewards refactor / degating 2017-06-07 12:08:04 -04:00
Sean Yesmunt
11fa00504d switch to BEM naming pattern 2017-06-07 09:06:14 -07:00
6ea86b96
eb170b9720 Working on rewards refactor 2017-06-07 12:04:39 -04:00
Jeremy Kauffman
e0b8afe028 midway through auth rewrite 2017-06-07 11:56:01 -04:00
Jeremy Kauffman
ddd01855b0 slight progress 2017-06-07 11:50:44 -04:00
Jeremy Kauffman
86f9749753 Bump version: 0.12.0rc5 → 0.12.0rc6 2017-06-07 11:09:53 -04:00
Jeremy Kauffman
3ee250a651 Merge pull request #192 from 6ea86b96/claims-by-id
Store claims by claim_id and fileinfo by sd_hash
2017-06-07 11:09:38 -04:00
Fillerino
b5218a39e7 Fixed the local version in help
This commit fixes the version in the help page.
Before it displayed the last remote version, now it displays the "localVersion".
2017-06-07 16:51:50 +02:00
Sean Yesmunt
0a7626fe49 remove un-necessary comment 2017-06-07 00:15:55 -07:00
Sean Yesmunt
46862a302e style loading spinner 2017-06-06 23:32:38 -07:00
Sean Yesmunt
708efba091 fix prop name 2017-06-06 22:42:01 -07:00
Sean Yesmunt
7a467f3635 move video-player and video-player-button into their own file 2017-06-06 22:36:12 -07:00
Sean Yesmunt
57a7d1db97 add internal video loading screen component 2017-06-06 21:12:45 -07:00
6ea86b96
732c9c3bd3 Make channel pages work again 2017-06-07 08:34:43 +07:00
6ea86b96
72137f51d2 Fix resolving uris in file tile 2017-06-07 08:34:13 +07:00
6ea86b96
c023a41a28 Stop cost info getting into an infinite loop 2017-06-07 08:32:41 +07:00