Commit Graph

8969 Commits

Author SHA1 Message Date
Luke
6c48a2ecdc Merge pull request #2003 from MediaBrowser/dev
Dev
2016-07-31 01:10:17 -04:00
Luke Pulverenti
bbd4431f79 update shared components 2016-07-31 00:11:23 -04:00
Luke Pulverenti
a0d65d7e8c 3.1.82 2016-07-30 19:26:08 -04:00
Luke
6a83362146 Merge pull request #2002 from MediaBrowser/dev
fix detail images
2016-07-30 19:25:27 -04:00
Luke
e7f0dda38f Merge pull request #2001 from MediaBrowser/dev
Dev
2016-07-30 17:22:41 -04:00
Luke Pulverenti
235d341524 force audio stream copy when audio transcoding is not allowed 2016-07-30 15:22:35 -04:00
Luke Pulverenti
62b0c2605f remove nameof 2016-07-30 15:19:46 -04:00
Luke Pulverenti
1bd3b22c81 update service stack config 2016-07-30 13:52:06 -04:00
Luke Pulverenti
6af3dc91c5 adjust audio transcoding bitrate 2016-07-30 00:21:26 -04:00
Luke Pulverenti
32abd342e1 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-07-29 22:47:20 -04:00
Luke
cb994c3e7a Merge pull request #1985 from softworkz/MediaFixes
Fix audio stream for channel media and some minor corrections
2016-07-29 21:35:54 -04:00
Luke
b8da908175 Merge pull request #1997 from SvenVandenbrande/dev
Clean Up code
2016-07-29 21:29:49 -04:00
Luke
f6d8f2d550 Merge pull request #1999 from softworkz/NotificationIcon
Fix: Emby notification icon remained visible after shutdown
2016-07-29 21:12:36 -04:00
softworkz
f7c3ee1c68 Fix: Emby notification icon remained visible after shutdown
Also implemented the recommended pattern for IDisposable.
2016-07-30 01:45:20 +02:00
Luke Pulverenti
d174f64183 begin unifying card layouts 2016-07-29 16:06:58 -04:00
Sven Van den brande
219cba7506 Removed redundant Collection Initializers
Removed Using directives that are not required
2016-07-29 21:18:03 +02:00
Luke Pulverenti
4be3ee433b 3.0.6020 2016-07-29 12:01:11 -04:00
Luke
43000d269b Merge pull request #1996 from MediaBrowser/beta
Beta
2016-07-29 12:00:41 -04:00
Luke Pulverenti
100236f416 fix merge conflict 2016-07-29 11:59:37 -04:00
Luke
9f12df23ab Merge pull request #1995 from MediaBrowser/dev
Dev
2016-07-28 19:50:26 -04:00
Luke Pulverenti
c944d0d7cc 3.1.81 2016-07-28 16:24:28 -04:00
Luke
abebb17e3a Merge pull request #1994 from MediaBrowser/dev
Dev
2016-07-28 16:22:57 -04:00
Luke Pulverenti
74f511b2ee update components 2016-07-28 16:21:54 -04:00
Luke Pulverenti
9b98d8b2e1 update stream management 2016-07-28 02:29:14 -04:00
Luke Pulverenti
2fb082cbf3 update notifications 2016-07-28 01:55:47 -04:00
Luke Pulverenti
2c861ca793 update notifications 2016-07-28 01:19:24 -04:00
Luke Pulverenti
4ebe3a1f0d restore version 2016-07-27 16:24:35 -04:00
Luke Pulverenti
5eb4cb87f5 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-07-27 16:22:45 -04:00
Luke Pulverenti
f593230e44 fix current image deletion in image saver 2016-07-27 16:22:30 -04:00
Luke
40530f7293 update mac project 2016-07-27 15:44:28 -04:00
Luke Pulverenti
7d52078470 3.0.6010 2016-07-27 15:33:53 -04:00
Luke
8d4ffda405 Merge pull request #1993 from MediaBrowser/master
merge from master
2016-07-27 15:32:47 -04:00
Luke
8e915ba5ba Merge pull request #1992 from MediaBrowser/master
merge from master
2016-07-27 15:32:30 -04:00
Luke
06b0cfb86f Merge pull request #1991 from MediaBrowser/beta
Beta
2016-07-27 15:32:07 -04:00
Luke Pulverenti
b785e919f3 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-07-27 15:31:31 -04:00
Luke Pulverenti
b3db8fdb0d fix merge conflict 2016-07-27 15:31:19 -04:00
Luke
897e056629 Merge pull request #1990 from MediaBrowser/dev
Dev
2016-07-27 14:42:17 -04:00
Luke
69ecd8e604 Merge pull request #1989 from MediaBrowser/dev
update components
2016-07-27 13:54:25 -04:00
Luke Pulverenti
f238005d2b update components 2016-07-27 13:26:10 -04:00
Luke Pulverenti
0ab7174548 3.1.80 2016-07-27 13:18:53 -04:00
Luke
359be978ba Merge pull request #1988 from MediaBrowser/dev
Dev
2016-07-27 13:18:30 -04:00
Luke Pulverenti
4f32b57e58 update buffer sizes 2016-07-27 13:11:25 -04:00
Luke Pulverenti
308233ceba update translations 2016-07-27 13:11:05 -04:00
Luke Pulverenti
dc855e3c60 3.1.79 2016-07-27 02:29:41 -04:00
Luke
a99ba6ce60 Merge pull request #1986 from MediaBrowser/dev
Dev
2016-07-27 02:26:48 -04:00
Luke Pulverenti
2fed4c1ab8 keep season/episode info up to date 2016-07-27 02:24:59 -04:00
Luke Pulverenti
eb78381a35 update resource loading 2016-07-27 00:54:38 -04:00
softworkz
267ada923c ChannelMediaInfo: Create audio stream even when there is no video 2016-07-27 03:01:54 +02:00
Luke Pulverenti
e4e87e24a1 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-07-26 13:28:47 -04:00
Luke Pulverenti
f539c9894c remove unused code 2016-07-26 13:21:27 -04:00