12 commits

Author	SHA1	Message	Date
Jeremy Kauffman	36a992343f	much progress towards a working merge	2017-05-03 23:44:08 -04:00
6ea86b96	2547d85751	Fix file card stream loading text	2017-05-02 19:37:15 -04:00
6ea86b96	1d16c73cf4	More refactoring/fixing of file actions, tiles, etc	2017-05-02 19:34:01 -04:00
6ea86b96	b0f32aebc7	Refactoring	2017-05-02 19:30:28 -04:00
6ea86b96	13008f5f31	Videos playing properly immediately after purchase	2017-05-02 19:29:10 -04:00
6ea86b96	e0b78368ab	Playing videos working better	2017-05-02 19:25:06 -04:00
6ea86b96	674fafd31a	Able to watch already downloaded videos	2017-05-02 19:23:52 -04:00
6ea86b96	67b79fc3a0	Search working	2017-05-02 19:22:44 -04:00
6ea86b96	bb9a71805b	Loading show page content fast, resolving cost and file info. ... Rewards and uploaded/downloaded files currently broken	2017-05-02 19:16:42 -04:00
6ea86b96	6c4ad8cee9	Starting on downloaded/published content	2017-05-02 19:13:01 -04:00
6ea86b96	5c3772dc86	Featured content	2017-05-02 19:10:35 -04:00
6ea86b96	ecd2063fed	Progress on featured content	2017-05-02 19:07:46 -04:00