Commit Graph

10608 Commits

Author SHA1 Message Date
Luke
a30465fb70 Merge pull request #2022 from MediaBrowser/master
merge from master
2016-08-04 01:02:07 -04:00
Luke
a995218059 Merge pull request #2021 from MediaBrowser/master
merge from master
2016-08-04 01:01:42 -04:00
Luke
daf2d41c9d Merge pull request #2020 from MediaBrowser/beta
Beta
2016-08-04 01:01:18 -04:00
Luke
a3228edede Merge pull request #2019 from MediaBrowser/dev
fix search menus
2016-08-04 01:01:03 -04:00
Luke Pulverenti
c7798fcd48 3.0.6030 2016-08-04 00:55:45 -04:00
Luke
980b9baeb5 update mac project 2016-08-04 00:54:04 -04:00
Luke
87d7a7d85a Merge pull request #2018 from MediaBrowser/beta
Beta
2016-08-04 00:48:30 -04:00
Luke Pulverenti
73729ca242 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-08-04 00:48:01 -04:00
Luke Pulverenti
0c3b7a33c2 fix merge conflict 2016-08-04 00:47:50 -04:00
Luke Pulverenti
6af3bf94c0 3.1.89 2016-08-04 00:42:56 -04:00
Luke
8e3178ec0f Merge pull request #2017 from MediaBrowser/dev
Dev
2016-08-04 00:42:17 -04:00
Luke Pulverenti
39245133f8 remove people refresh retry 2016-08-04 00:38:58 -04:00
Luke Pulverenti
e08f5d5d61 don't keep retrying when metadata not found 2016-08-03 22:57:11 -04:00
Luke Pulverenti
3e23d32e62 update naming project 2016-08-03 13:26:42 -04:00
Luke Pulverenti
a5e0185da2 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-08-03 03:11:38 -04:00
Luke Pulverenti
b1a731f403 3.1.88 2016-08-03 03:11:26 -04:00
Luke
acef121119 Merge pull request #2014 from MediaBrowser/dev
fix sync methods
2016-08-03 03:08:37 -04:00
Luke Pulverenti
bbdbe79108 fix sync methods 2016-08-03 03:07:57 -04:00
Luke Pulverenti
81a5166cf4 3.1.87 2016-08-03 02:39:28 -04:00
Luke
5c005103b4 Merge pull request #2013 from MediaBrowser/dev
Dev
2016-08-03 02:39:04 -04:00
Luke Pulverenti
a363beb23c update probing 2016-08-03 02:38:27 -04:00
Luke Pulverenti
04d480297d reduce sync db access 2016-08-03 02:38:19 -04:00
Luke Pulverenti
7e1a0baf9b update media probe 2016-08-03 00:33:34 -04:00
Luke Pulverenti
a9cc5d5c44 add MediaMonkey dlna playback fix 2016-08-02 13:07:58 -04:00
Luke Pulverenti
fb6839f5e7 3.1.86 2016-08-02 02:00:17 -04:00
Luke
b90c18b7f3 Merge pull request #2011 from MediaBrowser/dev
Dev
2016-08-02 01:57:21 -04:00
Luke Pulverenti
a308ab8912 update components 2016-08-02 01:55:52 -04:00
Luke Pulverenti
fd53e18ee9 fix sync layout 2016-08-01 14:16:07 -04:00
Luke Pulverenti
c09cd95508 3.1.85 2016-08-01 12:34:58 -04:00
Luke
2e785b1537 Merge pull request #2009 from MediaBrowser/dev
Dev
2016-08-01 12:34:56 -04:00
Luke Pulverenti
5f71a615c4 reduce file system access by dlna manager 2016-08-01 01:08:52 -04:00
Luke Pulverenti
332426ddff update SocketHttpListener 2016-08-01 01:08:31 -04:00
Luke
ba6cba0b7f update mac project 2016-07-31 16:58:40 -04:00
Luke Pulverenti
fc9f6c2eb5 3.1.84 2016-07-31 15:08:54 -04:00
Luke
0731da9551 Merge pull request #2007 from MediaBrowser/dev
Dev
2016-07-31 15:08:18 -04:00
Luke Pulverenti
b4ad3a1658 removed dead code 2016-07-31 02:21:49 -04:00
Luke Pulverenti
733beb8516 3.1.83 2016-07-31 01:27:56 -04:00
Luke
7ee26240c1 Merge pull request #2006 from MediaBrowser/dev
update identifier
2016-07-31 01:26:57 -04:00
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