Commit Graph

10780 Commits

Author SHA1 Message Date
Luke Pulverenti
926b7fd42d fix merge conflict 2017-02-09 19:38:58 -05:00
Luke Pulverenti
7fdd180b20 fix merge conflict 2017-02-09 19:38:12 -05:00
Luke
57637565ca Merge pull request #2457 from MediaBrowser/dev
update mac project
2017-02-09 19:37:45 -05:00
Luke
9800463e59 update mac project 2017-02-09 19:36:55 -05:00
Luke
77f5b522a9 Merge pull request #2455 from MediaBrowser/dev
Dev
2017-02-09 19:16:09 -05:00
Luke Pulverenti
4bc2a77df1 3.2.1.100 2017-02-09 19:15:50 -05:00
Luke Pulverenti
9a59d12241 update channel image urls 2017-02-09 19:15:07 -05:00
Luke
9afc7ff900 Merge pull request #2454 from MediaBrowser/dev
Dev
2017-02-09 19:01:44 -05:00
Luke Pulverenti
35415d6a50 add error handling 2017-02-09 18:59:27 -05:00
Luke Pulverenti
6405f6c0c7 update xmltv parsing 2017-02-09 18:25:10 -05:00
Luke
38a32f7b90 Merge pull request #2453 from MediaBrowser/dev
Dev
2017-02-08 22:58:45 -05:00
Luke Pulverenti
1879999fd3 3.2.0.104 2017-02-08 22:58:25 -05:00
Luke Pulverenti
f1cfd3cffb add schedules direct error handling 2017-02-08 22:58:04 -05:00
Luke
1ec5e13cdc Merge pull request #2452 from MediaBrowser/dev
Dev
2017-02-08 16:31:35 -05:00
Luke Pulverenti
d6b4b5eeb0 3.2.0.103 2017-02-08 16:31:19 -05:00
Luke Pulverenti
1e28de1098 update channel mapping 2017-02-08 16:29:08 -05:00
Luke
52d496386f Merge pull request #2451 from MediaBrowser/dev
Dev
2017-02-08 15:00:36 -05:00
Luke Pulverenti
2fa03c19d4 3.2.0.102 2017-02-08 15:00:11 -05:00
Luke Pulverenti
4941aa4d14 assume interlaced for external plugins 2017-02-08 14:59:49 -05:00
Luke Pulverenti
aba4933a5c restore config setting 2017-02-08 14:52:21 -05:00
Luke Pulverenti
b67a106b5e attach user agent to omdb requests 2017-02-08 13:50:50 -05:00
Luke Pulverenti
8deb423883 restore config settings for now 2017-02-08 13:50:33 -05:00
Luke
b073cdc91f Merge pull request #2450 from MediaBrowser/dev
3.2.0.101
2017-02-07 13:36:41 -05:00
Luke Pulverenti
64b5600528 3.2.0.101 2017-02-07 13:36:12 -05:00
Luke
ab43339506 Merge pull request #2449 from MediaBrowser/dev
Dev
2017-02-07 13:35:29 -05:00
Luke Pulverenti
fbb1bb319c update wdtv live dlna profile 2017-02-07 13:33:15 -05:00
Luke Pulverenti
55d82df384 restore bsd messages 2017-02-07 03:23:45 -05:00
Luke Pulverenti
2079d75828 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2017-02-07 02:33:32 -05:00
Luke Pulverenti
e0d5f7d158 reduce device discovery traffic 2017-02-07 02:33:24 -05:00
Luke
345a619d93 update mac project 2017-02-06 13:47:45 -05:00
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