Commit graph

148 commits

Author SHA1 Message Date
Intnick c3df03d4fc initial merge 2017-05-25 19:12:02 +02: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