Commit Graph

9359 Commits

Author SHA1 Message Date
Luke Pulverenti
f99e47dacd Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-05-25 13:05:47 -04:00
Luke Pulverenti
1848793b79 3.1.0 2016-05-25 13:05:38 -04:00
Luke
2950f7ce50 Merge pull request #1780 from MediaBrowser/dev
Dev
2016-05-25 13:05:18 -04:00
Luke Pulverenti
4aebdad4f7 fix merge conflict 2016-05-25 13:05:06 -04:00
Luke Pulverenti
d2692fb229 update episode filters 2016-05-25 12:45:54 -04:00
Luke Pulverenti
b0bf7119ba update EncodedRecorder 2016-05-25 12:11:08 -04:00
Luke Pulverenti
cd5c2156ab update components 2016-05-25 12:10:57 -04:00
Luke Pulverenti
e50566c01f update people interval 2016-05-25 00:57:48 -04:00
Luke Pulverenti
9120acca43 3.0.5989 2016-05-24 22:18:25 -04:00
Luke Pulverenti
e562ab0e9c hls subtitle fixes 2016-05-24 22:13:15 -04:00
Luke Pulverenti
f079557df6 update logging 2016-05-24 22:12:58 -04:00
Luke
a4260a2cbc Merge pull request #1778 from MediaBrowser/dev
Dev
2016-05-24 22:11:52 -04:00
Luke Pulverenti
cc19c762b4 update refresh 2016-05-24 22:06:56 -04:00
Luke Pulverenti
e2c4c0f1de hls subtitle fixes 2016-05-24 22:06:11 -04:00
Luke Pulverenti
77dc47df0c deprecate provider options 2016-05-24 20:42:12 -04:00
Luke Pulverenti
6bb6e0ff84 update logging 2016-05-24 20:22:41 -04:00
Luke Pulverenti
96d090f908 update episode filters 2016-05-24 15:48:53 -04:00
Luke Pulverenti
c0664988f5 add index 2016-05-24 15:03:04 -04:00
Luke Pulverenti
18b8f4d8d4 fix attach 2016-05-24 14:31:23 -04:00
Luke Pulverenti
1c72fcd17f update startup error handling 2016-05-24 14:31:04 -04:00
Luke Pulverenti
6647ff335f update startup error handling 2016-05-24 14:30:55 -04:00
Luke Pulverenti
3b4975323c add startup logging 2016-05-24 14:30:44 -04:00
Luke Pulverenti
ba819f2e95 3.0.5988 2016-05-24 14:29:42 -04:00
Luke
79e705a2e0 Merge pull request #1777 from MediaBrowser/dev
fix attach
2016-05-24 14:29:35 -04:00
Luke Pulverenti
178a5f6978 fix attach 2016-05-24 14:28:58 -04:00
Luke
29a87adc14 Merge pull request #1776 from MediaBrowser/dev
Dev
2016-05-24 14:23:06 -04:00
Luke Pulverenti
813db18742 update startup error handling 2016-05-24 14:20:39 -04:00
Luke Pulverenti
29dbc95254 update startup error handling 2016-05-24 14:17:12 -04:00
Luke Pulverenti
e6308f3e3c Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-05-24 14:03:40 -04:00
Luke Pulverenti
88872dc28e 3.0.5987 2016-05-24 14:03:32 -04:00
Luke
fa0a2039ae Merge pull request #1775 from MediaBrowser/dev
add startup logging
2016-05-24 14:03:30 -04:00
Luke Pulverenti
41d551b35d add startup logging 2016-05-24 14:02:26 -04:00
Luke
635ad14e08 Merge pull request #1774 from MediaBrowser/dev
add error handling with migrations
2016-05-24 13:37:16 -04:00
Luke Pulverenti
7b094f3f8a add error handling with migrations 2016-05-24 13:36:23 -04:00
Luke Pulverenti
5c29647a49 3.0.5986 2016-05-24 13:06:18 -04:00
Luke
ca62935685 Merge pull request #1773 from MediaBrowser/dev
Dev
2016-05-24 12:59:56 -04:00
Luke Pulverenti
58d4534a26 update live tv suggestions 2016-05-24 12:58:56 -04:00
Luke Pulverenti
8000a30d9a update UserDataManager 2016-05-24 12:58:36 -04:00
Luke Pulverenti
accdbfaab2 update live tv suggestions 2016-05-24 03:40:45 -04:00
Luke Pulverenti
abb3c8a1d3 rework transitions 2016-05-23 23:06:51 -04:00
Luke
cd920b4a0d Merge pull request #1771 from MediaBrowser/dev
Dev
2016-05-23 19:43:39 -04:00
Luke Pulverenti
74e3c3a129 3.0.5985 2016-05-23 15:41:18 -04:00
Luke Pulverenti
a518e50185 update nuspec 2016-05-23 15:40:53 -04:00
Luke
f31a1da48f update mac project 2016-05-23 15:38:17 -04:00
Luke Pulverenti
6961b4e5a8 move scheduled task startup 2016-05-23 15:29:11 -04:00
Luke
ab6b7c75f0 Merge pull request #1768 from MediaBrowser/dev
Dev
2016-05-23 15:25:27 -04:00
Luke Pulverenti
5433ebb5cf move scheduled task startup 2016-05-23 15:21:38 -04:00
Luke Pulverenti
b23ca6a04c update simpleinjector 2016-05-23 15:21:28 -04:00
Luke
6ac2678d52 Merge pull request #1767 from MediaBrowser/dev
add index on TopParentId
2016-05-23 14:27:04 -04:00
Luke Pulverenti
446b50e556 add index on TopParentId 2016-05-23 14:25:52 -04:00