Commit Graph

5006 Commits

Author SHA1 Message Date
Luke Pulverenti
799cc97352 Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev 2015-04-01 22:48:35 -04:00
Luke
2b40504d5b Merge pull request #1061 from MediaBrowser/master
resolve reverse proxy issue
2015-04-01 22:53:01 -04:00
Luke Pulverenti
f8927ceb06 resolve reverse proxy issue 2015-04-01 22:47:59 -04:00
Luke Pulverenti
967751d2a5 rework hls timer 2015-04-01 21:34:14 -04:00
Luke
f8667ab6c1 Merge pull request #1059 from MediaBrowser/master
release fixes
2015-04-01 18:01:56 -04:00
Luke Pulverenti
5d7f6b0744 Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev 2015-04-01 17:57:30 -04:00
Luke Pulverenti
b9f3944b7f rework media source methods 2015-04-01 17:56:32 -04:00
Luke Pulverenti
42e2369150 add missing PlaySessionId 2015-04-01 17:55:50 -04:00
Luke Pulverenti
ddbbe9ce4e post release housecleaning 2015-04-01 00:23:34 -04:00
Luke
be74de0236 Merge pull request #1058 from MediaBrowser/dev
3.0.5569.0
2015-03-31 15:41:12 -04:00
Luke Pulverenti
2626b6f372 3.0.5569.0 2015-03-31 15:35:58 -04:00
Luke Pulverenti
0bcc43098e fix handling of bare nfo's 2015-03-31 15:33:38 -04:00
Luke Pulverenti
2632093ebb updated nuget 2015-03-31 14:52:41 -04:00
Luke Pulverenti
5965afecde live tv fix 2015-03-31 14:50:08 -04:00
Luke Pulverenti
a025f4eefa sync updates 2015-03-31 12:24:16 -04:00
Luke Pulverenti
eaf70589ae update sync folder structure 2015-03-30 22:52:18 -04:00
Luke Pulverenti
90b5ba9222 update translations 2015-03-30 15:57:49 -04:00
Luke Pulverenti
07de09f350 sync updates 2015-03-30 15:57:37 -04:00
Luke Pulverenti
5f044cfd68 add setting to control transcodng throttle 2015-03-30 12:16:34 -04:00
Luke Pulverenti
0bd27381e0 sync updates 2015-03-29 23:04:55 -04:00
Luke Pulverenti
7f537ad149 sync updates 2015-03-29 19:47:31 -04:00
Luke Pulverenti
e035e032d0 3.0.5557.40000 2015-03-29 19:20:52 -04:00
Luke Pulverenti
5474215141 sync updates 2015-03-29 18:38:32 -04:00
Luke Pulverenti
66ea0b2566 updated nuget 2015-03-29 14:45:48 -04:00
Luke Pulverenti
10b9a865b7 update live stream handling 2015-03-29 14:31:28 -04:00
Luke Pulverenti
dd8dd1938a update live stream generation 2015-03-29 14:16:40 -04:00
Luke Pulverenti
a79962b7eb update live stream generation 2015-03-29 12:45:16 -04:00
Luke Pulverenti
87bf3bbb8f add device null check 2015-03-29 11:04:33 -04:00
Luke Pulverenti
578dec0c71 update stream generation 2015-03-29 00:56:39 -04:00
Luke Pulverenti
bd2ea703e3 implement modular media sources 2015-03-28 16:22:27 -04:00
Luke Pulverenti
3add1872c8 make sure appVersion is set 2015-03-28 14:55:00 -04:00
Luke Pulverenti
bda0b2f7c4 sync updates 2015-03-28 01:07:29 -04:00
Luke Pulverenti
d12bcc2d24 sync updates 2015-03-27 22:19:20 -04:00
Luke Pulverenti
d8cbd64917 fix mp4 sync encoding 2015-03-27 16:55:31 -04:00
Luke Pulverenti
d7a979979b sync updates 2015-03-27 00:42:41 -04:00
Luke Pulverenti
7773862fac fix subtitle syncing 2015-03-27 00:17:04 -04:00
Luke Pulverenti
dfaf935f5e update udp 2015-03-26 20:24:36 -04:00
Luke Pulverenti
5e07bdf93c sync fixes 2015-03-26 19:10:34 -04:00
Luke Pulverenti
7e312e75bb update stream sorting 2015-03-26 16:31:57 -04:00
Luke Pulverenti
8921e152ea removed dead code 2015-03-26 15:21:40 -04:00
Luke Pulverenti
cd99ad4366 use server to build stream url's 2015-03-26 15:18:21 -04:00
Luke Pulverenti
3ec7090c6e fixes #1015 - Segmented transcoding 2015-03-26 14:24:13 -04:00
Luke Pulverenti
348b8c4414 use server to build initial stream url's 2015-03-26 12:58:02 -04:00
Luke Pulverenti
46c9210749 Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev 2015-03-26 00:44:29 -04:00
Luke Pulverenti
70fb64cc05 subtitle parsing fixes 2015-03-26 00:44:24 -04:00
Luke
7731dc4fb5 Merge pull request #1052 from jabbera/dev
Fix null reference exception when awaiting null.
2015-03-25 22:32:19 -04:00
Mike
a1a6366833 Fix null reference exception when awaiting null.
DynamicImageProvider:CreateImageAsync was not marked as async. When returning null the await BaseDynamicImageProvider:FetchToFileInternal would throw a null reference exception. An alternative solution would be to wrap the null return in Task.FromResult.

Object reference not set to an instance of an object.
	System.NullReferenceException
	   at MediaBrowser.Server.Implementations.Photos.BaseDynamicImageProvider`1.<FetchToFileInternal>d__c.MoveNext() in c:\MediaBrowser\MediaBrowser.Server.Implementations\Photos\BaseDynamicImageProvider.cs:line 79
2015-03-25 21:30:26 -04:00
Luke Pulverenti
9f191a3598 sync fixes 2015-03-25 19:13:15 -04:00
Luke Pulverenti
5c597be7de added cloud sync logging message 2015-03-25 18:45:25 -04:00
Luke Pulverenti
febfc0ccfa add scripts 2015-03-25 14:32:10 -04:00