Commit Graph

10507 Commits (a73eeac6869edc199c4d0915d07b6847d0c95524)
 

Author SHA1 Message Date
Luke Pulverenti a73eeac686 Merge branch 'master' of https://github.com/MediaBrowser/Emby
8 years ago
Luke Pulverenti c456490de4 3.2.3
8 years ago
Luke cd6b7f3bdc Merge pull request #2489 from MediaBrowser/beta
8 years ago
Luke Pulverenti c07e774ca9 fix merge conflict
8 years ago
Luke Pulverenti 5d5f4162eb 3.2.3
8 years ago
Luke Pulverenti 282934bd53 fix merge conflict
8 years ago
Luke 66a844e639 Merge pull request #2488 from MediaBrowser/dev
8 years ago
Luke Pulverenti 868f0afc95 3.2.3.1
8 years ago
Luke Pulverenti e5e73f82fa update references
8 years ago
Luke 30eb0e3bf2 update mac project
8 years ago
Luke a905945d8b Merge pull request #2487 from MediaBrowser/dev
8 years ago
Luke Pulverenti 972ca5e449 3.2.2.1
8 years ago
Luke Pulverenti cb5ae69fb9 fixes #2485 - mpeg4 is still trying to be transcoded by VAAPI
8 years ago
Luke 90853a3ab1 Merge pull request #2484 from MediaBrowser/dev
8 years ago
Luke Pulverenti 592c1a7f24 3.2.1.116
8 years ago
Luke Pulverenti c33b12ba7d update m3u channel mapping
8 years ago
Luke Pulverenti e391ee1b17 update components
8 years ago
Luke 8a8bf99550 Merge pull request #2483 from MediaBrowser/dev
8 years ago
Luke Pulverenti 34171a7507 if (string.IsNullOrWhiteSpace(result))
8 years ago
Luke Pulverenti 6847cac829 update recording conversion
8 years ago
Luke Pulverenti 76b456d5e8 add setting to prefer filename or embedded title
8 years ago
Luke e298968fe5 Merge pull request #2482 from MediaBrowser/dev
8 years ago
Luke Pulverenti 389d3f7629 3.2.1.114
8 years ago
Luke Pulverenti 8d3e94ffb1 update recording conversion
8 years ago
Luke Pulverenti c0e5494825 respect locked fields during media probe
8 years ago
Luke 76b5d08c06 Merge pull request #2481 from MediaBrowser/dev
8 years ago
Luke Pulverenti 45250b7874 3.2.1.113
8 years ago
Luke 64b095adec Merge pull request #2480 from MediaBrowser/dev
8 years ago
Luke Pulverenti 0d39e041db update urls
8 years ago
Luke 962a0f561d Merge pull request #2479 from MediaBrowser/dev
8 years ago
Luke Pulverenti e7ebc598c8 3.2.1.112
8 years ago
Luke Pulverenti 5d55b36487 make more classes portable
8 years ago
Luke 15df2ec3e9 Merge pull request #2478 from MediaBrowser/dev
8 years ago
Luke Pulverenti de3ca87a76 3.2.1.111
8 years ago
Luke Pulverenti 149d16a314 preserve manual recording overrides
8 years ago
Luke aa9605ed7b Merge pull request #2477 from MediaBrowser/dev
8 years ago
Luke Pulverenti 5d8fd7ce39 3.2.1.110
8 years ago
Luke Pulverenti d8f48e8cdf update components
8 years ago
Luke Pulverenti 0ee1a0d7bd fix mapping multiple tuner channels to same epg channel
8 years ago
Luke Pulverenti 00760f7d24 update .net core project
8 years ago
Luke 0c4f78be3a Merge pull request #2476 from MediaBrowser/dev
8 years ago
Luke Pulverenti f52df8d612 3.2.1.109
8 years ago
Luke Pulverenti 6091e00e18 clean related files when deleting items
8 years ago
Luke Pulverenti 36f8eb1149 add db startup error handling
8 years ago
Luke 94dc4da335 Merge pull request #2474 from MediaBrowser/dev
8 years ago
Luke Pulverenti b51f00feb6 3.2.1.108
8 years ago
Luke e8714c2279 Merge pull request #2473 from MediaBrowser/dev
8 years ago
Luke Pulverenti f6590ebf27 update to sqlite 3.17.0
8 years ago
Luke Pulverenti 03317b291d improve subtitle responses
8 years ago
Luke Pulverenti aa290062d6 fix server restart
8 years ago