Commit Graph

10622 Commits

Author SHA1 Message Date
Luke Pulverenti
45c13c0f8f fix merge conflict 2017-02-02 11:07:52 -05:00
Luke Pulverenti
5edaf12d40 move encoding methods to shared classes 2017-02-02 11:02:01 -05:00
Luke Pulverenti
f4a8f92d4c 3.1.291 2017-02-01 15:57:38 -05:00
Luke
7ab5db614f Merge pull request #2436 from MediaBrowser/dev
Dev
2017-02-01 15:57:05 -05:00
Luke Pulverenti
39e8e3cbe7 dummy up m3u channel numbers 2017-02-01 15:56:41 -05:00
Luke Pulverenti
819efd2a7d update EpisodeResolver 2017-02-01 15:56:28 -05:00
Luke Pulverenti
6b136b97ec update ordering of search results 2017-02-01 15:56:14 -05:00
Luke Pulverenti
30538f0731 improve video startup performance 2017-02-01 15:55:56 -05:00
Luke Pulverenti
1d849e3f25 update xmltv parsing 2017-02-01 02:47:12 -05:00
Luke Pulverenti
8cef129580 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2017-01-31 16:31:43 -05:00
Luke Pulverenti
27e51567e3 3.1.290 2017-01-31 16:31:32 -05:00
Luke
2531e551b2 Merge pull request #2434 from MediaBrowser/dev
Dev
2017-01-31 16:30:29 -05:00
Luke Pulverenti
bdf4cc0afa handle null channel number 2017-01-31 16:25:54 -05:00
Luke Pulverenti
fcdd8cf899 update xml tv show id 2017-01-31 16:25:42 -05:00
Luke Pulverenti
45398959d7 update media probe 2017-01-31 16:25:29 -05:00
Luke Pulverenti
ead2afcca0 update html preparation 2017-01-31 16:25:14 -05:00
Luke Pulverenti
9a0c5e3bda add NextMediaType 2017-01-31 16:24:57 -05:00
Luke Pulverenti
88bb75bec4 update people fetching 2017-01-31 16:20:01 -05:00
Luke Pulverenti
44687c2373 fix showing first episodes when next up empty 2017-01-31 16:15:22 -05:00
Darrell King
8e605ba613 Update NfoSavers so they don't duplicate user defined IExternalIds 2017-01-31 20:26:52 +00:00
Luke Pulverenti
91d82b582f 3.1.289 2017-01-30 16:39:32 -05:00
Luke
83dc609fa1 Merge pull request #2432 from MediaBrowser/dev
fix autoplay detection
2017-01-30 16:39:09 -05:00
Luke Pulverenti
bf7cbb331f 3.1.288 2017-01-29 19:35:40 -05:00
Luke
3c33e1bb4b Merge pull request #2430 from MediaBrowser/dev
Dev
2017-01-29 18:57:01 -05:00
Luke Pulverenti
ab026ab2de restore localized guids switch 2017-01-29 15:00:29 -05:00
Luke Pulverenti
853685b63b support subtitles with encoded recordings 2017-01-29 03:20:18 -05:00
Luke Pulverenti
c1b366e48c 3.1.287 2017-01-27 23:24:45 -05:00
Luke
fd93caf37f Merge pull request #2428 from MediaBrowser/dev
Dev
2017-01-27 23:23:19 -05:00
Luke Pulverenti
f616aee90b update xmltv parsing 2017-01-27 22:17:26 -05:00
Luke Pulverenti
558219132a minify resources 2017-01-27 22:16:59 -05:00
Luke Pulverenti
4ba2d73bf7 update drawer 2017-01-27 18:05:04 -05:00
Luke Pulverenti
b40250045a 3.1.5 2017-01-27 15:50:31 -05:00
Luke
b6958435b0 Merge pull request #2427 from MediaBrowser/beta
Beta
2017-01-27 15:49:53 -05:00
Luke Pulverenti
90420a7c23 resolve play to regression 2017-01-27 15:48:52 -05:00
Luke Pulverenti
8649cbc0cb resolve play to regression 2017-01-27 15:36:19 -05:00
Luke Pulverenti
7bc60836c3 remove dead code 2017-01-26 23:50:09 -05:00
Luke Pulverenti
8a252c8ad6 remove dead code 2017-01-26 23:15:05 -05:00
Luke Pulverenti
fb892d8b92 3.1.4 2017-01-26 23:02:16 -05:00
Luke
484f9a15a2 Merge pull request #2426 from MediaBrowser/beta
Beta
2017-01-26 23:01:32 -05:00
Luke Pulverenti
c14d8b0bbc remove specification of input decoders (for now) 2017-01-26 23:01:05 -05:00
Luke Pulverenti
338d5ee993 remove specification of input decoders (for now) 2017-01-26 22:58:53 -05:00
Luke Pulverenti
85fd32cc81 3.1.3 2017-01-26 15:41:03 -05:00
Luke
1cd5e20871 Merge pull request #2425 from MediaBrowser/beta
Beta
2017-01-26 15:40:15 -05:00
Luke Pulverenti
0d0e4ad695 fix merge conflict 2017-01-26 15:40:00 -05:00
Luke Pulverenti
3ff216f05a update ShortOverview 2017-01-26 15:27:12 -05:00
Luke Pulverenti
88d9b3d09d remove localized guids 2017-01-26 15:10:19 -05:00
Luke
9ebf9162ab Merge pull request #2424 from MediaBrowser/dev
Dev
2017-01-26 14:46:59 -05:00
Luke Pulverenti
aa881a9bfa Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2017-01-26 14:46:38 -05:00
Luke
44d41ad74c Merge pull request #2357 from quentinus95/patch-1
fix wrong start url in manifest.json
2017-01-26 14:44:46 -05:00
Luke
e2ae7f24f2 Merge pull request #2423 from MediaBrowser/dev
update mac project
2017-01-26 14:42:55 -05:00