Commit Graph

10683 Commits (59f2463efd39e7e69f62dba7c20c4f8cfc96fe94)
 

Author SHA1 Message Date
Luke Pulverenti 58fad600c9 restore changes
8 years ago
Luke 264dda4d31 Merge pull request #2460 from MediaBrowser/master
8 years ago
Luke f1c7b86081 Merge pull request #2458 from MediaBrowser/beta
8 years ago
Luke Pulverenti 926b7fd42d fix merge conflict
8 years ago
Luke Pulverenti 7fdd180b20 fix merge conflict
8 years ago
Luke 57637565ca Merge pull request #2457 from MediaBrowser/dev
8 years ago
Luke 9800463e59 update mac project
8 years ago
Luke 77f5b522a9 Merge pull request #2455 from MediaBrowser/dev
8 years ago
Luke Pulverenti 4bc2a77df1 3.2.1.100
8 years ago
Luke Pulverenti 9a59d12241 update channel image urls
8 years ago
Luke 9afc7ff900 Merge pull request #2454 from MediaBrowser/dev
8 years ago
Luke Pulverenti 35415d6a50 add error handling
8 years ago
Luke Pulverenti 6405f6c0c7 update xmltv parsing
8 years ago
Luke 38a32f7b90 Merge pull request #2453 from MediaBrowser/dev
8 years ago
Luke Pulverenti 1879999fd3 3.2.0.104
8 years ago
Luke Pulverenti f1cfd3cffb add schedules direct error handling
8 years ago
Luke 1ec5e13cdc Merge pull request #2452 from MediaBrowser/dev
8 years ago
Luke Pulverenti d6b4b5eeb0 3.2.0.103
8 years ago
Luke Pulverenti 1e28de1098 update channel mapping
8 years ago
Luke 52d496386f Merge pull request #2451 from MediaBrowser/dev
8 years ago
Luke Pulverenti 2fa03c19d4 3.2.0.102
8 years ago
Luke Pulverenti 4941aa4d14 assume interlaced for external plugins
8 years ago
Luke Pulverenti aba4933a5c restore config setting
8 years ago
Luke Pulverenti b67a106b5e attach user agent to omdb requests
8 years ago
Luke Pulverenti 8deb423883 restore config settings for now
8 years ago
Luke b073cdc91f Merge pull request #2450 from MediaBrowser/dev
8 years ago
Luke Pulverenti 64b5600528 3.2.0.101
8 years ago
Luke ab43339506 Merge pull request #2449 from MediaBrowser/dev
8 years ago
Luke Pulverenti fbb1bb319c update wdtv live dlna profile
8 years ago
Luke Pulverenti 55d82df384 restore bsd messages
8 years ago
Luke Pulverenti 2079d75828 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
8 years ago
Luke Pulverenti e0d5f7d158 reduce device discovery traffic
8 years ago
Luke 345a619d93 update mac project
8 years ago
Luke f60c2911b9 Merge pull request #2448 from MediaBrowser/dev
8 years ago
Luke d2d287bd28 update mac project
8 years ago
Luke 9504146f3c Merge pull request #2446 from MediaBrowser/dev
8 years ago
Luke Pulverenti 730dd523c0 fix merge conflict
8 years ago
Luke Pulverenti 4704d22944 version bump
8 years ago
Luke Pulverenti 1bf1cfda89 3.2
8 years ago
Luke 2ceaa50ea7 Merge pull request #2445 from MediaBrowser/beta
8 years ago
Luke Pulverenti 84d2a5303b fix merge conflict
8 years ago
Luke Pulverenti b35051463b restore features
8 years ago
Luke 6f1a300bde Merge pull request #2444 from MediaBrowser/dev
8 years ago
Luke Pulverenti f94353250f disable input modifiers for now
8 years ago
Luke Pulverenti 2a34c30313 update input params
8 years ago
Luke Pulverenti fab2e0c227 3.1.295
8 years ago
Luke a10d94b747 Merge pull request #2441 from MediaBrowser/dev
8 years ago
Luke Pulverenti d218dbd2a1 add cancellation to socket methods
8 years ago
Luke Pulverenti c857b1cb2c 3.1.294
8 years ago
Luke 77b0cabfee Merge pull request #2440 from MediaBrowser/dev
8 years ago