Commit Graph

6298 Commits (304a04fc5e77d1738e9de26d1ff0d2919b024fb4)
 

Author SHA1 Message Date
Luke Pulverenti 304a04fc5e fix merge conflict
9 years ago
Luke e2041c049b Merge pull request #1328 from MediaBrowser/master
9 years ago
Luke Pulverenti 73b1e227d3 fix tvdb lookup by imdb id
9 years ago
Luke f9dca3b241 Merge pull request #1326 from MediaBrowser/master
9 years ago
Luke Pulverenti 791c6cbce1 revert roku change
9 years ago
Luke Pulverenti 88428cf5f7 update components
9 years ago
Luke Pulverenti 14d2d7ab32 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
9 years ago
Luke 9db23837ac Merge pull request #1324 from MediaBrowser/master
9 years ago
Luke Pulverenti a41ec47579 update project
9 years ago
Luke Pulverenti 22c15667b9 get api libs from bower
9 years ago
Luke Pulverenti bfda416579 update resizing params
9 years ago
Luke c7d433009b Merge pull request #1323 from MediaBrowser/master
9 years ago
Luke 6e9f147dda Merge pull request #1322 from MediaBrowser/master
9 years ago
Luke 26798b99ce Merge pull request #1321 from MediaBrowser/master
9 years ago
Luke 3709d75bbc Merge pull request #1320 from MediaBrowser/master
9 years ago
Luke c3b9858c57 Merge pull request #1319 from MediaBrowser/master
9 years ago
Luke d039344e46 Merge pull request #1318 from MediaBrowser/master
9 years ago
Luke Pulverenti 88126ac681 schedule recordings with a dialog
9 years ago
Luke 507688fdf6 Merge pull request #1317 from MediaBrowser/master
9 years ago
Luke 0c5d21832e Merge pull request #1316 from MediaBrowser/master
9 years ago
Luke Pulverenti b7fd6df165 version bump
9 years ago
Luke d85c3f3a33 Merge pull request #1314 from MediaBrowser/master
9 years ago
Luke Pulverenti 5c03b0d769 fix merge conflict
9 years ago
Luke Pulverenti 566f1f0ad8 update roku query string
9 years ago
Luke 93ae4aab76 Merge pull request #1312 from MediaBrowser/master
9 years ago
Luke Pulverenti 0f23e302e5 3.0.5781.6
9 years ago
Luke 0dfd5fc59e Merge pull request #1311 from MediaBrowser/master
9 years ago
Luke 4f14cfa342 Merge pull request #1309 from MediaBrowser/master
9 years ago
Luke Pulverenti f66be67898 update intro provider
9 years ago
Luke 48c0c39b3b Merge pull request #1308 from MediaBrowser/master
9 years ago
Luke 334a3bb841 Merge pull request #1307 from MediaBrowser/master
9 years ago
Luke e336c94b00 Merge pull request #1306 from MediaBrowser/master
9 years ago
Luke Pulverenti 8bce7960fe merge from dev
9 years ago
Luke Pulverenti 600b32d57a disable now playing bar animation for now
9 years ago
Luke Pulverenti d27cd521b5 rework dialog
9 years ago
Luke Pulverenti a586d98ac3 update version
9 years ago
Luke bc45919237 Merge pull request #1305 from MediaBrowser/master
9 years ago
Luke Pulverenti 4679f0aed6 fix merge conflict
9 years ago
Luke Pulverenti 1bd9ae8609 update MediaSourceManager
9 years ago
Luke Pulverenti ba1b7603eb get cryptojs from bower; rework voice dialog
9 years ago
Luke Pulverenti 7d36543318 adjust fileshare
9 years ago
Luke Pulverenti 33dffd2943 support dynamic bower path
9 years ago
Luke Pulverenti d78e2764d8 randomize people task default start time
9 years ago
Luke Pulverenti 9c31e7a933 update SocketHttpListener
9 years ago
Luke Pulverenti 2647cc6859 globalization fix
9 years ago
Luke Pulverenti d341cd39aa omit query string from segments on roku
9 years ago
Luke Pulverenti f83c7be727 omit query string from segments on roku
9 years ago
Luke Pulverenti 885565b41e update params when stream copying
9 years ago
Luke Pulverenti 049c13cec1 update params when stream copying
9 years ago
Luke Pulverenti 4999b47b47 update transcoding for chrome
9 years ago