Commit graph

9577 commits

Author SHA1 Message Date
Luke Pulverenti e7e0a1ecfc fix merge conflict 2016-12-18 00:42:21 -05:00
Luke Pulverenti ae1110219d fix merge conflicts 2016-12-18 00:35:28 -05:00
Luke Pulverenti 9dfbaf461e 3.0.8500 2016-11-03 13:03:06 -04:00
Luke Pulverenti 9780e2317d fix loss of audio 2016-11-03 12:54:56 -04:00
Luke Pulverenti 968e0f088f fix subtitle encoding in certain situations 2016-11-03 02:31:41 -04:00
Luke Pulverenti 7ace9d6535 3.0.8400 2016-10-30 14:44:42 -04:00
Luke Pulverenti 6d0270db18 remove subtitle history 2016-10-30 14:37:42 -04:00
Luke Pulverenti 1031daa9b0 normalize subtitle names 2016-10-30 12:24:11 -04:00
Luke Pulverenti 4e11e351ee update IsTextSubtitleStream 2016-10-30 12:23:56 -04:00
Luke Pulverenti 6c0f6b5c37 update startup timeout 2016-10-30 01:37:47 -04:00
Luke Pulverenti 0ee4767b8c Don't use library monitor for internal folders 2016-10-30 01:37:16 -04:00
Luke Pulverenti 19008e342e set year on programs 2016-10-30 01:37:07 -04:00
Luke Pulverenti 654b13b263 update intro provider 2016-10-30 01:36:58 -04:00
Luke Pulverenti 8626eded8d add null check to omdb 2016-10-30 01:35:10 -04:00
Luke Pulverenti 63c6f85bd0 add null check to subtitle task 2016-10-30 01:34:46 -04:00
Luke Pulverenti 54c5f6e2d8 update music dlna 2016-10-30 01:33:08 -04:00
Luke Pulverenti 7debfaa4bd remove audio channel limit from transcoding conditions 2016-10-30 01:32:23 -04:00
Luke Pulverenti 6b0a59c7db update saving of production locations 2016-10-30 01:31:46 -04:00
Luke b7f949a902 update mac project 2016-10-21 14:39:52 -04:00
Luke Pulverenti c0621fd701 3.0.8300 2016-10-20 15:30:20 -04:00
Luke 367e17826e Merge pull request #2250 from MediaBrowser/beta
Beta
2016-10-20 15:27:40 -04:00
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