Commit Graph

7829 Commits

Author SHA1 Message Date
Luke Pulverenti
3386e8f8f7 Merge branch 'dev' into beta 2016-04-22 12:34:36 -04:00
Luke Pulverenti
87aa923d36 Merge branch 'beta' into dev 2016-04-22 12:33:55 -04:00
Luke Pulverenti
584e793a6d auto-organize fixes 2016-04-22 12:27:17 -04:00
Luke Pulverenti
c94706d6ee update shutdown 2016-04-22 12:12:20 -04:00
Luke Pulverenti
f3c3c74d84 add probe property 2016-04-21 14:00:46 -04:00
Luke Pulverenti
c59b4329f4 restore ForceLiveStream param 2016-04-21 00:04:57 -04:00
Luke Pulverenti
a38086126f update hls playback 2016-04-20 14:51:47 -04:00
Luke Pulverenti
55a4510fd3 3.0.5942 2016-04-20 12:05:25 -04:00
Luke
7af173a8d5 Merge pull request #1671 from MediaBrowser/master
merge from master
2016-04-20 11:59:05 -04:00
Luke
1dc81b3a6d Merge pull request #1670 from MediaBrowser/master
merge from master
2016-04-20 11:58:37 -04:00
Luke Pulverenti
389046fb3f update xml parsing logging 2016-04-20 11:57:44 -04:00
Luke
7207e0112f Merge pull request #1669 from MediaBrowser/dev
Dev
2016-04-20 11:56:38 -04:00
Luke Pulverenti
fe9ee3d891 remove duplicate originaltitle 2016-04-20 01:32:25 -04:00
Luke Pulverenti
992ca4c78a add OriginalTitle to metadata editor 2016-04-20 01:21:40 -04:00
Luke Pulverenti
ace1ad778e update xml parsing logging 2016-04-20 00:30:06 -04:00
Luke Pulverenti
9fa33fc220 switch lock from image to icon 2016-04-19 23:00:18 -04:00
Luke Pulverenti
316d8d3125 fix identify by imdb id 2016-04-19 22:40:04 -04:00
Luke
0a1e9299d3 Merge pull request #1668 from MediaBrowser/dev
Dev
2016-04-19 22:38:52 -04:00
Luke Pulverenti
98cfbd99ad update NAL usage 2016-04-19 22:38:36 -04:00
Luke Pulverenti
d9afd21ef5 don't use omdb for missing episodes 2016-04-19 22:38:24 -04:00
Luke Pulverenti
d12bc8596a finish removing cabac 2016-04-19 22:35:52 -04:00
Luke Pulverenti
8d230261a3 record nal length size 2016-04-19 22:35:38 -04:00
Luke Pulverenti
14548735f3 fix identify by imdb id 2016-04-19 22:28:24 -04:00
Luke Pulverenti
57b5fa73ee pull content rating from tmdb for series 2016-04-18 23:14:45 -04:00
Luke Pulverenti
779b880f5c 3.0.5941 2016-04-18 21:51:07 -04:00
Luke
60775ca53e Merge pull request #1667 from MediaBrowser/dev
Dev
2016-04-18 21:50:54 -04:00
Luke Pulverenti
5bdfe2b44e update package 2016-04-18 16:14:27 -04:00
Luke Pulverenti
636f4b7c5c 3.0.5940 2016-04-18 14:57:19 -04:00
Luke
dfe6dc0492 Merge pull request #1666 from MediaBrowser/dev
Dev
2016-04-18 14:57:00 -04:00
Luke Pulverenti
034ce31738 deprecate importCss 2016-04-18 14:01:50 -04:00
Luke Pulverenti
0ebb82dc57 update NAL usage 2016-04-18 13:43:00 -04:00
Luke Pulverenti
0528891303 update slideshow 2016-04-18 01:58:08 -04:00
Luke Pulverenti
1a69dee2e6 update version 2016-04-18 01:26:34 -04:00
Luke Pulverenti
16644d129b Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-04-18 01:26:06 -04:00
Luke Pulverenti
916b148274 don't use omdb for missing episodes 2016-04-18 00:25:43 -04:00
Luke Pulverenti
169554ccc4 finish removing cabac 2016-04-18 00:25:12 -04:00
Luke Pulverenti
2b4dece54a record nal length size 2016-04-17 23:50:44 -04:00
Luke
f07d699864 Merge pull request #1665 from MediaBrowser/master
3.0.5930
2016-04-17 17:08:37 -04:00
Luke
f60e8eaa85 Merge pull request #1664 from MediaBrowser/master
3.0.5930
2016-04-17 17:08:29 -04:00
Luke
dcee70a7c8 Merge pull request #1663 from MediaBrowser/master
merge from master
2016-04-17 17:07:47 -04:00
Luke Pulverenti
48ffa74da8 3.0.5930 2016-04-17 17:07:38 -04:00
Luke
761e7af6a3 Merge pull request #1662 from MediaBrowser/master
merge from master
2016-04-17 17:07:24 -04:00
Luke Pulverenti
e5e9ac500b Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-04-17 17:00:26 -04:00
Luke Pulverenti
fd042e230d fix version 2016-04-17 17:00:18 -04:00
Luke
bdc9e1c4a4 Merge pull request #1661 from MediaBrowser/beta
Beta
2016-04-17 16:59:53 -04:00
Luke Pulverenti
8b163221f7 fix merge conflict 2016-04-17 16:59:20 -04:00
Luke
d6673ca187 Merge pull request #1660 from MediaBrowser/dev
update version
2016-04-17 16:58:45 -04:00
Luke Pulverenti
565b3350a1 update version 2016-04-17 16:57:57 -04:00
Luke Pulverenti
ab4d226684 3.0.5939 2016-04-17 11:38:10 -04:00
Luke
88738b804f Merge pull request #1659 from MediaBrowser/dev
update inherited tags
2016-04-17 11:33:38 -04:00