Commit Graph

11354 Commits

Author SHA1 Message Date
Luke
cc9feb17c4 update mac project 2017-08-22 14:46:16 -04:00
Luke Pulverenti
42816d6c04 3.2.28.0 2017-08-20 15:06:21 -04:00
Luke Pulverenti
9ccdd71f29 fix quick play with play button 2017-08-20 15:06:05 -04:00
Luke
ff2f3108ee Merge pull request #2832 from MediaBrowser/beta
Beta
2017-08-19 16:06:14 -04:00
Luke Pulverenti
6b077f3f84 fix merge conflict 2017-08-19 16:06:00 -04:00
Luke
c58db90c95 Merge pull request #2827 from MediaBrowser/dev
Dev
2017-08-18 02:04:21 -04:00
Luke Pulverenti
883399caeb 3.2.27.3 2017-08-18 02:03:49 -04:00
Luke Pulverenti
a7dcf7191a add fixes for .net core 2017-08-17 16:19:02 -04:00
Luke Pulverenti
a57c887f7f update components 2017-08-16 13:30:16 -04:00
Luke Pulverenti
56263a9fa2 remove unused libs 2017-08-16 11:42:36 -04:00
Luke Pulverenti
bfcd1b520f merge common implementations and server implementations 2017-08-16 02:43:41 -04:00
Luke
d5a9db3af7 Merge pull request #2825 from MediaBrowser/dev
Dev
2017-08-16 00:04:49 -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
77d4791dc2 update version 2017-08-15 23:39:05 -04:00
Luke
292d0bb448 Merge pull request #2824 from MediaBrowser/beta
Beta
2017-08-15 23:38:49 -04:00
Luke Pulverenti
19c3ad643c fix merge conflict 2017-08-15 23:38:25 -04:00
Luke
df084015e2 Merge pull request #2823 from MediaBrowser/dev
fix scrollbars showing up on home screen in firefox
2017-08-15 23:37:27 -04:00
Luke
e42e343a41 Merge pull request #2821 from MediaBrowser/dev
Dev
2017-08-13 16:36:15 -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 Pulverenti
8bd3b9f8d8 3.2.27.0 2017-08-13 16:35:17 -04:00
Luke
f245ce4408 Merge pull request #2820 from MediaBrowser/master
master
2017-08-13 16:33:36 -04:00
Luke
e4aa9b187d Merge pull request #2819 from MediaBrowser/master
master
2017-08-13 16:33:18 -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