Commit Graph

11437 Commits

Author SHA1 Message Date
Luke Pulverenti
bfcd1b520f merge common implementations and server implementations 2017-08-16 02:43:41 -04:00
Luke Pulverenti
e3531534b8 3.2.27.2 2017-08-16 00:04:26 -04:00
Luke Pulverenti
d2b86edf05 update hdhr channel ids 2017-08-15 23:40:36 -04:00
Luke Pulverenti
ee5fdd4120 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2017-08-13 16:35:45 -04:00
Luke Pulverenti
6e99f798fb 3.2.27.1 2017-08-13 16:35:39 -04:00
Luke
f245ce4408 Merge pull request #2820 from MediaBrowser/master
master
2017-08-13 16:33:36 -04:00
Luke Pulverenti
9d08144d04 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2017-08-13 16:32:50 -04:00
Luke Pulverenti
df81e5fdbd remove mono sln 2017-08-13 16:32:43 -04:00
Luke
2a194ebf84 Merge pull request #2817 from MediaBrowser/beta
Beta
2017-08-13 16:31:54 -04:00
Luke
fc94896bf7 Merge pull request #2816 from MediaBrowser/dev
update mac project
2017-08-13 16:31:29 -04:00
Luke
a8f894215d update mac project 2017-08-13 16:30:53 -04:00
Luke
dc578f3742 Merge pull request #2815 from MediaBrowser/beta
Beta
2017-08-13 16:21:10 -04:00
Luke Pulverenti
f6ed934a7e fix merge conflict 2017-08-13 16:20:51 -04:00
Luke
7f200f057d Merge pull request #2814 from MediaBrowser/dev
fixes #2798, fixes #2799
2017-08-13 16:15:33 -04:00
Luke Pulverenti
0951819f00 fixes #2798, fixes #2799 2017-08-13 16:15:07 -04:00
Luke
6939a6189e Merge pull request #2813 from MediaBrowser/dev
update editor
2017-08-13 16:09:25 -04:00
Luke
49ff97148b Merge pull request #2812 from MediaBrowser/dev
update themes
2017-08-13 15:05:47 -04:00
Luke
4c6f0bc826 Merge pull request #2811 from MediaBrowser/dev
expand on hardware decoding options
2017-08-13 14:06:37 -04:00
Luke Pulverenti
9c5bfeddca expand on hardware decoding options 2017-08-13 14:05:46 -04:00
Luke
2c4e8c479f Merge pull request #2809 from MediaBrowser/dev
auto fallback from gpu to cpu
2017-08-13 01:01:57 -04:00
Luke Pulverenti
4ea3925626 auto fallback from gpu to cpu 2017-08-13 01:01:34 -04:00
Luke
738c8eeac4 Merge pull request #2808 from MediaBrowser/dev
rework episode queries
2017-08-12 22:09:32 -04:00
Luke Pulverenti
6b28eee2db rework episode queries 2017-08-12 22:09:07 -04:00
Luke
b0271c44c1 Merge pull request #2807 from MediaBrowser/dev
expand on hardware decoding options
2017-08-12 15:09:37 -04:00
Luke Pulverenti
cf350f3b7e expand on hardware decoding options 2017-08-12 15:09:13 -04:00
Luke
3237fd9e5e Merge pull request #2806 from MediaBrowser/dev
update download error handling
2017-08-11 17:56:12 -04:00
Luke Pulverenti
b7867214ef update download error handling 2017-08-11 17:55:48 -04:00
Luke
aff4fc649b Merge pull request #2804 from MediaBrowser/dev
Dev
2017-08-11 02:30:11 -04:00
Luke Pulverenti
a7db7cd40c reduce traffic from session player 2017-08-11 02:29:49 -04:00
Luke Pulverenti
900714c866 consolidate fields 2017-08-10 16:06:36 -04:00
Luke
d93d9754c9 Merge pull request #2803 from MediaBrowser/dev
Dev
2017-08-10 14:03:18 -04:00
Luke Pulverenti
773c00861e 3.2.26.20 2017-08-10 14:02:56 -04:00
Luke Pulverenti
e7425e6205 revert servicestack.text update 2017-08-10 14:01:31 -04:00
Luke
c6f98843ff Merge pull request #2802 from MediaBrowser/dev
3.2.26.19
2017-08-09 17:08:27 -04:00
Luke Pulverenti
c147b64de8 3.2.26.19 2017-08-09 17:08:01 -04:00
Luke
d0deb755d6 Merge pull request #2801 from MediaBrowser/dev
AllowUnsafeBlocks
2017-08-09 16:04:32 -04:00
Luke Pulverenti
059724ce26 AllowUnsafeBlocks 2017-08-09 16:04:13 -04:00
Luke
c2996935c8 Merge pull request #2800 from MediaBrowser/dev
Dev
2017-08-09 15:59:26 -04:00
Luke Pulverenti
7a74c705e5 3.2.26.18 2017-08-09 15:58:43 -04:00
Luke Pulverenti
8e054319b6 update mac project 2017-08-09 15:58:08 -04:00
Luke Pulverenti
40442f887b consolidate emby.server.core into emby.server.implementations 2017-08-09 15:56:38 -04:00
Luke Pulverenti
52aeb3c40b consolidate interfaces 2017-08-07 17:06:13 -04:00
Luke
ab834f8fdf Merge pull request #2797 from MediaBrowser/dev
Dev
2017-08-07 16:38:18 -04:00
Luke Pulverenti
cc679f3561 3.2.26.17 2017-08-07 16:37:26 -04:00
Luke Pulverenti
994720c24a deprecate hddvd videotype 2017-08-07 16:36:41 -04:00
Luke
e9bf2e4132 Merge pull request #2796 from MediaBrowser/dev
Dev
2017-08-06 19:01:30 -04:00
Luke Pulverenti
6d78824c8e update components 2017-08-06 19:01:00 -04:00
Luke Pulverenti
27c490c152 update file refresher 2017-08-06 01:50:37 -04:00
Luke
d8c2dd2532 Merge pull request #2795 from MediaBrowser/dev
Dev
2017-08-05 15:05:30 -04:00
Luke Pulverenti
804f19fc42 3.2.26.15 2017-08-05 15:05:05 -04:00