Commit graph

46 commits

Author SHA1 Message Date
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
Jeremy Kauffman 241a0118a2 Merge remote-tracking branch 'origin/master' into tear_down_this_wall 2017-06-08 20:03:11 -04:00
Jeremy Kauffman f2cabfb07a minor correction 2017-06-08 19:16:38 -04:00
Jeremy Kauffman 09ecae7e0d reviewable 2017-06-08 17:15:34 -04:00
Jeremy Kauffman 18a40defba mostly done? 2017-06-07 20:56:52 -04:00
Sean Yesmunt 11fa00504d switch to BEM naming pattern 2017-06-07 09:06:14 -07:00
Jeremy Kauffman ddd01855b0 slight progress 2017-06-07 11:50:44 -04:00
Sean Yesmunt 46862a302e style loading spinner 2017-06-06 23:32:38 -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 1fd1b3c064 Render all file types that render-media can handle 2017-06-03 01:29:08 +07:00
Jeremy Kauffman 0c41cbb823 error and auth fixes 2017-05-24 20:07:38 -04:00
Jeremy Kauffman a08a214d34 fix text areas and bug reporting 2017-05-21 18:34:12 -04:00
Jeremy Kauffman f60d17f604 Merge branch 'redux' into file-selector 2017-05-19 09:11:32 -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 5605b10f54 more bug fixes and bugs 2017-05-12 13:14:06 -04:00
Alex Liebowitz 044d3612c2 Add FileSelector component 2017-05-12 07:31:23 -04:00
Jeremy Kauffman 36a992343f much progress towards a working merge 2017-05-03 23:44:08 -04:00
Jeremy Kauffman 13e198f20e releasable? 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
Jeremy Kauffman a8d85d7c1d allow anyone with lbc into early access 2017-04-20 10:45:45 -04:00
Alex Liebowitz 7644566ef5 Add ability to display non-styled prices and credit amounts 2017-04-17 17:19:18 -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 9b4d8ec266 more show/purchase work 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 c8c97e97ca update 2017-04-17 09:47:37 -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 029b0b9c3a more 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 7b7e361bdd Add notification bar
Used for displaying global info (e.g. "you just got a reward.")
Can be displayed from anywhere in the app using events.
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 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 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 3e2b675e7b Add channel indicator component 2017-04-08 08:37:27 -04:00
Jeremy Kauffman dc13de7160 make page changes fast 2017-03-26 14:30:18 -04:00
Alex Grintsvayg 05d4a07312 Add 'ui/' from commit 'efc28c6644b7970403e3a11523cbf6e336eee52d'
git-subtree-dir: ui
git-subtree-mainline: 3886c7bf2c
git-subtree-split: efc28c6644
2017-03-09 12:11:46 -05:00