Commit Graph

6820 Commits

Author SHA1 Message Date
Luke
3cdfd57ee0 Merge pull request #1390 from MediaBrowser/master
merge from master
2016-01-02 18:43:17 -05:00
Luke Pulverenti
5e3b9e80ad fix merge conflicts 2016-01-02 18:42:39 -05:00
Luke Pulverenti
a8c482ba7e fix merge conflict 2016-01-02 18:27:01 -05:00
Luke Pulverenti
895f4a1be4 fix merge conflict 2016-01-02 18:26:29 -05:00
Luke Pulverenti
e76d198a86 fix merge conflict 2016-01-02 18:26:05 -05:00
Luke Pulverenti
0e3dc12460 restore changes 2016-01-02 18:20:08 -05:00
Luke
d9867229b9 Merge pull request #1389 from MediaBrowser/master
Merge from master
2016-01-02 18:18:51 -05:00
Luke Pulverenti
24f58d720f fix merge conflict 2016-01-02 18:18:14 -05:00
Luke Pulverenti
475529ec7f fix merge conflict 2016-01-02 18:13:46 -05:00
Luke Pulverenti
c0c663a174 fix merge conflict 2016-01-02 18:12:56 -05:00
Luke Pulverenti
24f86b72aa 3.0.5784.0 2016-01-02 18:11:58 -05:00
Luke Pulverenti
687f17f09a better caching of remote data
Conflicts:
	MediaBrowser.Api/System/SystemService.cs
2016-01-02 18:09:53 -05:00
Luke Pulverenti
6f02073540 better caching of remote data 2016-01-02 17:59:27 -05:00
Luke Pulverenti
821e824687 better caching of remote data 2016-01-02 16:54:37 -05:00
Luke Pulverenti
4bf13f7754 set channel media type 2016-01-02 16:51:08 -05:00
Luke Pulverenti
0c42154c12 3.0.5783.0 2015-12-31 14:20:49 -05:00
Luke Pulverenti
4a3e542bb2 3.0.5800.3 2015-12-30 17:33:43 -05:00
Luke Pulverenti
5064b89ee9 allow realtime monitor under linux 2015-12-30 17:09:36 -05:00
Luke Pulverenti
966ab9b012 add artists to music dlna 2015-12-30 14:52:06 -05:00
Luke Pulverenti
34479cfe3d allow realtime monitor under linux 2015-12-30 14:51:52 -05:00
Luke Pulverenti
58fff1100e update tmdb throttle 2015-12-30 13:09:27 -05:00
Luke Pulverenti
b435564791 add serverId to the log 2015-12-30 13:06:14 -05:00
Luke Pulverenti
4190c247a3 update tmdb throttle 2015-12-30 13:05:39 -05:00
Luke Pulverenti
c239aff2a9 update tmdb throttle 2015-12-30 13:04:17 -05:00
Luke Pulverenti
7f7d6cddcc add serverId to the log 2015-12-30 02:11:58 -05:00
Luke Pulverenti
544671c585 bump version 2015-12-29 21:58:25 -05:00
Luke Pulverenti
dbeea014aa fix merge conflict 2015-12-29 21:55:57 -05:00
Luke Pulverenti
defd80f2e1 update translations 2015-12-29 21:53:45 -05:00
Luke Pulverenti
22ada9b237 update translations 2015-12-29 21:53:23 -05:00
Luke Pulverenti
ee06dfbc50 update translations 2015-12-29 21:52:29 -05:00
Luke Pulverenti
69950ee6d5 update ClearImages 2015-12-29 21:48:18 -05:00
Luke Pulverenti
6b124fc736 handle non-local images in ClearImages 2015-12-29 21:43:23 -05:00
Luke Pulverenti
caf1af4ea2 handle non-local images in ClearImages 2015-12-29 21:43:16 -05:00
Luke Pulverenti
25d586366f handle non-local images in ClearImages 2015-12-29 21:42:17 -05:00
Luke Pulverenti
90b27f0e47 3.0.5800.2 2015-12-29 16:30:43 -05:00
Luke Pulverenti
213a596241 update WDTV Live profile 2015-12-29 16:26:07 -05:00
Luke Pulverenti
2a12cf9e8a update WDTV Live profile 2015-12-29 14:17:31 -05:00
Luke Pulverenti
c30bea9a70 update ping test 2015-12-29 14:07:25 -05:00
Luke Pulverenti
3a7329e414 update ping test 2015-12-29 14:06:32 -05:00
Luke
a30cfca862 Merge pull request #1383 from MediaBrowser/beta
Beta
2015-12-29 13:55:46 -05:00
Luke Pulverenti
2f75af8563 update ValidateSslCertificate 2015-12-29 12:15:19 -05:00
Luke
fc1faa65d4 Merge pull request #1382 from softworkz/ConfigCheckCertificate
ServerConfigurationManager: Check if a specified SSL certificate can be used when configuration is saved
2015-12-29 12:13:27 -05:00
Luke Pulverenti
3c75008483 update buffer 2015-12-29 12:11:12 -05:00
Luke Pulverenti
3f46d8ddd9 update buffer 2015-12-29 12:01:42 -05:00
Luke Pulverenti
8c8ad20465 update channels 2015-12-29 11:30:53 -05:00
Luke Pulverenti
ec1f721a99 adjust segment length for safari 2015-12-29 11:27:18 -05:00
Luke Pulverenti
36680906ff increase hdhomerun bitrates 2015-12-29 11:26:42 -05:00
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