Commit Graph

7893 Commits

Author SHA1 Message Date
Luke Pulverenti
ff649e619c Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-05-02 13:16:15 -04:00
Luke Pulverenti
057eedc051 3.0.5948 2016-05-02 13:16:06 -04:00
Luke
4654ee606f Merge pull request #1701 from MediaBrowser/dev
Dev
2016-05-02 13:13:04 -04:00
Luke Pulverenti
568e339ae8 update series pooling 2016-05-02 13:11:45 -04:00
Luke Pulverenti
ffff503e9b Merge branch 'dev' into beta 2016-05-02 01:53:09 -04:00
Luke Pulverenti
2969be59cf Merge branch 'beta' into dev 2016-05-02 01:52:45 -04:00
Luke Pulverenti
3434863c18 Merge branch 'master' into dev 2016-05-02 01:49:28 -04:00
Luke Pulverenti
f6ef727321 Merge branch 'dev' 2016-05-02 01:49:16 -04:00
Luke Pulverenti
cd02373e55 support pooling series and seasons 2016-05-02 01:32:04 -04:00
Luke Pulverenti
311dd50eb7 support more filters at db level 2016-05-01 21:46:08 -04:00
Luke Pulverenti
4ddde2cdc2 introduce presentation unique key 2016-05-01 18:11:24 -04:00
Luke Pulverenti
a4d1c9e6e4 update sqlite 2016-05-01 17:48:37 -04:00
Luke Pulverenti
324c6dc8db update embedded metadata extraction 2016-05-01 16:56:26 -04:00
Luke Pulverenti
ad3965a769 update MediaSourceCount 2016-05-01 16:56:06 -04:00
Luke Pulverenti
e8965dbfba restore version 2016-04-30 23:47:34 -04:00
Luke Pulverenti
89cc20e2e4 Merge branch 'master' into beta 2016-04-30 23:46:29 -04:00
Luke Pulverenti
2d49ec4a53 Merge branch 'beta' 2016-04-30 23:46:17 -04:00
Luke Pulverenti
86919e84ee Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-04-30 23:41:53 -04:00
Luke Pulverenti
724aa4af40 fix merge conflict 2016-04-30 23:41:41 -04:00
Luke Pulverenti
780d5b914c 3.0.5934 2016-04-30 23:37:32 -04:00
Luke Pulverenti
6330b13262 support multiple user data keys 2016-04-30 19:05:21 -04:00
Luke Pulverenti
1f9d32afc5 limit use of GetUserDataKey 2016-04-30 18:05:13 -04:00
Luke
8ee0e50a63 update launch url 2016-04-30 16:54:11 -04:00
Luke
048d0ed868 Merge pull request #1696 from MediaBrowser/dev
Dev
2016-04-30 15:49:18 -04:00
Luke Pulverenti
d75cc21d37 fixes #1571 - Search containing umlauts fails 2016-04-30 15:47:47 -04:00
Luke
4f7260535d Merge pull request #1695 from MediaBrowser/dev
Dev
2016-04-30 15:17:22 -04:00
Luke Pulverenti
a15a762ba1 fixes #1484 - (Feature request) Make emby choose output stream based on ffmpeg config 2016-04-30 15:16:43 -04:00
Luke Pulverenti
04ba2d57ac fixes #1562 - Sync status included in BaseItemDto does not reflect actual sync status. 2016-04-30 14:22:54 -04:00
Luke Pulverenti
297cbb2610 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-04-30 13:06:50 -04:00
Luke Pulverenti
873f1824c1 3.0.5947 2016-04-30 13:06:40 -04:00
Luke Pulverenti
e5a0d8dd84 update mac project 2016-04-30 01:35:53 -04:00
Luke Pulverenti
538a3e8d64 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-04-30 01:22:50 -04:00
Luke
bbf6ee9c1d update mac project 2016-04-30 00:35:02 -04:00
Luke
bfb1d81191 update mac project 2016-04-30 00:31:23 -04:00
Luke Pulverenti
657e924132 update ffmpeg info 2016-04-30 00:27:55 -04:00
Luke Pulverenti
535b327e35 add ffmpeg info 2016-04-30 00:24:45 -04:00
Luke Pulverenti
06b3016f56 add LaunchUrl 2016-04-30 00:21:35 -04:00
Luke Pulverenti
0708c23ed7 cinema mode fixes 2016-04-30 00:11:28 -04:00
Luke
02aa4229fb Merge pull request #1694 from MediaBrowser/dev
Dev
2016-04-30 00:10:33 -04:00
Luke Pulverenti
19c7c26dad omit qsv decoder when stream copying 2016-04-30 00:00:45 -04:00
Luke Pulverenti
5d28c65783 update recordings 2016-04-30 00:00:28 -04:00
Luke Pulverenti
1a02365f78 cinema mode fixes 2016-04-29 23:59:46 -04:00
Luke Pulverenti
a4f1c264b0 update encoding log 2016-04-29 12:54:51 -04:00
Luke Pulverenti
8537cbe6c2 add audio sync to converted recordings 2016-04-29 12:54:26 -04:00
Luke Pulverenti
c37652058c preserve image with audio sync encoding 2016-04-29 12:54:06 -04:00
Luke
6375920933 Merge pull request #1693 from nfnty/api
Use HTTPS for API requests: Fix TheMovieDb and FanArt
2016-04-29 12:52:14 -04:00
nfnty
8711b8be14 Use HTTPS for API requests: FanArt: http:// -> https:// 2016-04-29 10:52:20 +02:00
nfnty
6d7349284f Use HTTPS for API requests: TheMovieDb: base_url -> secure_base_url 2016-04-29 10:52:18 +02:00
Luke Pulverenti
a12ec7167e update shared components 2016-04-28 23:10:48 -04:00
Luke
113a1056fe Merge pull request #1691 from MediaBrowser/dev
Dev
2016-04-28 15:18:27 -04:00