Commit graph

517 commits

Author SHA1 Message Date
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
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
6ea86b96
f97ec7b390 Store claims by id in the state 2017-06-07 08:30:17 +07:00
Jeremy Kauffman
2172555096 change prettier options 2017-06-06 17:19:12 -04:00
Alex Grintsvayg
954db08bd1 use new fee metadata format 2017-06-06 11:14:08 -04:00
Sean Yesmunt
c8b949f020 format with prettier 2017-06-05 21:21:55 -07:00
Fillerino
a2ec397ff8 Quick fix for Issue #198 , not being able to go to SEND/RECEIVE page
This commit fixes the missing _ in one of the i18n translation labels.
fixes #198
2017-06-05 22:35:24 +02:00
Jeremy Kauffman
a023c11493 update to latest daemon, remove extra bracket 2017-06-05 12:57:27 -04:00
Jeremy Kauffman
c348f552cd Merge pull request #189 from 6ea86b96/play-more-file-types
Render all file types that render-media can handle
2017-06-05 11:40:11 -04:00
Jeremy Kauffman
8d359629fb Merge pull request #160 from intnick/i18n
i18n Support
2017-06-05 11:34:22 -04:00
Jack Robison
eb0641d82a update deprecated commands 2017-06-05 10:44:53 -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
fb36cf12f1 Merge branch 'master' into i18n 2017-06-03 13:06:53 +02:00
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
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
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
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
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
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
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
fe7b5eb4e0 removed unnecessary y 2017-05-31 12:34:39 +02:00
Mayesters
dc2dfff148 fixed misstructured call 2017-05-31 12:33:39 +02:00
Mayesters
21d8e0c7d1 fixed tick marks in translation 2017-05-31 12:29:22 +02:00
Jeremy Kauffman
7a8a2c4913 connection changes and changelog 2017-05-30 19:56:48 -04:00
Jeremy Kauffman
c3eb921685 Merge branch 'master' into autoplay 2017-05-30 17:18:04 -04:00
6ea86b96
230e6e2d70 Fix autoplaying 2017-05-30 23:16:41 +04:00
Jeremy Kauffman
db8201e43c Merge pull request #159 from 6ea86b96/bug/error-message
Stop landing page content loading error from displaying all the time
2017-05-30 14:21:08 -04:00
Jeremy Kauffman
2bdc2ce268 fix close modal in video component 2017-05-30 14:12:07 -04:00
6ea86b96
5aca89ab63 Stop landing page content loading error from displaying all the time 2017-05-30 12:34:13 +04:00
Jeremy Kauffman
4acd8a8f25 fix upgrade on windows 2017-05-29 16:43:50 -04:00
Mayesters
a8a42cee2e wunderbar translated 2017-05-28 21:35:21 +02:00
6ea86b96
a6709ffc26 Try to only keep one copy of each claim in the store 2017-05-28 22:46:00 +04:00
Mayesters
1a3c20a637 Translated updated components 2017-05-28 18:56:01 +02:00
Mayesters
804c9a646b Merge branch 'master' into i18n 2017-05-28 18:46:31 +02:00
Intnick
02b13fc252 i18n ready for testing 2017-05-28 18:36:35 +02:00
Intnick
13989632a7 language switch implementation. Needs more testing 2017-05-28 17:52:23 +02:00
Mayesters
469e769e01 lots of stuff translated 2017-05-28 17:52:23 +02:00
Intnick
1d09f08392 header and tranactionList component translated 2017-05-28 17:46:08 +02:00
Intnick
972ac78595 fileListSearch and fileTitle component translated 2017-05-28 17:46:08 +02:00
Intnick
7d6368aeca fileList component translated 2017-05-28 17:46:08 +02:00
Intnick
ff02e0452b filaActions and fileCard components translated 2017-05-28 17:45:40 +02:00
Intnick
0cf1da36ea page settings, show, wallet, report translated 2017-05-28 17:45:03 +02:00
Intnick
3ba79fff32 search page translated 2017-05-28 17:44:10 +02:00
Intnick
c7d7a532ac help page trans 2017-05-28 17:42:59 +02:00
Intnick
d30d4353e8 moved the import of y18n component before some other imports; translations for auth developer 2017-05-28 17:33:25 +02:00
Jeremy Kauffman
6bccb67585 Merge pull request #153 from 6ea86b96/double-fetch-cost
Don't try to fetch cost info if it's already fetching
2017-05-28 11:28:14 -04:00
Jeremy Kauffman
fd093f0a95 Merge pull request #152 from 6ea86b96/file-actions-cost-info
Stop blowing up if user attempts to download before cost info fetched
2017-05-28 11:27:35 -04:00
Intnick
1e311905b8 finalization of i18n setup to i18n branch 2017-05-28 17:25:21 +02:00
Intnick
e8bfd592a6 initial merge 2017-05-28 17:25:21 +02:00
Intnick
59aa56b7ef initial merge 2017-05-28 17:25:21 +02:00
Intnick
d5a4032b9f initial merge 2017-05-28 17:25:21 +02:00
Jeremy Kauffman
08ba2f49f6 Merge pull request #150 from 6ea86b96/reconstructing-message
Add a message for when we're reconstructing a moved/deleted file before playback
2017-05-28 11:24:28 -04:00
6ea86b96
b2b99b31b9
Don't try to fetch cost info if it's already fetching 2017-05-28 19:16:07 +04:00
6ea86b96
37344b3517
Stop blowing up if user attempts to download before cost info fetched 2017-05-28 18:24:10 +04:00
6ea86b96
862d711391
Add a message for when we're reconstructing a moved/deleted file before playback 2017-05-28 17:38:36 +04:00
6ea86b96
3d700f470c
Turns out that batchActions doesn't play nicely with thunk 2017-05-28 15:35:11 +04:00
6ea86b96
2bb5f9acc6 Fix playing videos that were deleted and require no cost info 2017-05-26 22:50:43 +04:00
Jeremy Kauffman
66bbf30482 fix claim id parameter 2017-05-26 14:19:45 -04:00
Jeremy Kauffman
dff389d8cf Merge pull request #144 from 6ea86b96/bug/cost-info-lookup
Lookup cost info on file page if it hasn't already been looked up
2017-05-26 14:19:16 -04:00
6ea86b96
82bdf6324d
Lookup cost info on file page if it hasn't already been looked up 2017-05-26 22:17:01 +04:00
Jeremy Kauffman
526881c261 move up time of rewad claim for downloads 2017-05-26 11:58:56 -04:00
Jeremy Kauffman
ca4442f767 featured download reward 2017-05-26 11:56:32 -04:00
Alex Liebowitz
fc652e221a Fix Publish page to use new claim info format 2017-05-26 04:16:25 -04:00
Jeremy Kauffman
260980ff38 fix app upgrades? 2017-05-25 16:07:32 -04:00
Jeremy Kauffman
aee0603dc9 fix version info on help 2017-05-25 14:29:28 -04:00
Jeremy Kauffman
a899d623d0 fix reward check on startup 2017-05-25 13:38:53 -04:00
Jeremy Kauffman
dd305c0a87 correct beta type ;) 2017-05-24 21:13:06 -04:00
Jeremy Kauffman
51a2f4f52e Merge branch 'api-fixes' 2017-05-24 20:10:36 -04:00
Jeremy Kauffman
a8082b0e0d minor style fix 2017-05-24 20:07:38 -04:00
Jeremy Kauffman
946db9a6bc fix uri handling? 2017-05-24 20:07:38 -04:00
Jeremy Kauffman
de0f40bd0b fix installation id 2017-05-24 20:07:38 -04:00
Jeremy Kauffman
5d68da9dba fix access without code 2017-05-24 20:07:38 -04:00
Jeremy Kauffman
0c41cbb823 error and auth fixes 2017-05-24 20:07:38 -04:00
Jeremy Kauffman
8ac2bcd638 fix publish prompt 2017-05-23 21:01:38 -04:00
Jeremy Kauffman
68b8febc93 Merge pull request #131 from lbryio/claim_fix
only try to claim reward for initial claims, not updates
2017-05-23 15:54:11 -04:00
Jeremy Kauffman
a3d98266af fix nsfw 2017-05-23 15:51:58 -04:00
Alex Grintsvayg
d77fc883d1 only try to claim reward for initial claims, not updates 2017-05-23 13:08:32 -04:00
6ea86b96
3659c989b8
Display search results immediately if they are in the state 2017-05-23 12:59:35 +04:00
6ea86b96
60f3a07917
remove the uri encoding 2017-05-23 12:49:15 +04:00
6ea86b96
27b9d844b7
Fix navigating back through search results 2017-05-23 12:46:52 +04:00
6ea86b96
1b9d23279c
Fix playing videos that have been previously downloaded but then deleted/moved 2017-05-23 11:48:36 +04:00
6ea86b96
e55ba15613
Set ENV in webpack and always log in development 2017-05-23 11:41:26 +04:00
6ea86b96
53efd55890
Fix snackbar 2017-05-23 11:21:21 +04:00
6ea86b96
666674888e
batch actions dispatched when daemon is ready 2017-05-22 21:18:24 +04:00
6ea86b96
279f6ff76c
No need to set the title in history push 2017-05-22 20:32:25 +04:00
6ea86b96
63dab7a496
Fix going back when there's no state to pop 2017-05-22 19:58:33 +04:00
6ea86b96
720c0bac9f
Set page title when changing path 2017-05-22 19:58:17 +04:00
6ea86b96
25bb380976
Display featured content immediately if it's already loaded 2017-05-22 19:22:24 +04:00
Jeremy Kauffman
a08a214d34 fix text areas and bug reporting 2017-05-21 18:34:12 -04:00
Jeremy Kauffman
fe3155ec24 I don't know how to test URI handling without triggering builds :( :( 2017-05-21 16:41:09 -04:00
Jeremy Kauffman
20a4f20562 uri handling 2017-05-21 15:41:26 -04:00
Jeremy Kauffman
4f7e7c6922 debug fixes 2017-05-21 14:07:02 -04:00
Jeremy Kauffman
0936d28e5d minor bug fixes 2017-05-21 12:15:41 -04:00
Jeremy Kauffman
951190bf96 channel and file selector fixes 2017-05-21 10:42:34 -04:00
Jeremy Kauffman
bb16156034 re-enable rewards 2017-05-19 12:17:19 -04:00
Jeremy Kauffman
209db5e3d0 Merge branch 'redux' into es6-classes 2017-05-19 09:17:41 -04:00
Jeremy Kauffman
f60d17f604 Merge branch 'redux' into file-selector 2017-05-19 09:11:32 -04:00
Jeremy Kauffman
3a0506c18b renable discover list 2017-05-18 19:15:54 -04:00
Jeremy Kauffman
9d8fa102ee bug fixes, file info and my claims refactor, list claims in channel 2017-05-18 19:14:26 -04:00
Jeremy Kauffman
900c5cbc2b some progress towards cost and file info refactor, plus other fixes 2017-05-18 13:58:28 -04:00
Alex Liebowitz
09834941ab Convert more callbacks to arrow functions 2017-05-18 04:39:18 -04:00
Alex Liebowitz
3e35d44978 Basics of conversion to ES6 classes 2017-05-18 04:39:18 -04:00
Jeremy Kauffman
3fa4d0dfe7 progress towards fixing settings and costs 2017-05-17 17:52:45 -04:00
Jeremy Kauffman
aa935c1c07 more refactors, fixes 2017-05-15 12:34:33 -04:00
Jeremy Kauffman
6783bcdfeb i'm making things better... right? 2017-05-14 23:50:59 -04:00
Jeremy Kauffman
0fad6864ec let improvements and breaking continue 2017-05-12 18:50:51 -04:00
Jeremy Kauffman
c823ccd056 fix infinite resolve, add valid uri check 2017-05-12 16:49:15 -04:00
Jeremy Kauffman
950f3183cf more bug fixes + optimizations 2017-05-12 14:36:44 -04:00
Jeremy Kauffman
5605b10f54 more bug fixes and bugs 2017-05-12 13:14:06 -04:00
Alex Liebowitz
02f1f0e55b Developer Settings: make compatible with new file field 2017-05-12 07:31:33 -04:00
Alex Liebowitz
b12c9e2744 Settings: Use new "directory" field type for download directory
Before it was using a plain text box (hold-over from when we were
in-browser and couldn't use a directory selector)
2017-05-12 07:31:33 -04:00
Alex Liebowitz
c8f7cb2110 Update FormField to use new Electron file/directory selector 2017-05-12 07:31:33 -04:00
Alex Liebowitz
044d3612c2 Add FileSelector component 2017-05-12 07:31:23 -04:00
Jeremy Kauffman
c1161fc10b mainly more bug fixes 2017-05-11 19:28:43 -04:00
Alex Grintsvayg
df7ce9cc64 api returns fields in lowercase now 2017-05-11 17:44:00 -04:00
Jeremy Kauffman
3c325b2f0a where's the triggers?! also very broken 2017-05-10 20:59:47 -04:00
Jeremy Kauffman
d517316554 some progress but also broken show 2017-05-09 23:06:48 -04:00
Jeremy Kauffman
1dedb9873c more fixes but not all of the fixes :( 2017-05-09 21:33:13 -04:00
Jeremy Kauffman
60d298b354 Merge remote-tracking branch 'origin/master' into redux 2017-05-09 16:58:48 -04:00
Jeremy Kauffman
9c02327b26 merge plus some bug fixes 2017-05-09 16:12:48 -04:00
6ea86b96
786f57e787
Fix search results html 2017-05-09 14:33:01 +07:00
6ea86b96
84b86ff8e4
Make FileTile resolve URIs (fixes exact search matching) 2017-05-09 13:38:43 +07:00
Jeremy Kauffman
e4ca14aa47 fix some minor things with search 2017-05-08 18:22:27 -04:00
Jeremy Kauffman
b28b116a24 Merge pull request #116 from lbryio/uri-handling
URI handling (WIP)
2017-05-08 10:11:18 -04:00
Alex Liebowitz
ef4274012f Add better handling for URIs requested during load 2017-05-08 05:04:11 -04:00
Alex Liebowitz
38ea41775b Avoid page reload when loading URIs passed in from other apps 2017-05-08 02:36:48 -04:00
6ea86b96
4b5187bc7f
Better search 2017-05-07 19:50:32 +07:00
6ea86b96
b19e356a06
Remove wallet new address logging 2017-05-07 16:18:18 +07:00
6ea86b96
e08419e534
Save receive address in localStorage to prevent new receive address creation on
every boot
2017-05-07 16:17:38 +07:00
6ea86b96
58c06e17c9
Fix dashboard loading message 2017-05-07 14:39:13 +07:00
6ea86b96
225921c0a4
Use HTML from master file tile stream 2017-05-07 14:07:40 +07:00
6ea86b96
3085b2d362
A couple of minor history fixes 2017-05-07 00:57:34 +07:00
6ea86b96
d2c97d3460
Back button working properly 2017-05-06 23:31:47 +07:00
6ea86b96
fcea4cb305
Progress on navigation 2017-05-06 14:25:14 +07:00
6ea86b96
fb3d366fe0
Fix upgrading and start on history 2017-05-06 00:05:33 +07:00
Alex Liebowitz
758bb59ccb Add basics of URI handling for Mac and Windows 2017-05-05 05:19:15 -04:00
6ea86b96
89e91c6d8a
Add downloaded/published nav and comment out broken reward code 2017-05-05 15:10:51 +07:00
6ea86b96
29c53a9bf8
Search kind of working, but nasty 2017-05-05 15:01:16 +07:00
6ea86b96
daabe975e1
Add showPage again. Not 100% sure if it's needed? 2017-05-05 13:13:06 +07:00
6ea86b96
f2490c902f
Missed NavSettings 2017-05-05 12:48:15 +07:00
6ea86b96
494d885f31
Use SubHeader for all sub navigation 2017-05-05 12:28:28 +07:00
6ea86b96
ac626ab9f9
File page working 2017-05-05 12:10:37 +07:00
Alex Liebowitz
536c5391fb Make error modals display full screen properly
Was not passing in the generic modal-overlay class. (ExpandableModal
doesn't provide it automatically so you can omit it and make a totally
custom overlay if you want.)
2017-05-05 00:46:10 -04:00
Jeremy Kauffman
b70f169256 much progress towards a working merge 2017-05-04 11:59:46 -04:00
Jeremy Kauffman
cfedb4a860 more bug fixes 2017-05-04 11:59:46 -04:00
6ea86b96
3693c36a20 Fix accidental commit 2017-05-04 11:59:46 -04:00
6ea86b96
2b0c9bd17a Switch to https://github.com/Selz/plyr video player (recommended by @fillerino). 2017-05-04 11:59:46 -04:00
6ea86b96
6d913236e1 Fix publish page link in router 2017-05-04 11:59:46 -04:00
6ea86b96
82fd7e25ad Start on publish page 2017-05-04 11:59:46 -04:00
6ea86b96
64dfa70551 Fix for timed out content 2017-05-04 11:59:46 -04:00
6ea86b96
557a2dffc1 File tile stream fixes 2017-05-04 11:59:46 -04:00
6ea86b96
bb6df4169b Get rewards page working 2017-05-04 11:59:46 -04:00
6ea86b96
1c26213fff Refactor UriIndicator 2017-05-04 11:59:46 -04:00
6ea86b96
a5e7843e9c Fix file card stream loading text 2017-05-04 11:59:46 -04:00
6ea86b96
1f22a3353b Add missing DAEMON_READY reducer 2017-05-04 11:59:46 -04:00
6ea86b96
124cc54a77 Jam claim next purchase reward in 2017-05-04 11:59:45 -04:00
6ea86b96
da98d02fb1 Published files working 2017-05-04 11:59:45 -04:00
6ea86b96
8f57420127 Increase deactivate search timeout 2017-05-04 11:59:45 -04:00
6ea86b96
c85228f3a4 Fix purchasing from file actions and allow content to be watched when being
downloaded from file actions download link
2017-05-04 11:59:45 -04:00
6ea86b96
85ad180303 reverse wallet transactions 2017-05-04 11:59:45 -04:00
6ea86b96
d2e7d7f1df Downloaded file list kind of working. Not sure about sort. 2017-05-04 11:59:45 -04:00
6ea86b96
12f965f473 even smarter search 2017-05-04 11:59:45 -04:00
6ea86b96
21818c57a8 Fix NSFW blurring on search and make search show/hide smarter 2017-05-04 11:59:45 -04:00
6ea86b96
b5fbb9b10e More refactoring/fixing of file actions, tiles, etc 2017-05-04 11:59:45 -04:00
6ea86b96
e88f06c17c A bunch of improvements and broken the back of the file rendering code now 2017-05-04 11:59:45 -04:00
6ea86b96
a77370afc9 Refactoring 2017-05-04 11:59:45 -04:00
6ea86b96
3fd48810f1 Add fileinfo to action data when download starts 2017-05-04 11:59:45 -04:00
6ea86b96
3981ca8381 Don't re-render the video player when fileinfo has changed 2017-05-04 11:59:45 -04:00
6ea86b96
f70e90877b Videos playing properly immediately after purchase 2017-05-04 11:59:45 -04:00
6ea86b96
925586f6b1 Playing videos actually working now 2017-05-04 11:59:45 -04:00