Commit graph

847 commits

Author SHA1 Message Date
Baltazar Gomez ac2a69c47d Merge branch 'master' into css_patch 2017-10-06 15:02:20 -06:00
Jeremy Kauffman 80f1cac4e5 drop developer page 2017-10-06 16:22:17 -04:00
Jeremy Kauffman 767630a985 finally killed client settings in lbry.js 2017-10-06 16:15:33 -04:00
Jeremy Kauffman 145e4c8b97 Merge pull request #641 from lbryio/redeemedrewards
change message if all rewards redeemed
2017-10-06 15:46:26 -04:00
Baltazar Gomez 57b6948212 Merge branch 'master' into css_patch 2017-10-05 10:39:44 -06:00
btzr-io 79895f6c7f more fixes :) 2017-10-04 22:13:06 -06:00
btzr-io 6cee8d7664 fixes for last review 2017-10-04 21:07:04 -06:00
Jeremy Kauffman 948ebe8500 fix bug introduced in previous commit 2017-10-03 17:55:41 -04:00
Jeremy Kauffman b8980c00d3 update upgrade message 2017-10-03 17:52:53 -04:00
btzr-io 9ea1e21f5b more minor fixes 2017-10-03 11:27:52 -06:00
btzr-io 5dcf15a5b9 minor fix for fileTile component 2017-10-03 10:59:08 -06:00
btzr-io dda98e81fa Merge https://github.com/lbryio/lbry-app into css_patch
merge master
2017-10-02 23:33:34 -06:00
btzr-io 87c4bd2047 add experimental fileTile styles 2017-10-02 23:05:11 -06:00
btzr-io fd99676307 update fonts and fix button font size 2017-10-02 22:08:25 -06:00
btzr-io 59778808e3 redesign for fileSelector component 2017-10-02 21:04:21 -06:00
Baltazar Gomez b66968d9f9 Merge branch 'master' into css_patch 2017-10-02 09:30:39 -06:00
Thomas Zarebczan 6759f9c320 update disabled reward text
This message appears when a user's account is manually disabled (rewards abuse, etc).  We don't reach out to them via email, so we should ask them to reach out if they are actually legitimate users.
2017-10-02 11:20:14 -04:00
Jeremy Kauffman a7a4e8dc16 remove channel length minimum, fixes #645 2017-10-02 08:40:42 -04:00
Jeremy Kauffman 92f3cf46e2 Merge branch 'fix-empty-channels' 2017-10-01 12:49:03 -04:00
Jeremy Kauffman 3539d78d0a prevent overwriting variable 2017-10-01 12:48:31 -04:00
Baltazar Gomez 45ca07115b Fix #643
Reset playing uri
2017-09-30 23:39:00 -06:00
Baltazar Gomez 449997ff6e fix #605
Don't play video if you can't pay for it :(
2017-09-30 20:50:32 -06:00
btzr-io 36c106e16c fix wrong page number 2017-09-30 09:36:13 -06:00
Thomas Zarebczan 7687f1ff93 change message if all rewards redeemed
Change failed message to: "There are no rewards available at this time, please check back later."

This scenario happens when all rewards are claimed. Not sure if it can be encountered any other time.
2017-09-30 11:31:28 -04:00
Baltazar Gomez ab3aa0501c fix for empty channels #636 2017-09-29 17:15:14 -06:00
Jeremy Kauffman ca6ef4e11f fix all step properties, removing publish or send minimums app-side 2017-09-29 16:51:36 -04:00
Jeremy Kauffman d39664a0fd fix #624, remove unnecessary settings state 2017-09-29 16:05:26 -04:00
Baltazar Gomez 2e28582277 Merge branch 'master' into css_patch 2017-09-28 20:30:27 -06:00
Baltazar Gomez 18450209b7 remove unnecessary title from discover page 2017-09-28 20:00:18 -06:00
Jeremy Kauffman f4b2c599c3 fix #615 2017-09-28 20:32:59 -04:00
Jeremy Kauffman 9308971cab use consistent step property on credit inputs #604 2017-09-26 15:57:56 -04:00
btzr-io 2c7cdfd43e minor css fixes
fix dark theme issues

minor css fix for #620
2017-09-26 10:56:21 -06:00
btzr-io ce889f2d3b add more focus on search
remove icon duplication

minor ux / ui fix
2017-09-26 00:45:49 -06:00
Jeremy Kauffman 342162cfcc Merge branch 'patch_edit' 2017-09-24 16:37:05 -04:00
btzr-io b6279febc5 show full path to prevent confusion 2017-09-24 16:33:31 -04:00
btzr-io a5f65d678d fix #606
tidy up

minor fix
2017-09-24 16:33:29 -04:00
btzr-io 6d38c0e322 fix #601
prefill price from uri

only working for edit button

revert last commit
2017-09-24 16:33:27 -04:00
Jeremy Kauffman 5c8db79b69 remove "showDeveloperMenu" as a setting 2017-09-22 19:10:38 -04:00
Jeremy Kauffman 4a23d13438 remove unnecessary lbry.js functions 2017-09-22 19:02:50 -04:00
Jeremy Kauffman 31cc95cf0e simplify balance check now that we are in redux land 2017-09-22 18:59:28 -04:00
Jeremy Kauffman b24b6e2e8e add labels, remove unused selectors 2017-09-22 18:34:19 -04:00
Alex Liebowitz 93b1ab8ac6 Add basics of Instant Purchase setting
Fix and simplify state management of Instant Purchas setting

Add Instant Purchase check to Watch page

Merge Max Purchase Price and Instant Purchase into one section

Wording still not finalized.

Add Instant Purchase setting names to constants

Support USD for Instant Purchase

On Settings page, use constants for new Instant Purchase settings

Convert Instant Purchase Maximum setting into FormRow

Update wording of Instant Purchase option and add helper text.

Wording still not final.

On Settings page, get Instant Purchase settings via selector

Update CHANGELOG.md
2017-09-22 18:34:16 -04:00
Jeremy Kauffman 7e9c8f2625 Merge pull request #587 from lbryio/show-local-channel
Show local file indicator on Channel page
2017-09-22 18:10:46 -04:00
Jeremy Kauffman 0a4e17af54 minor design changes 2017-09-22 17:48:35 -04:00
Alex Liebowitz bbfb0fea67 Add <IconSet /> component
This is a presentational component for horizontal banks of icons (and
sometimes other stuff).

Convert <FileCard /> and <FileTile /> to use <IconSet />

Factor out "downloaded/published" icon into its own component

Add Featured Content icon to file tiles

Add alignment style for Featured Content icon

Update CHANGELOG.md

Handle featured content icon adjustment in _icons.scss

Remove IconSet component

Converted back to a presentational span and move positioning styles
into card SCSS

Fix spacing between price and icons in file tiles and cards

Before, it would be missing the space if there was a "local file" icon
but no featured content icon.

Rewrite Icon component to use semantic icons

Now you can pass in a constant that indicates the meaning of the icon
within the interface, e.g. icons.FEATURED instead of "icon-rocket".
Also adds the appropriate title.

All icons should eventually be updated to use this.

Remove IconFeatured and IconLocal in favor of new Icon component

Add space between Featured and Local icons

In the conversion to a generic Icon component, we lost the styles that
added padding on the left for FeaturedIcon and LocalIcon.

Fix how rocket icon position is adjusted

Before, it was using a negative margin, which altered the shape of the
bounding box. Changed to use relative positioning.

Add support for styling LBRY icons

Move style for Featured icon into icons.js

Uses new class name format for LBRY icon styles
2017-09-22 17:48:30 -04:00
Jeremy Kauffman 4ed7d2cba9 bad solution for #544 2017-09-21 21:12:18 -04:00
Jeremy Kauffman cac00028c4 update invite reward check, fix infinite reward loop 2017-09-20 15:45:39 -04:00
Jeremy Kauffman 6b87369bbe transaction value fix 2017-09-20 15:27:25 -04:00
Jeremy Kauffman 7b7a63b892 disable anything cost related other than direct content cost 2017-09-20 13:20:02 -04:00
Jeremy Kauffman 33c5158818 channel navigation fixes 2017-09-20 13:12:53 -04:00