Commit graph

390 commits

Author SHA1 Message Date
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
6ea86b96
356393330a Playing videos working better 2017-05-04 11:59:45 -04:00
6ea86b96
4754ba3da2 Able to watch already downloaded videos 2017-05-04 11:59:45 -04:00
6ea86b96
3a050b3b71 Search working 2017-05-04 11:59:45 -04:00
6ea86b96
1fd94e7902 Working on search 2017-05-04 11:59:45 -04:00
6ea86b96
6abb7bfe92 Loading show page content fast, resolving cost and file info.
Rewards and uploaded/downloaded files currently broken
2017-05-04 11:59:45 -04:00
6ea86b96
cfb4c13f70 Starting on downloaded/published content 2017-05-04 11:59:45 -04:00
6ea86b96
393aa9129c Featured content 2017-05-04 11:59:45 -04:00
6ea86b96
cb5067dce3 Progress on featured content 2017-05-04 11:59:45 -04:00
6ea86b96
cf0fd96ed8 Progress on sending transactions 2017-05-04 11:59:45 -04:00
6ea86b96
1a8929f8d6 Some transactions cleanup and starting on sending 2017-05-04 11:59:45 -04:00
6ea86b96
ef3a2b3ddf Check address ownership 2017-05-04 11:59:45 -04:00
6ea86b96
763dd6197e Fix for generating a wallet address on load 2017-05-04 11:59:45 -04:00
6ea86b96
b90e35355d Wallet progress 2017-05-04 11:59:45 -04:00
Jeremy Kauffman
66b07c1922 watch page is ded 2017-05-04 11:59:45 -04:00
Jeremy Kauffman
57fbd2bd7a remove console 2017-05-04 11:59:45 -04:00
Jeremy Kauffman
28d0d00a7f fix drawer highlight and drawer balance 2017-05-04 11:59:45 -04:00
6ea86b96
8cae067876 Redux proof of concept 2017-05-04 11:59:45 -04:00
6ea86b96
ff9441b955 Redux proof of concept 2017-05-04 11:59:45 -04:00
Alex Grintsvayg
a450d294ca fix arg name 2017-05-03 13:56:39 -04:00
Alex Grintsvayg
82561e3aaf update daemon url, remove redundant brackets around jsonrpc params 2017-05-03 13:54:36 -04:00
Jeremy Kauffman
ea5d85954f a few missed behaviors 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
13e198f20e releasable? 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
59da42a84b show refactor and fixes 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
3f923550f1 fixes, channel page stubs 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
5b11c2575a still not quite releasable, but much progress 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
da538a7a23 many bug fixes, working back button, progress towards working search 2017-05-02 10:21:33 -04:00
Alex Liebowitz
0b8d9e3d82 Simplify state management of viewing page
Explicitly set the page being viewed to "discover" instead of just
rendering the discover page if none is set.

Eliminates several real or possible bugs and edge cases.
2017-05-02 10:21:33 -04:00