Commit Graph

11639 Commits (141e5b56b0a9c2cdf125314abc68e61dd414bda9)
 

Author SHA1 Message Date
Luke Pulverenti 19c3ad643c fix merge conflict
7 years ago
Luke df084015e2 Merge pull request #2823 from MediaBrowser/dev
7 years ago
Luke e42e343a41 Merge pull request #2821 from MediaBrowser/dev
7 years ago
Luke Pulverenti ee5fdd4120 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
7 years ago
Luke Pulverenti 6e99f798fb 3.2.27.1
7 years ago
Luke Pulverenti 8bd3b9f8d8 3.2.27.0
7 years ago
Luke f245ce4408 Merge pull request #2820 from MediaBrowser/master
7 years ago
Luke e4aa9b187d Merge pull request #2819 from MediaBrowser/master
7 years ago
Luke Pulverenti 9d08144d04 Merge branch 'master' of https://github.com/MediaBrowser/Emby
7 years ago
Luke Pulverenti df81e5fdbd remove mono sln
7 years ago
Luke 2a194ebf84 Merge pull request #2817 from MediaBrowser/beta
7 years ago
Luke fc94896bf7 Merge pull request #2816 from MediaBrowser/dev
7 years ago
Luke a8f894215d update mac project
7 years ago
Luke dc578f3742 Merge pull request #2815 from MediaBrowser/beta
7 years ago
Luke Pulverenti f6ed934a7e fix merge conflict
7 years ago
Luke 7f200f057d Merge pull request #2814 from MediaBrowser/dev
7 years ago
Luke Pulverenti 0951819f00 fixes #2798, fixes #2799
7 years ago
Luke 6939a6189e Merge pull request #2813 from MediaBrowser/dev
7 years ago
Luke 49ff97148b Merge pull request #2812 from MediaBrowser/dev
7 years ago
Luke 4c6f0bc826 Merge pull request #2811 from MediaBrowser/dev
7 years ago
Luke Pulverenti 9c5bfeddca expand on hardware decoding options
7 years ago
Luke 2c4e8c479f Merge pull request #2809 from MediaBrowser/dev
7 years ago
Luke Pulverenti 4ea3925626 auto fallback from gpu to cpu
7 years ago
Luke 738c8eeac4 Merge pull request #2808 from MediaBrowser/dev
7 years ago
Luke Pulverenti 6b28eee2db rework episode queries
7 years ago
Luke b0271c44c1 Merge pull request #2807 from MediaBrowser/dev
7 years ago
Luke Pulverenti cf350f3b7e expand on hardware decoding options
7 years ago
Luke 3237fd9e5e Merge pull request #2806 from MediaBrowser/dev
7 years ago
Luke Pulverenti b7867214ef update download error handling
7 years ago
Luke aff4fc649b Merge pull request #2804 from MediaBrowser/dev
7 years ago
Luke Pulverenti a7db7cd40c reduce traffic from session player
7 years ago
Luke Pulverenti 900714c866 consolidate fields
7 years ago
Luke d93d9754c9 Merge pull request #2803 from MediaBrowser/dev
7 years ago
Luke Pulverenti 773c00861e 3.2.26.20
7 years ago
Luke Pulverenti e7425e6205 revert servicestack.text update
7 years ago
Luke c6f98843ff Merge pull request #2802 from MediaBrowser/dev
7 years ago
Luke Pulverenti c147b64de8 3.2.26.19
7 years ago
Luke d0deb755d6 Merge pull request #2801 from MediaBrowser/dev
7 years ago
Luke Pulverenti 059724ce26 AllowUnsafeBlocks
7 years ago
Luke c2996935c8 Merge pull request #2800 from MediaBrowser/dev
7 years ago
Luke Pulverenti 7a74c705e5 3.2.26.18
7 years ago
Luke Pulverenti 8e054319b6 update mac project
7 years ago
Luke Pulverenti 40442f887b consolidate emby.server.core into emby.server.implementations
7 years ago
Luke Pulverenti 52aeb3c40b consolidate interfaces
7 years ago
Luke ab834f8fdf Merge pull request #2797 from MediaBrowser/dev
7 years ago
Luke Pulverenti cc679f3561 3.2.26.17
7 years ago
Luke Pulverenti 994720c24a deprecate hddvd videotype
7 years ago
Luke e9bf2e4132 Merge pull request #2796 from MediaBrowser/dev
7 years ago
Luke Pulverenti 6d78824c8e update components
7 years ago
Luke Pulverenti 27c490c152 update file refresher
7 years ago