Commit graph

127 commits

Author SHA1 Message Date
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
bb16156034 re-enable rewards 2017-05-19 12:17:19 -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
c8f7cb2110 Update FormField to use new Electron file/directory selector 2017-05-12 07:31:33 -04:00
Alex Liebowitz
044d3612c2 Add FileSelector component 2017-05-12 07:31:23 -04:00
Jeremy Kauffman
c1161fc10b mainly more bug fixes 2017-05-11 19:28:43 -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
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