Commit graph

253 commits

Author SHA1 Message Date
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
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
Alex Liebowitz
fc652e221a Fix Publish page to use new claim info format 2017-05-26 04:16:25 -04:00
Jeremy Kauffman
aee0603dc9 fix version info on help 2017-05-25 14:29:28 -04:00
Jeremy Kauffman
51a2f4f52e Merge branch 'api-fixes' 2017-05-24 20:10:36 -04:00
Jeremy Kauffman
8ac2bcd638 fix publish prompt 2017-05-23 21:01:38 -04:00
Jeremy Kauffman
a3d98266af fix nsfw 2017-05-23 15:51:58 -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
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
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
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
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
9c02327b26 merge plus some bug fixes 2017-05-09 16:12:48 -04: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
6ea86b96
4b5187bc7f
Better search 2017-05-07 19:50:32 +07:00
6ea86b96
58c06e17c9
Fix dashboard loading message 2017-05-07 14:39:13 +07:00
6ea86b96
d2c97d3460
Back button working properly 2017-05-06 23:31:47 +07: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
Jeremy Kauffman
b70f169256 much progress towards a working merge 2017-05-04 11:59:46 -04:00
6ea86b96
82fd7e25ad Start on publish page 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
da98d02fb1 Published files working 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
d2e7d7f1df Downloaded file list kind of working. Not sure about sort. 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
925586f6b1 Playing videos actually working now 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
b90e35355d Wallet progress 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
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
Jeremy Kauffman
543b912ddb more cleanup / restoration 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
71771aeb6f it's not the worst thing I've ever done 2017-05-02 10:21:33 -04:00
Josh Finer
ac8a64f5e5 Update publish.js
Raise default minimum bid
2017-04-30 14:39:29 -04:00
Alex Liebowitz
0ffb0fd4d7 Replace all uses of bind() with arrow functions 2017-04-29 22:05:47 -04:00
Alex Grintsvayg
e06c2320e1 prefer wallet_unused_address over wallet_new_address 2017-04-27 14:18:59 -04:00
Alex Grintsvayg
63da853ba7 rename share_usage_stats setting 2017-04-27 08:40:29 -04:00
Jeremy Kauffman
f2d6bc3dcf fix search result uri building and empty array reduce warning 2017-04-20 19:26:29 -04:00
Jeremy Kauffman
a66a5edc67 Merge pull request #49 from lbryio/uri-improvements
Improve URI module
2017-04-19 14:11:44 -04:00
Alex Liebowitz
ca6d55da21 Add special support for building channel claims in lbryuri module
Extends lbryuri.build() and lbryuri.parse() to support special
keys, contentName and channelName. These put the right values in the
"name" and "path" position for both anonymous claims and channel
content claims, which lets us write code that can deal with either type
without special logic.
2017-04-19 14:06:29 -04:00
Jeremy Kauffman
395a48980d world's worst loading screen was truly the worst 2017-04-18 17:02:21 -04:00
Jeremy Kauffman
b30bfd9f61 auth fix and partial other auth fix 2017-04-18 15:45:15 -04:00
Alex Liebowitz
7a4e9ad656 Rename uri module and its functions 2017-04-18 15:14:56 -04:00
Alex Liebowitz
3ac31df63f Discover: update search to use new format from Lighthouse 2017-04-17 19:13:20 -04:00
Alex Liebowitz
cf1107050d Show: prevent prompt for purchase if user already has a copy 2017-04-17 17:20:25 -04:00
Alex Liebowitz
bbab1f064a Show: don't display price if file is already downloaded 2017-04-17 17:20:25 -04:00
Alex Liebowitz
94b60beebc Update download notice modal to include price 2017-04-17 17:20:24 -04:00
Jeremy Kauffman
c252c757b0 minor changes 2017-04-17 16:45:51 -04:00
Jeremy Kauffman
e9c8abd307 rewards flow changes 2017-04-17 09:47:38 -04:00
Jeremy Kauffman
8d67d36ad9 views, rewards, fixes for no api, other fixes 2017-04-17 09:47:38 -04:00
Alex Liebowitz
9532f8b29a Publish: improve state management of names
Save the new name as soon as it's entered instead of after resolution,
so that it's possible to publish before the results from resolve()
and claim_list_mine() come back.
2017-04-17 09:47:38 -04:00
Jeremy Kauffman
9b4d8ec266 more show/purchase work 2017-04-17 09:47:38 -04:00
Alex Liebowitz
300264e364 Publish: add Terms of Service agreement field 2017-04-17 09:47:38 -04:00
Jeremy Kauffman
280f98902c closer to real watch 2017-04-17 09:47:38 -04:00
Jeremy Kauffman
3b29be467b turn off things 2017-04-17 09:47:38 -04:00
Alex Liebowitz
62db745c38 Publish: convert nsfw field to submit a boolean 2017-04-17 09:47:37 -04:00
Alex Liebowitz
83f43ab54f More improvements for better compatibility with new claim format
- Update Pending Files cache to match format more closely
 - Except null instead of string for pending publishes
