Commit graph

242 commits

Author SHA1 Message Date
Jeremy Kauffman 6bfce16f2e remove typo in settings page 2017-06-09 17:23:08 -04:00
Jeremy Kauffman cfa3aa3bc4 Merge branch 'master' into fix-publish-my-claims-display 2017-06-09 10:49:12 -04:00
Alex Liebowitz 342afc6873 Fetch claim list on Publish page
Before, it would only receive the list of published claims if it had
already been fetched from previously viewing the My Files page
2017-06-09 06:58:20 -04:00
Jeremy Kauffman 9418e78046 restore purecomponent, remove console.log 2017-06-08 20:10:53 -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 f21bf287d9 Merge branch 'master' into should-component-update 2017-06-08 19:36:17 -04:00
Jeremy Kauffman 360a3d74c3 min of 0.01, fix parse call 2017-06-08 19:25:42 -04:00
Jeremy Kauffman 09ecae7e0d reviewable 2017-06-08 17:15:34 -04:00
6ea86b96 c78465227a
Don't allow negative numbers for access cost and less than 1 for identity 2017-06-08 23:25:34 +07:00
Sean Yesmunt e13d7c2149 use React.PureComponent 2017-06-07 21:42:19 -07:00
Jeremy Kauffman 18a40defba mostly done? 2017-06-07 20:56:52 -04:00
Jeremy Kauffman 4f65957287 not enough progress 2017-06-07 12:11:47 -04:00
Jeremy Kauffman a17d19038e good chunk of progress towards auth and rewards refactor / degating 2017-06-07 12:08:04 -04:00
6ea86b96 eb170b9720 Working on rewards refactor 2017-06-07 12:04:39 -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
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
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
Mayesters 77aa8c61b0 Fix commenting out of setting 2017-06-03 13:34:32 +02:00
6ea86b96 1fd1b3c064 Render all file types that render-media can handle 2017-06-03 01:29:08 +07: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
6ea86b96 8505959c22 Use render-media to render audio and images 2017-06-02 14:11:59 +07: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
Jeremy Kauffman 149d1ef61f fix version check on help 2017-05-31 12:22:50 -04:00
Mayesters 31190ea5b0 Merge branch 'master' into i18n 2017-05-31 12:48:49 +02:00
Mayesters dc2dfff148 fixed misstructured call 2017-05-31 12:33:39 +02:00
6ea86b96 5aca89ab63 Stop landing page content loading error from displaying all the time 2017-05-30 12:34:13 +04: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 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
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 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