Commit Graph

6229 Commits (e83f84fb1f555bc830c57571f2e9e09b5b6663cd)
 

Author SHA1 Message Date
Luke Pulverenti 45a58de539 fix merge conflict
10 years ago
Luke Pulverenti 02aee9dc90 fix merge conflict
10 years ago
Luke Pulverenti 170f463664 mix merge conflicts
10 years ago
Luke Pulverenti 6de54e5ec7 fix merge conflict
10 years ago
Luke Pulverenti 60cd72b974 update channel item images
10 years ago
Luke Pulverenti 057c4b5494 support image placeholders
10 years ago
Luke Pulverenti fe5537f779 update EmbyTV
10 years ago
Luke Pulverenti b9699fde05 update schedules direct
10 years ago
Luke Pulverenti be1dad4a32 restore changes
10 years ago
Luke c379ebed06 Merge pull request #1278 from MediaBrowser/master
10 years ago
Luke Pulverenti 845bea9a64 sync with master
10 years ago
Luke Pulverenti 82058128d6 sync with master
10 years ago
Luke Pulverenti 5d5583b025 update sync
10 years ago
Luke Pulverenti d6418e6e9c update hls
10 years ago
Luke Pulverenti e01a79aca7 update live tv images
10 years ago
Luke Pulverenti c4fa6a28db update components
10 years ago
Luke Pulverenti 435c1416fc add hlsjs
10 years ago
Luke Pulverenti 2f525a0c1c update image provider
10 years ago
Luke Pulverenti 2267a17123 update schedules direct timeouts
10 years ago
Luke Pulverenti 8af05ef4ec update links
10 years ago
Luke Pulverenti 625a089737 update image provider
10 years ago
Luke Pulverenti 7568970fd6 update translations
10 years ago
Luke Pulverenti 95532c4e1e update cinema mode text
10 years ago
Luke Pulverenti b28be7e986 update cinema mode on/off setting
10 years ago
Luke Pulverenti 252dde1722 update components
10 years ago
Luke Pulverenti 904175ce26 update views
10 years ago
Luke Pulverenti 736d87fd7e switch recording provider to AddOrUpdate
10 years ago
Luke Pulverenti 2ee91249e5 revert channel manager changes
10 years ago
Luke Pulverenti 5013fddc2d update channel manager
10 years ago
Luke Pulverenti 9a3bc0a2e7 update view generation
10 years ago
Luke Pulverenti 2c52712c4e update intro provider
10 years ago
Luke Pulverenti 6186d2809f update cinema mode config
10 years ago
Luke Pulverenti e70782a478 update user view builder
10 years ago
Luke Pulverenti 35449735be add back CollectionType
10 years ago
Luke Pulverenti 664bcadbad update cinema mode config page
10 years ago
Luke Pulverenti a67c8df252 update ffmpeg
10 years ago
Luke Pulverenti 51d00cf3fd update queries
10 years ago
Luke 79b2415fdf Merge pull request #1275 from MediaBrowser/master
10 years ago
Luke Pulverenti da1595f9b0 update version
10 years ago
Luke Pulverenti c7af7f6d58 fix ImageByNameService
10 years ago
Luke Pulverenti 28ad359814 update SocketHttpListener
10 years ago
Luke Pulverenti 004960476f update querying
10 years ago
Luke Pulverenti 90b915256d 3.0.5781.2
10 years ago
Luke Pulverenti d9f062f5aa update queries
10 years ago
Luke Pulverenti 728a1ba610 added music folders view
10 years ago
Luke Pulverenti 72a0c2afeb update playlist query
10 years ago
Luke a45831cdcf Merge pull request #1273 from MediaBrowser/master
10 years ago
Luke Pulverenti a86d0a3585 update subtitles
10 years ago
Luke Pulverenti 3eda14eff0 fixes #1218 - Dlna server doesn't work after resuming to sleep
10 years ago
Luke Pulverenti 02b828a0e2 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
10 years ago