Jeremy Kauffman
60d298b354
Merge remote-tracking branch 'origin/master' into redux
2017-05-09 16:58:48 -04:00
Jeremy Kauffman
9c02327b26
merge plus some bug fixes
2017-05-09 16:12:48 -04:00
6ea86b96
786f57e787
Fix search results html
2017-05-09 14:33:01 +07: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
225921c0a4
Use HTML from master file tile stream
2017-05-07 14:07:40 +07:00
6ea86b96
d2c97d3460
Back button working properly
2017-05-06 23:31:47 +07:00
6ea86b96
fb3d366fe0
Fix upgrading and start on history
2017-05-06 00:05:33 +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
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
Alex Liebowitz
536c5391fb
Make error modals display full screen properly
...
Was not passing in the generic modal-overlay class. (ExpandableModal
doesn't provide it automatically so you can omit it and make a totally
custom overlay if you want.)
2017-05-05 00:46:10 -04:00
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
e1e172a11e
Switch to https://github.com/Selz/plyr video player (recommended by @fillerino).
2017-05-02 19:43:34 -04:00
6ea86b96
44ad47c05f
Fix publish page link in router
2017-05-02 19:41:37 -04:00
6ea86b96
513555e402
Fix for timed out content
2017-05-02 19:40:42 -04:00
6ea86b96
6d35eb69c5
File tile stream fixes
2017-05-02 19:40:42 -04:00
6ea86b96
001d5e21f1
Get rewards page working
2017-05-02 19:40:42 -04:00
6ea86b96
b97703dc3c
Refactor UriIndicator
2017-05-02 19:38:14 -04:00
6ea86b96
2547d85751
Fix file card stream loading text
2017-05-02 19:37:15 -04:00
6ea86b96
3c31a9fca1
Published files working
2017-05-02 19:36:31 -04:00
6ea86b96
84a2f48c24
Increase deactivate search timeout
2017-05-02 19:35:59 -04:00
6ea86b96
1d549ff258
Fix purchasing from file actions and allow content to be watched when being
...
downloaded from file actions download link
2017-05-02 19:35:59 -04:00
6ea86b96
7a6dd93886
Downloaded file list kind of working. Not sure about sort.
2017-05-02 19:35:59 -04:00
6ea86b96
e1d23667bc
Fix NSFW blurring on search and make search show/hide smarter
2017-05-02 19:35:22 -04:00
6ea86b96
1d16c73cf4
More refactoring/fixing of file actions, tiles, etc
2017-05-02 19:34:01 -04:00
6ea86b96
f08ce3d300
A bunch of improvements and broken the back of the file rendering code now
2017-05-02 19:31:34 -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
0d658b2767
Playing videos actually working now
2017-05-02 19:27:57 -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
768326fb4a
Working on search
2017-05-02 19:20:53 -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
6ea86b96
089572880f
Wallet progress
2017-05-02 18:47:03 -04:00
Jeremy Kauffman
cee2f2a626
watch page is ded
2017-05-02 18:37:54 -04:00
Jeremy Kauffman
a123ace686
remove console
2017-05-02 18:37:54 -04:00
Jeremy Kauffman
d5b411b572
fix drawer highlight and drawer balance
2017-05-02 18:37:54 -04:00
6ea86b96
3d5e1db5e3
Redux proof of concept
2017-05-02 18:37:19 -04:00
6ea86b96
0d3647c709
Redux proof of concept
2017-05-02 18:24:21 -04:00
Jeremy Kauffman
13e198f20e
releasable?
2017-05-02 10:21:33 -04:00
Jeremy Kauffman
3f923550f1
fixes, channel page stubs
2017-05-02 10:21:33 -04:00
Jeremy Kauffman
5b11c2575a
still not quite releasable, but much progress
2017-05-02 10:21:33 -04:00
