Commit Graph

12788 Commits

Author SHA1 Message Date
Luke Pulverenti
61a4ef464d Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-12-22 16:52:30 -05:00
Luke
f02fa76c19 Merge pull request #2359 from softworkz/ServerSyncEvents
Improved server sync event handling
2016-12-22 15:49:21 -05:00
Luke Pulverenti
982d4cbb3e update comparisons 2016-12-22 11:48:24 -05:00
Luke Pulverenti
c2d80791be placeholder 2016-12-22 11:48:06 -05:00
Luke Pulverenti
3e8b54254f update video params 2016-12-22 11:47:53 -05:00
Luke Pulverenti
009e860f6f limit http compression 2016-12-22 11:47:43 -05:00
Luke Pulverenti
e4ceec749d limit guide date picker to actual guide days 2016-12-22 10:59:08 -05:00
Luke Pulverenti
1186df23dd increase missing episode threshold 2016-12-22 10:58:50 -05:00
Luke Pulverenti
f8c88aa632 add null checks 2016-12-22 10:58:31 -05:00
Luke Pulverenti
94451de6d2 improve ScheduleDirect showId 2016-12-22 10:58:09 -05:00
Luke Pulverenti
11e33cd00c add scheduled task error handling 2016-12-22 10:57:45 -05:00
Luke Pulverenti
d9190bb7d8 update components 2016-12-22 10:57:28 -05:00
Luke Pulverenti
f167777c7b update string compare 2016-12-22 04:45:02 -05:00
Luke Pulverenti
a447fd291a update osx detection 2016-12-21 23:47:59 -05:00
Luke Pulverenti
961ec0b815 update browser launcher 2016-12-21 23:28:00 -05:00
Luke Pulverenti
d26a5086c1 resolve tray icon not opening links on osx 2016-12-21 23:11:23 -05:00
Luke Pulverenti
9ca0c04ee7 3.1.1 2016-12-21 15:24:55 -05:00
Luke
9782f5665c Merge pull request #2362 from MediaBrowser/beta
Beta
2016-12-21 15:24:41 -05:00
Luke Pulverenti
f54ed74837 fix merge conflict 2016-12-21 15:24:20 -05:00
Luke
ef67172555 Merge pull request #2361 from MediaBrowser/dev
resolve holiday theme disrupting playback
2016-12-21 15:08:56 -05:00
Luke Pulverenti
c0128a0a11 resolve holiday theme disrupting playback 2016-12-21 15:08:20 -05:00
softworkz
b748d0784a Enhanced sync events 2016-12-20 22:42:50 +01:00
Luke Pulverenti
617bbce0e1 3.1.260 2016-12-20 15:06:36 -05:00
Luke
b4575306b8 Merge pull request #2360 from MediaBrowser/dev
Dev
2016-12-20 15:00:51 -05:00
Luke Pulverenti
7f7be26771 restore version 2016-12-20 15:00:04 -05:00
Luke Pulverenti
ac2c45dd6a update dlna genre views 2016-12-20 14:59:25 -05:00
Luke Pulverenti
74ec6e5a06 update dlna music genres 2016-12-20 02:31:30 -05:00
Luke Pulverenti
27c4c30082 update media info bitrate 2016-12-20 00:23:33 -05:00
Luke Pulverenti
d588ed705f update subtitle burn in params 2016-12-20 00:23:22 -05:00
Luke Pulverenti
e9ae479360 fix duplicate latest recordings section 2016-12-20 00:22:31 -05:00
Luke Pulverenti
40e8d0c75e add additional http server error handling 2016-12-20 00:21:52 -05:00
Luke Pulverenti
a93c2682d9 update timer settings 2016-12-20 00:21:21 -05:00
Luke
70f48f9cea Merge pull request #2356 from MediaBrowser/beta
Beta
2016-12-18 02:32:59 -05:00
Luke
c15acd0ebc Merge pull request #2355 from MediaBrowser/dev
add error handling
2016-12-18 02:32:50 -05:00
Luke Pulverenti
2345d02b41 add error handling 2016-12-18 02:32:28 -05:00
Luke Pulverenti
357a3750de 3.1.0 2016-12-18 01:28:48 -05:00
Luke
7b68cca3d1 Merge pull request #2354 from MediaBrowser/beta
Beta
2016-12-18 01:19:29 -05:00
Luke
b66d076def Merge pull request #2353 from MediaBrowser/dev
Dev
2016-12-18 01:19:16 -05:00
Luke
e78bbbd6f1 Merge pull request #2352 from MediaBrowser/master
merge from master
2016-12-18 00:47:58 -05:00
Luke
de06847f41 Merge pull request #2351 from MediaBrowser/master
merge from master
2016-12-18 00:47:30 -05:00
Luke Pulverenti
d7ad1331f1 fix merge conflict 2016-12-18 00:47:12 -05:00
Luke
e7cebb91a7 Merge pull request #2350 from MediaBrowser/beta
Beta
2016-12-18 00:44:33 -05:00
Luke Pulverenti
025905a3e4 fix merge conflict 2016-12-18 00:44:21 -05:00
Luke Pulverenti
54d5b71577 restore version 2016-12-18 00:43:53 -05:00
Luke Pulverenti
4853e795d7 fix merge conflict 2016-12-18 00:43:37 -05:00
Luke Pulverenti
bc58e2862c fix merge conflicts 2016-12-18 00:43:11 -05:00
Luke Pulverenti
e7e0a1ecfc fix merge conflict 2016-12-18 00:42:21 -05:00
Luke Pulverenti
ae1110219d fix merge conflicts 2016-12-18 00:35:28 -05:00
Luke
aaa027f322 Merge pull request #2349 from MediaBrowser/dev
Dev
2016-12-18 00:26:20 -05:00
Luke Pulverenti
38b26acd87 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-12-18 00:25:13 -05:00