8 commits

Author	SHA1	Message	Date
Jeremy Kauffman	36a992343f	much progress towards a working merge	2017-05-03 23:44:08 -04:00
Jeremy Kauffman	d94ef70f60	more bug fixes	2017-05-02 19:49:02 -04:00
6ea86b96	44ad47c05f	Fix publish page link in router	2017-05-02 19:41:37 -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	ecd2063fed	Progress on featured content	2017-05-02 19:07:46 -04:00
6ea86b96	089572880f	Wallet progress	2017-05-02 18:47:03 -04:00
6ea86b96	0d3647c709	Redux proof of concept	2017-05-02 18:24:21 -04:00