Commit graph

27 commits

Author SHA1 Message Date
Jeremy Kauffman 2172555096 change prettier options 2017-06-06 17:19:12 -04:00
Sean Yesmunt c8b949f020 format with prettier 2017-06-05 21:21:55 -07:00
Mayesters 81afbf8d70 Merge branch 'master' into i18n 2017-06-02 18:11:54 +02:00
6ea86b96 912933d4e7
Sync loading between file actions and video player 2017-06-02 14:40:40 +07:00
6ea86b96 8505959c22 Use render-media to render audio and images 2017-06-02 14:11:59 +07:00
6ea86b96 fa66f4e918 Fix download progress for recontructing files 2017-06-02 14:11:59 +07:00
Mayesters 313cea5580 fix master merge translations 2017-05-31 12:55:32 +02:00
Mayesters 31190ea5b0 Merge branch 'master' into i18n 2017-05-31 12:48:49 +02:00
Jeremy Kauffman c3eb921685 Merge branch 'master' into autoplay 2017-05-30 17:18:04 -04:00
6ea86b96 230e6e2d70 Fix autoplaying 2017-05-30 23:16:41 +04:00
Jeremy Kauffman 2bdc2ce268 fix close modal in video component 2017-05-30 14:12:07 -04:00
Mayesters 1a3c20a637 Translated updated components 2017-05-28 18:56:01 +02:00
Mayesters 804c9a646b Merge branch 'master' into i18n 2017-05-28 18:46:31 +02:00
6ea86b96 37344b3517
Stop blowing up if user attempts to download before cost info fetched 2017-05-28 18:24:10 +04:00
Intnick 0119ed8edc filaActions and fileCard components translated 2017-05-26 09:02:37 +02: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 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
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
6ea86b96 513555e402 Fix for timed out content 2017-05-02 19:40:42 -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 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