Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-23 22:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
6471 commits 23 branches 76 tags 1.3 GiB
Commit graph

6471 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Pulverenti 14f3bb6b19 update channels 2015-12-29 11:22:30 -05:00
Luke Pulverenti 771db85d09 adjust segment length for safari 2015-12-29 11:13:43 -05:00
Luke Pulverenti 8d1877d43f increase hdhomerun bitrates 2015-12-29 11:12:33 -05:00
Luke Pulverenti 7424457737 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-12-28 22:46:04 -05:00
Luke Pulverenti 81fe296786 restore changes 2015-12-28 22:45:56 -05:00
Luke 667fe4f509 Merge pull request #1379 from MediaBrowser/beta 
merge from beta
 2015-12-28 22:45:08 -05:00
Luke Pulverenti 7dca92f8a0 fix merge conflicts 2015-12-28 22:44:52 -05:00
Luke Pulverenti eab4fc6480 3.0.5800.1 2015-12-28 22:43:45 -05:00
Luke Pulverenti 8998f906c6 update local address detection 
Conflicts:
	MediaBrowser.Server.Startup.Common/ApplicationHost.cs
 2015-12-28 22:43:18 -05:00
Luke Pulverenti b46ef16ba8 update local address detection 2015-12-28 22:39:38 -05:00
Luke Pulverenti 971808f38f restore change 2015-12-28 22:39:24 -05:00
Luke Pulverenti bbc96a5277 Merge branch 'beta' into dev 2015-12-28 22:34:08 -05:00
Luke Pulverenti 5d4682d418 Merge branch 'dev' into beta 2015-12-28 22:33:10 -05:00
softworkz 2ed5c3d0e7 Fixed missing episode and season numbers when searching for episodes by date 2015-12-28 22:11:48 -05:00
Luke 50a16452a9 Merge pull request #1377 from softworkz/SearchEpisodeByAirDate 
Fixed missing episode and season numbers when searching for episodes by date
 2015-12-28 22:11:13 -05:00
softworkz 9063827bab Fixed missing episode and season numbers when searching for episodes by date 2015-12-29 03:59:23 +01:00
Luke Pulverenti 309710c1aa fix merge conflict 2015-12-28 16:10:51 -05:00
Luke Pulverenti ef644ca8a9 update SocketHttpListener 2015-12-28 16:08:03 -05:00
Luke Pulverenti 06467da312 update SocketHttpListener 2015-12-28 16:06:32 -05:00
Luke 6b9e7d0f12 Merge pull request #1375 from MediaBrowser/master 
update email
 2015-12-28 14:00:23 -05:00
Luke d3a8ab8926 Merge pull request #1374 from MediaBrowser/master 
update email
 2015-12-28 14:00:14 -05:00
Luke 0b3ec059c3 Merge pull request #1373 from MediaBrowser/master 
add tuner error handling
 2015-12-28 13:42:42 -05:00
Luke a7c7446bd0 Merge pull request #1372 from MediaBrowser/master 
add tuner error handling
 2015-12-28 13:42:34 -05:00
Luke Pulverenti de1495763f add tuner error handling 2015-12-28 13:41:53 -05:00
Luke f31efcb62d fixes #1124 - Download Missing Images does not work when Item is locked 2015-12-28 12:53:31 -05:00
Luke 16a77047d3 Merge pull request #1371 from MediaBrowser/master 
throttle tmdb requests
 2015-12-28 12:28:18 -05:00
Luke 3231c07ae1 Merge pull request #1370 from MediaBrowser/master 
throttle tmdb requests
 2015-12-28 12:28:06 -05:00
Luke Pulverenti 2743b79f02 throttle tmdb requests 2015-12-28 12:27:37 -05:00
Luke 5ab6f9b503 Merge pull request #1369 from MediaBrowser/beta 
update SocketHttpListener
 2015-12-27 21:16:55 -05:00
Luke Pulverenti c4c78f029f update SocketHttpListener 2015-12-27 21:16:35 -05:00
Luke e4c58d3abd Merge pull request #1368 from MediaBrowser/beta 
update SocketHttpListener
 2015-12-27 21:05:43 -05:00
Luke Pulverenti 192ef5d639 update SocketHttpListener 2015-12-27 21:04:02 -05:00
Luke Pulverenti 9750739a86 version bump 2015-12-27 16:49:04 -05:00
Luke baf0b7a7ce Merge pull request #1367 from MediaBrowser/beta 
Beta
 2015-12-27 16:46:55 -05:00
Luke Pulverenti b66d279cf5 fix merge conflict 2015-12-27 16:46:43 -05:00
Luke Pulverenti 5196a97ebd fix merge conflict 2015-12-27 16:45:57 -05:00
Luke Pulverenti 25ff78a8a3 fix merge conflict 2015-12-27 16:44:50 -05:00
Luke Pulverenti dd0888d680 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-12-27 16:43:38 -05:00
Luke Pulverenti 88153d3875 fix merge conflict 2015-12-27 16:43:31 -05:00
Luke Pulverenti b3f8e538c4 3.0.5800.0 2015-12-27 16:42:46 -05:00
Luke 9a0c7333ff Merge pull request #1366 from MediaBrowser/master 
3.0.5782.0
 2015-12-27 16:42:04 -05:00
Luke Pulverenti 03118de6b7 fix merge conflict 2015-12-27 16:41:54 -05:00
Luke 1e4ecf4798 Merge pull request #1365 from MediaBrowser/master 
3.0.5782.0
 2015-12-27 16:41:03 -05:00
Luke Pulverenti 8eddcc2346 3.0.5782.0 2015-12-27 16:40:36 -05:00
Luke Pulverenti 6eb5d34af1 update subtitle encoder to allow format passthrough 2015-12-27 16:07:28 -05:00
Luke 47f3571aea fixes #1145 - Improve support for daily episodes 2015-12-27 14:40:21 -05:00
Luke Pulverenti 1e470a15d6 restore changes 2015-12-27 14:32:01 -05:00
Luke 78e6d1b80f Merge pull request #1363 from MediaBrowser/beta 
merge from beta
 2015-12-27 14:28:14 -05:00
Luke Pulverenti 12e7118be4 fix merge conflict 2015-12-27 14:28:00 -05:00
Luke Pulverenti 5e445b65f3 fix merge conflict 2015-12-27 14:25:37 -05:00