Commit Graph

10650 Commits

Author SHA1 Message Date
Luke
f60c2911b9 Merge pull request #2448 from MediaBrowser/dev
update mac project
2017-02-06 13:46:08 -05:00
Luke
d2d287bd28 update mac project 2017-02-06 13:45:24 -05:00
Luke
9504146f3c Merge pull request #2446 from MediaBrowser/dev
Dev
2017-02-06 01:52:35 -05:00
Luke Pulverenti
730dd523c0 fix merge conflict 2017-02-06 01:52:21 -05:00
Luke Pulverenti
4704d22944 version bump 2017-02-06 01:51:02 -05:00
Luke Pulverenti
1bf1cfda89 3.2 2017-02-06 01:09:54 -05:00
Luke
2ceaa50ea7 Merge pull request #2445 from MediaBrowser/beta
Beta
2017-02-06 01:08:55 -05:00
Luke Pulverenti
84d2a5303b fix merge conflict 2017-02-06 01:08:09 -05:00
Luke Pulverenti
b35051463b restore features 2017-02-06 01:05:34 -05:00
Luke
6f1a300bde Merge pull request #2444 from MediaBrowser/dev
Dev
2017-02-06 01:05:11 -05:00
Luke Pulverenti
f94353250f disable input modifiers for now 2017-02-06 01:04:38 -05:00
Luke Pulverenti
2a34c30313 update input params 2017-02-06 01:03:01 -05:00
Luke Pulverenti
fab2e0c227 3.1.295 2017-02-05 15:47:29 -05:00
Luke
a10d94b747 Merge pull request #2441 from MediaBrowser/dev
Dev
2017-02-05 15:47:02 -05:00
Luke Pulverenti
d218dbd2a1 add cancellation to socket methods 2017-02-05 15:44:08 -05:00
Luke Pulverenti
c857b1cb2c 3.1.294 2017-02-04 18:35:03 -05:00
Luke
77b0cabfee Merge pull request #2440 from MediaBrowser/dev
Dev
2017-02-04 18:34:40 -05:00
Luke Pulverenti
bd8753dbc8 force guide refresh 2017-02-04 18:34:01 -05:00
Luke Pulverenti
851364f84f rework guide mappings 2017-02-04 18:32:16 -05:00
Luke Pulverenti
ac3ec6d185 update image saver 2017-02-04 16:22:55 -05:00
Luke Pulverenti
0d10100d6c 3.1.293 2017-02-03 16:20:26 -05:00
Luke Pulverenti
ad801bfe32 3.1.7000 2017-02-03 16:17:56 -05:00
Luke
2906764298 Merge pull request #2439 from MediaBrowser/dev
Dev
2017-02-03 16:15:57 -05:00
Luke Pulverenti
9c86c8fe2b add library monitor error handling 2017-02-03 15:52:56 -05:00
Luke Pulverenti
a8428c70d9 3.1.292 2017-02-02 11:10:17 -05:00
Luke
ccd544112c Merge pull request #2438 from MediaBrowser/dev
Dev
2017-02-02 11:09:58 -05:00
Luke
29898ce538 Merge pull request #2433 from daknin/nfosavers_duplicated_iexternalids
Update NfoSavers so they don't duplicate user defined IExternalIds
2017-02-02 11:08:45 -05:00
Luke
39d6dbd78c Merge pull request #2437 from MediaBrowser/dev
Dev
2017-02-02 11:08:05 -05:00
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