Commit Graph

10649 Commits

Author SHA1 Message Date
Luke
3e2d74539c Merge pull request #2063 from MediaBrowser/dev
Dev
2016-08-16 01:54:40 -04:00
Luke Pulverenti
f66a25db1c fix merge conflict 2016-08-16 01:54:27 -04:00
Luke Pulverenti
14be817766 update WebMarkupMin 2016-08-16 01:48:03 -04:00
Luke Pulverenti
b55c02f25d target 4.6.2 2016-08-16 01:36:41 -04:00
Luke Pulverenti
bfe5b4c229 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-08-16 01:34:45 -04:00
Luke Pulverenti
f450ce4e14 update sync 2016-08-16 01:34:36 -04:00
Luke
cff77c7359 update mac project 2016-08-16 00:15:09 -04:00
Luke Pulverenti
c1e8d85bca update local sync 2016-08-16 00:12:12 -04:00
Luke Pulverenti
7ca15628cc Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-08-16 00:11:44 -04:00
Luke
9ccf2766e1 Merge pull request #2062 from MediaBrowser/master
merge from master
2016-08-16 00:11:43 -04:00
Luke Pulverenti
42cbe62990 restore version 2016-08-16 00:11:02 -04:00
Luke
1b18d2a5f6 Merge pull request #2061 from MediaBrowser/master
merge from master
2016-08-16 00:10:48 -04:00
Luke Pulverenti
9a956f5e29 fix merge conflict 2016-08-16 00:10:14 -04:00
Luke Pulverenti
ea62399fe8 use shared headroom 2016-08-15 22:40:29 -04:00
Luke Pulverenti
ec111eebd3 fix folder caching 2016-08-15 20:22:59 -04:00
Luke
02a4b90f65 Merge pull request #2025 from softworkz/AsyncStreamInterface
Async stream handling: Use interface instead of Func<Stream,Task>
2016-08-15 17:59:28 -04:00
Luke Pulverenti
053ea1a6ba 3.1.106 2016-08-15 17:06:18 -04:00
Luke
bb306606f8 Merge pull request #2060 from MediaBrowser/dev
Dev
2016-08-15 17:04:10 -04:00
Luke Pulverenti
6186e3a4ff reduce dlna chatter 2016-08-15 17:02:43 -04:00
Luke Pulverenti
8bd8282a11 update docked tabs 2016-08-15 14:18:05 -04:00
Luke Pulverenti
caab8299d1 add setting for photo libraries 2016-08-15 00:36:17 -04:00
Luke Pulverenti
a85de2984a 3.1.105 2016-08-14 17:59:34 -04:00
Luke
fa01b0567e Merge pull request #2059 from MediaBrowser/dev
Dev
2016-08-14 17:52:35 -04:00
Luke Pulverenti
51411fff82 add on demand people refresh 2016-08-14 17:45:36 -04:00
Luke Pulverenti
1adcfaadef refresh people on demand, when needed 2016-08-14 17:29:35 -04:00
Luke Pulverenti
4a63f24ae7 3.1.104 2016-08-14 16:02:02 -04:00
Luke
0eb7ce6e4e Merge pull request #2057 from MediaBrowser/dev
Dev
2016-08-14 16:01:08 -04:00
Luke Pulverenti
325a3cc844 cache ids in UserRootFolder 2016-08-14 12:39:23 -04:00
Luke Pulverenti
fb779d89d2 update translations 2016-08-14 02:41:53 -04:00
Luke Pulverenti
a9e65b93cc 3.1.103 2016-08-14 02:29:49 -04:00
Luke
9f01747b5d Merge pull request #2055 from MediaBrowser/dev
Dev
2016-08-14 02:29:15 -04:00
Luke
7b354c63d2 Merge pull request #2054 from MediaBrowser/dev
Dev
2016-08-14 01:54:45 -04:00
Luke Pulverenti
89dd4f0be1 save library options on dialog close 2016-08-13 23:12:26 -04:00
Luke Pulverenti
7dbeeadea6 fix lastmodified header 2016-08-13 20:52:32 -04:00
Luke Pulverenti
6e9828ddad add remuxing permission 2016-08-13 18:27:14 -04:00
Luke Pulverenti
49255561fb 3.1.102 2016-08-13 16:58:44 -04:00
Luke
03648936dc Merge pull request #2053 from MediaBrowser/dev
Dev
2016-08-13 16:55:29 -04:00
Luke Pulverenti
8508e07bb9 improve genre displays 2016-08-13 16:54:29 -04:00
Luke Pulverenti
4f658db3f1 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-08-13 15:53:36 -04:00
Luke Pulverenti
037c4e8740 improve boxset & playlist performance 2016-08-13 15:53:20 -04:00
Luke Pulverenti
6164049919 update direct stream url for improved caching 2016-08-13 15:52:58 -04:00
Luke
5b92b44f1a Merge pull request #2040 from softworkz/IsFileLockedFix
FileRefresher.IsFileLocked: Don't log Exceptions in case of no write permission
2016-08-13 02:47:45 -04:00
Luke Pulverenti
6600ff0990 3.1.101 2016-08-13 02:36:14 -04:00
Luke
9edd42c94c Merge pull request #2052 from MediaBrowser/dev
Dev
2016-08-13 02:34:55 -04:00
Luke Pulverenti
c18b8ec608 add options to library setup 2016-08-13 02:33:31 -04:00
Luke Pulverenti
5989065517 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-08-13 01:51:02 -04:00
Luke Pulverenti
68d1b60964 stub out objects for per library settings 2016-08-13 01:49:00 -04:00
Luke
8a4faa37ae Merge pull request #2050 from softworkz/ETagHeader
Fix: ETag-Values MUST be quoted according to W3C spec
2016-08-13 01:20:56 -04:00
Luke
5d919a12ef Merge pull request #2049 from softworkz/ContentLength
Fix incorrect calculation of content length
2016-08-13 01:19:36 -04:00
Softworkz
319dcda4be Fix: ETag-Values MUST be quoted according to W3C spec 2016-08-13 07:16:19 +02:00