Commit Graph

11106 Commits

Author SHA1 Message Date
Luke Pulverenti
d2d49b6b76 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-10-20 15:27:31 -04:00
Luke Pulverenti
40255e6014 fix merge conflict 2016-10-20 15:27:27 -04:00
Luke Pulverenti
3c1114228b 3.1.196 2016-10-20 14:06:37 -04:00
Luke
f6afe90acd Merge pull request #2249 from MediaBrowser/dev
Dev
2016-10-20 14:04:17 -04:00
Luke Pulverenti
821d950234 allow specification of probing support 2016-10-20 14:02:42 -04:00
Luke Pulverenti
ccaf2f43a6 exclude mpeg4 with level -99 from vaapi 2016-10-20 02:36:34 -04:00
Luke Pulverenti
8576a2b2cf 3.1.195 2016-10-19 16:35:18 -04:00
Luke
b94f997a33 Merge pull request #2246 from MediaBrowser/dev
fix upnp with vlc android
2016-10-19 16:32:41 -04:00
Luke Pulverenti
b1f604b5e7 fix upnp with vlc android 2016-10-19 16:31:46 -04:00
Luke Pulverenti
2cbc7d5c65 3.1.194 2016-10-19 02:33:37 -04:00
Luke
b9c64d7e8d Merge pull request #2244 from MediaBrowser/dev
Dev
2016-10-19 02:32:34 -04:00
Luke Pulverenti
b7c6ffe013 handle x-png 2016-10-19 02:29:00 -04:00
Luke Pulverenti
7895b5457c removed dead code 2016-10-19 02:28:44 -04:00
Luke Pulverenti
f988413e4b update ssdp handler 2016-10-19 02:27:02 -04:00
Luke Pulverenti
d43111813e add user agent to m3u requests 2016-10-18 14:35:27 -04:00
Luke Pulverenti
d000cd4159 remote service restart 2016-10-18 14:30:50 -04:00
Luke Pulverenti
2f17d160bc limit number of people in dlna responses 2016-10-18 14:23:41 -04:00
Luke Pulverenti
5ad04bbb77 update components 2016-10-18 01:06:48 -04:00
Luke
dd6f9eb43e update mac 2016-10-17 16:08:47 -04:00
Luke Pulverenti
5e8181e34a 3.1.193 2016-10-17 13:08:10 -04:00
Luke
0fd99d2d08 Merge pull request #2242 from MediaBrowser/dev
Dev
2016-10-17 12:48:23 -04:00
Luke Pulverenti
b0a75f086e re-enable split by time 2016-10-17 12:46:49 -04:00
Luke Pulverenti
9fb7bd1367 try to fix unhandled exception in file refresher 2016-10-17 12:41:08 -04:00
Luke Pulverenti
716aef7e47 update video resolver 2016-10-17 12:40:43 -04:00
Luke Pulverenti
bba0c564c7 remove dead interface objects 2016-10-17 12:35:29 -04:00
Luke Pulverenti
b90b64aae8 3.0.8200 2016-10-17 12:34:11 -04:00
Luke
fb9db5c3c3 Merge pull request #2240 from MediaBrowser/beta
Beta
2016-10-17 12:32:57 -04:00
Luke Pulverenti
f8a248ffd8 fix merge conflict 2016-10-17 12:32:48 -04:00
Luke
b0147c32f9 Merge pull request #2241 from MediaBrowser/dev
Dev
2016-10-17 12:19:58 -04:00
Luke Pulverenti
ba613d5671 disable split by time 2016-10-17 12:18:12 -04:00
Luke Pulverenti
438871d6f4 3.1.192 2016-10-16 20:07:51 -04:00
Luke
0b70512cdc Merge pull request #2239 from MediaBrowser/dev
Dev
2016-10-16 20:07:27 -04:00
Luke Pulverenti
eb65dd8126 fix video getting marked unplayed when watching 2016-10-16 20:00:13 -04:00
Luke Pulverenti
5af8b02013 3.1.191 2016-10-16 13:16:45 -04:00
Luke
fa0795b65b Merge pull request #2238 from MediaBrowser/dev
Dev
2016-10-16 13:12:31 -04:00
Luke Pulverenti
55f47d2120 update recording defaults 2016-10-16 13:11:32 -04:00
Luke Pulverenti
401dc39e4c update translations 2016-10-16 12:17:32 -04:00
Luke
f87f16b6a1 Merge pull request #2237 from MediaBrowser/dev
update recording delete
2016-10-15 18:29:38 -04:00
Luke Pulverenti
79463d112c update recording delete 2016-10-15 18:29:16 -04:00
Luke Pulverenti
e9a0b284fc 3.1.190 2016-10-15 18:19:18 -04:00
Luke
69f5c28bad Merge pull request #2236 from MediaBrowser/dev
Dev
2016-10-15 18:17:32 -04:00
Luke Pulverenti
ac2ca1fec2 update recording dialogs 2016-10-15 18:12:16 -04:00
Luke
3d1db18b07 Merge pull request #2234 from MediaBrowser/dev
Dev
2016-10-14 12:36:35 -04:00
Luke Pulverenti
d517aadc1c update project 2016-10-14 12:31:51 -04:00
Luke Pulverenti
ddd6877624 3.1.189 2016-10-14 12:28:19 -04:00
Luke
68d52b85d1 Merge pull request #2233 from MediaBrowser/dev
update recording dialogs
2016-10-14 12:25:21 -04:00
Luke Pulverenti
360e666cc6 update recording dialogs 2016-10-14 12:22:04 -04:00
Luke Pulverenti
734d215940 3.0.8100 2016-10-13 17:20:36 -04:00
Luke
3f438cdf7b Merge pull request #2232 from MediaBrowser/beta
Beta
2016-10-13 17:19:50 -04:00
Luke Pulverenti
94ddbfd57f fix merge conflict 2016-10-13 17:19:38 -04:00