Commit Graph

6373 Commits

Author SHA1 Message Date
Luke Pulverenti
6961544298 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-10-30 12:41:32 -04:00
Luke
80c5ef35a1 Merge pull request #1240 from MediaBrowser/master
update tuner pooling
2015-10-30 12:43:17 -04:00
Luke Pulverenti
bed740668c update special folders 2015-10-30 12:40:47 -04:00
Luke Pulverenti
9bfb2f0813 update tuner pooling 2015-10-30 12:40:12 -04:00
Luke Pulverenti
23d65f4871 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-10-30 11:27:17 -04:00
Luke
5b4cb77858 Merge pull request #1239 from MediaBrowser/master
merge from master
2015-10-30 11:29:10 -04:00
Luke Pulverenti
a050f20ac5 extract ref frame count using ffprobe 2015-10-30 11:26:36 -04:00
Luke Pulverenti
3ef452decb update collections folder 2015-10-30 11:25:25 -04:00
Luke Pulverenti
0ac0d6b878 update special folders 2015-10-30 11:23:06 -04:00
Luke Pulverenti
442eb66e04 update mac startup 2015-10-29 21:55:42 -04:00
Luke Pulverenti
50f6ee1039 update polymer components 2015-10-29 19:23:43 -04:00
Luke Pulverenti
f66c6f2c75 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-10-29 18:46:09 -04:00
Luke
a0a31aaa2a Merge pull request #1238 from MediaBrowser/master
update recording creation
2015-10-29 18:47:58 -04:00
Luke Pulverenti
78dd9fd9eb update recording creation 2015-10-29 18:45:07 -04:00
Luke Pulverenti
67dc2a0bf9 update item queries 2015-10-29 15:01:04 -04:00
Luke
76586d3a49 Merge pull request #1237 from MediaBrowser/master
update fanart music api
2015-10-29 11:52:33 -04:00
Luke Pulverenti
64317e3ddd update fanart music api 2015-10-29 11:47:05 -04:00
Luke Pulverenti
cf11c25f59 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
Conflicts:
	MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
2015-10-29 09:28:22 -04:00
Luke Pulverenti
0bd1f36ece update db queries 2015-10-29 09:28:05 -04:00
Eric Reed
c155d18279 Partial updates 2015-10-28 18:48:56 -04:00
Luke
a9e0797878 Merge pull request #1236 from MediaBrowser/master
add more migration error handling
2015-10-28 16:26:41 -04:00
Luke Pulverenti
886750a7f8 add more migration error handling 2015-10-28 16:24:07 -04:00
Luke Pulverenti
9b998a068a update image encoding 2015-10-28 15:40:38 -04:00
Luke
813c715489 Merge pull request #1235 from MediaBrowser/master
trim response logging
2015-10-28 15:17:20 -04:00
Luke Pulverenti
dc04143ef9 trim response logging 2015-10-28 15:14:46 -04:00
Jani
421c743faa Add support for embedded subtitles in Kodi's DLNA profile 2015-10-28 19:39:02 +02:00
Luke
3bdaf86426 Merge pull request #1233 from MediaBrowser/master
fix bad merge
2015-10-28 13:12:25 -04:00
Luke
daf0a0d046 Merge pull request #1232 from MediaBrowser/master
fix page caching breaking plugin config pages
2015-10-28 13:07:34 -04:00
Luke
3b2f98a619 Merge pull request #1231 from MediaBrowser/master
update PhotoAlbumImageProvider
2015-10-28 12:45:06 -04:00
Luke Pulverenti
6e463ef70a update PhotoAlbumImageProvider 2015-10-28 12:42:04 -04:00
Luke
e47ed8194a Merge pull request #1230 from MediaBrowser/master
fix button colors
2015-10-28 02:34:05 -04:00
Luke Pulverenti
818662e051 use ImageMagick scale method 2015-10-28 00:06:13 -04:00
Luke
ed0e1399fc Merge pull request #1229 from MediaBrowser/master
handle GetImageSize failure
2015-10-27 22:32:42 -04:00
Luke Pulverenti
06efa32e8f handle GetImageSize failure 2015-10-27 22:30:19 -04:00
Luke
4b771ddf79 Merge pull request #1227 from MediaBrowser/master
fix live tv in startup wizard
2015-10-27 14:23:44 -04:00
Luke Pulverenti
455468ef94 update db retrieval 2015-10-27 13:26:04 -04:00
Luke Pulverenti
6edd92d2a5 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-10-27 13:25:42 -04:00
Luke
1d96b92c08 Merge pull request #1226 from MediaBrowser/master
Merge from master
2015-10-27 13:27:11 -04:00
Luke Pulverenti
3efc6f0005 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2015-10-27 11:53:58 -04:00
Luke Pulverenti
60ac2e8712 rework shutdown 2015-10-27 10:02:30 -04:00
Luke
56239bf321 update mac project 2015-10-27 00:13:12 -04:00
Luke
35778ebc02 Merge pull request #1222 from MediaBrowser/dev
3.0.5768.7
2015-10-26 18:50:19 -04:00
Luke Pulverenti
8d77308593 3.0.5768.7 2015-10-26 18:47:49 -04:00
Luke Pulverenti
3cd7741893 fix list avatars 2015-10-26 14:55:46 -04:00
Luke Pulverenti
3bca39bb68 update image size 2015-10-26 12:40:35 -04:00
Luke Pulverenti
175d8dae5e fix cinema mode failure 2015-10-26 12:21:00 -04:00
Luke Pulverenti
c80e1df1ca support null image encoder 2015-10-26 01:29:32 -04:00
Luke Pulverenti
2890c71af9 update translations 2015-10-25 16:10:59 -04:00
Luke Pulverenti
18934c363e version bump 2015-10-25 14:41:41 -04:00
Luke Pulverenti
5e8f745963 update tv data fetch 2015-10-25 14:34:31 -04:00