michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,080 Commits 2 Branches 79 Tags 73 MiB
a19c6adcb7
Commit Graph

4080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke
59b1b866f8 Merge pull request #822 from timhobbs/upstream-master 
Fix for IE autoplay/controls
 2014-05-14 21:53:02 -04:00
Tim Hobbs
0bf6fdb5a4 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser into upstream-master 2014-05-14 18:46:44 -07:00
Luke Pulverenti
b6798f3370 save chapters in xml (not being read yet). 2014-05-14 16:55:16 -04:00
Luke Pulverenti
4b585e3148 save chapters in xml 2014-05-14 16:43:31 -04:00
Luke Pulverenti
8eb74757d7 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-05-14 16:20:24 -04:00
Luke
0b440f9780 Merge pull request #821 from timhobbs/upstream-master 
Fix for media player thumbs
 2014-05-14 14:44:26 -04:00
Luke Pulverenti
4097bf4c1b Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-05-14 14:04:32 -04:00
Luke Pulverenti
a46cbfa02b rework channel checking 2014-05-14 14:04:26 -04:00
Luke Pulverenti
be18983f91 possible fix for missing content 2014-05-14 10:15:33 -04:00
Luke Pulverenti
0eaba37c11 add library to front page 2014-05-13 20:46:45 -04:00
Luke Pulverenti
d4d10f6e43 add new subtitle preferences 2014-05-12 18:30:32 -04:00
Luke
bf0e9d36a9 Merge pull request #818 from thogil/subtitle_selection 
Updated default subtitle selection logic
 2014-05-12 15:19:16 -04:00
Thomas Gillen
a35fd77cd9 Updated default subtitle selection logic 2014-05-12 20:09:43 +01:00
Luke Pulverenti
9146ca9431 removed dead code 2014-05-12 14:09:12 -04:00
Luke Pulverenti
238aace4f1 comment 2014-05-12 14:08:50 -04:00
Luke Pulverenti
9ee91faae4 change param type 2014-05-12 14:08:07 -04:00
Luke Pulverenti
c3ce71bdc2 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-05-12 14:04:53 -04:00
Luke Pulverenti
dc3fa99ea5 stub out media stream selector 2014-05-12 14:04:42 -04:00
Luke Pulverenti
6314428830 Add remote control chapter menu 2014-05-12 14:04:25 -04:00
Luke
692d61cbb6 Merge pull request #817 from 7illusions/master 
PS3 Dlna fix
 2014-05-12 13:00:03 -04:00
fzetterlund
307be007ba PS3 DLNA fix 2014-05-12 18:47:22 +02:00
7illusions
baf5cf2544 Merge pull request #3 from MediaBrowser/master 
Sync with Master
 2014-05-12 16:55:07 +02:00
Luke Pulverenti
b9b568de13 updated nuget 2014-05-11 19:02:28 -04:00
Luke Pulverenti
0d605b8672 update subtitle interface 2014-05-11 18:38:10 -04:00
Luke
8bc41832e6 Merge pull request #816 from lalmanzar/master 
add VTT writer implementation
 2014-05-11 02:56:25 -04:00
Luis Miguel Almánzar
8f56b74d63 add VTT writer implementation 2014-05-11 02:29:44 -04:00
Luke Pulverenti
62ffe2c59d web client backdrops 2014-05-11 01:11:53 -04:00
Luke Pulverenti
40272d4a5c stub out subtitle writer 2014-05-11 00:47:48 -04:00
Luke
4e70530ba6 Merge pull request #815 from lalmanzar/master 
Implement parsers
 2014-05-11 00:39:24 -04:00
Luis Miguel Almánzar
5af374072d escape regex strings 2014-05-11 00:33:14 -04:00
Luis Miguel Almánzar
8a8e272cb7 implemented SSA Parser 2014-05-11 00:23:16 -04:00
Luis Miguel Almánzar
f2237b858a implemented SRT Parser 2014-05-10 22:29:51 -04:00
Luke
4e710ec0a4 Merge pull request #814 from lalmanzar/master 
handle empty fields result
 2014-05-10 14:09:54 -04:00
Luis Miguel Almánzar
fda8c64f9c handle empty fields result 2014-05-10 14:06:29 -04:00
Luke Pulverenti
4e81655239 updated mono build 2014-05-10 13:28:03 -04:00
Luke Pulverenti
b9a2af1fd5 added media stream helpers 2014-05-09 19:08:08 -04:00
Luke Pulverenti
eb6d72a4e2 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-05-09 15:43:15 -04:00
Luke Pulverenti
8619b5ab38 update translations 2014-05-09 15:43:06 -04:00
Luke
0f7c10660b Update README.md 2014-05-09 12:02:47 -04:00
Luke
ad4787a79c Update README.md 2014-05-09 12:02:12 -04:00
Luke Pulverenti
388e87a349 async open subtitles 2014-05-09 00:39:43 -04:00
Luke Pulverenti
b25bc74a7d Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 
Conflicts:
	MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
 2014-05-09 00:38:50 -04:00
Luke Pulverenti
d6ce2eacb5 async open subtitle methods 2014-05-09 00:38:21 -04:00
Luke Pulverenti
1a323767be Do better to make sure hls files are cleaned up 2014-05-09 00:38:12 -04:00
Luke Pulverenti
06a11c27d9 fixes #800 - Server is drowsy 2014-05-09 00:36:13 -04:00
Luke
71fd2d3cdf Merge pull request #813 from lalmanzar/master 
fix episodes subtitles pull
 2014-05-08 23:27:44 -04:00
Luis Miguel Almánzar
ad7af6355d fix episodes subtitles 2014-05-08 23:24:58 -04:00
Luke Pulverenti
a938d0854d updated nuget 2014-05-08 21:49:12 -04:00
Luke Pulverenti
dce9093ba1 split files into separate classes 2014-05-08 17:23:24 -04:00
Luke Pulverenti
e653b41000 removed implicit typing from the model project 2014-05-08 16:44:17 -04:00