2017-04-17 09:47:37 -04:00
Jeremy Kauffman
736d769fa6 minor fixes, cost cache 2017-04-17 09:47:37 -04:00
Jeremy Kauffman
c8c97e97ca update 2017-04-17 09:47:37 -04:00
Alex Liebowitz
dabedf38a1 Update and refactor pending publish caching system for channels 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
b38998dc18 more fixes 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
a5d1695084 more tweaks and turn off auth 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
cb4af24cd7 more clean up and fixes 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
0313ba941a approaching acceptable 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
0ba69ff32b stashed cleanup 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
029b0b9c3a more 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
cbb3da2795 rebase fix 1 of n 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
ecf54f400b mostly garbage 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
575db85477 so far 2017-04-17 09:46:51 -04:00
Alex Liebowitz
326d066353 Fixes to Email page
Still not actually working (doing it in the welcome screen right
now)
2017-04-17 09:46:51 -04:00
Alex Liebowitz
1dbbf8fc01 Style tweaks 2017-04-17 09:46:51 -04:00
Alex Liebowitz
7f8bf8a2e2 Add Welcome screen 2017-04-17 09:46:51 -04:00
Alex Liebowitz
5587d2f0f5 Convert Register page to Email page 2017-04-17 09:46:51 -04:00
Alex Liebowitz
8964398c2e Register page fixes 2017-04-17 09:46:51 -04:00
Alex Liebowitz
892607174a Reward: style and formatting tweaks 2017-04-17 09:46:51 -04:00
Alex Liebowitz
3749e0393a Reward: add error handling
Also adds Notice component
2017-04-17 09:46:51 -04:00
Alex Liebowitz
c374a59af8 Add access token and wallet address to GitHub reward 2017-04-17 09:46:50 -04:00
Alex Liebowitz
6cc2892399 More progress on Rewards
* Add wrapper for lbry.io API
 * View and basic logic for GitHub reward (not working yet)
2017-04-17 09:46:50 -04:00
Alex Liebowitz
c5d4941535 Basic views for reward and reward list pages 2017-04-17 09:46:50 -04:00
Alex Liebowitz
a7050303c2 My Files: pass signing info into file tiles 2017-04-11 00:21:08 -04:00
Alex Liebowitz
d7644c0394 My Files: include channel names in URIs 2017-04-11 00:15:50 -04:00
Alex Liebowitz
c49d229eef Publish: name resolution bugfixes 2017-04-11 00:12:34 -04:00
Alex Liebowitz
7e8fdf625f Style fixes and cleanup
- Remove a couple of unused files from lbry.js
 - Couple of style fixes
2017-04-10 21:55:35 -04:00
Alex Liebowitz
326493c0b7 Publish: use new discover() RPC method 2017-04-10 21:55:35 -04:00
Alex Liebowitz
562f7dd399 Update Watch page for channels 2017-04-10 21:55:35 -04:00
Alex Liebowitz
a80b2da5c2 Update Show page for channels 2017-04-10 21:55:34 -04:00
Alex Liebowitz
f8e3eff378 Update My Files for channel compatibility 2017-04-10 21:55:34 -04:00
Alex Grintsvayg
5ce9319b07 switch to get_unused_address whe loading wallet page 2017-04-10 18:02:22 -04:00
Alex Liebowitz
797f9eafdc Publish: Add rudimentary error handling when creating new channels 2017-04-10 04:09:01 -04:00
Alex Liebowitz
6c68eb5e2b Publish: Add length check for new channel names 2017-04-10 04:08:43 -04:00
Alex Liebowitz
a9cb0abcc6 Publish: Rename "None" new channel option to "Anonymous" 2017-04-10 04:07:48 -04:00
Alex Liebowitz
b599e5343c Publish: wait for new channel to appear before updating list 2017-04-10 04:06:15 -04:00
Alex Liebowitz
f91653ff2d Publish: add ability to choose and create channels 2017-04-08 08:37:27 -04:00
Alex Liebowitz
461f5f95d9 Add new channel auth status indicator to file tiles 2017-04-08 08:37:27 -04:00
Alex Grintsvayg
d1314ccee1 renamed config value 2017-03-29 11:07:29 -04:00
Jeremy Kauffman
2a0cf1d6db Merge branch 'master' into fast_pages 2017-03-27 09:46:47 -04:00
Jeremy Kauffman
dc13de7160 make page changes fast 2017-03-26 14:30:18 -04:00
Alex Grintsvayg
2a7a36db15 no faultstring in jsonrpc 2 2017-03-25 10:22:02 -04:00
Alex Grintsvayg
5322e935a7 minor 2017-03-17 18:23:29 -04:00
Alex Grintsvayg
20064ee558 some progress, but needs more work 2017-03-17 18:05:25 -04:00
Alex Liebowitz
a2af284ccf Update Watch logic for new API wrapper
Also was using some keys that are no longer available from file_list -
fixed that
2017-03-14 12:35:39 -04:00
Alex Liebowitz
6a46ccc565 Change nOut to nout
Needed for compatibility with this lbrynet change:
https://github.com/lbryio/lbry/pull/513
2017-03-10 15:37:56 -05:00
Alex Liebowitz
a5feefe294 Use updated key name in file_list (was lbry_uri, now name) 2017-03-09 17:55:17 -05:00
Alex Liebowitz
3b428c394c Convert UI to use outpoints for unique IDs
This covers *almost* everything. There are a couple of places that
still use names or SD hashes because the APIs haven't been updated
yet.
2017-03-09 17:55:17 -05:00