Commit graph

39 commits

Author SHA1 Message Date
Sean Yesmunt
0a7626fe49 remove un-necessary comment 2017-06-07 00:15:55 -07:00
Sean Yesmunt
46862a302e style loading spinner 2017-06-06 23:32:38 -07:00
Sean Yesmunt
708efba091 fix prop name 2017-06-06 22:42:01 -07:00
Sean Yesmunt
7a467f3635 move video-player and video-player-button into their own file 2017-06-06 22:36:12 -07:00
Sean Yesmunt
57a7d1db97 add internal video loading screen component 2017-06-06 21:12:45 -07:00
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
Jeremy Kauffman
c348f552cd Merge pull request #189 from 6ea86b96/play-more-file-types
Render all file types that render-media can handle
2017-06-05 11:40:11 -04:00
6ea86b96
1fd1b3c064 Render all file types that render-media can handle 2017-06-03 01:29:08 +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
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
Mayesters
469e769e01 lots of stuff translated 2017-05-28 17:52:23 +02:00
6ea86b96
862d711391
Add a message for when we're reconstructing a moved/deleted file before playback 2017-05-28 17:38:36 +04:00
6ea86b96
2bb5f9acc6 Fix playing videos that were deleted and require no cost info 2017-05-26 22:50:43 +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
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
Jeremy Kauffman
c1161fc10b mainly more bug fixes 2017-05-11 19:28:43 -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
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
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
ecd2063fed Progress on featured content 2017-05-02 19:07:46 -04:00