Commit Graph

7336 Commits

Author SHA1 Message Date
Luke Pulverenti
f70d12ef33 3.0.5881 2016-03-03 13:18:18 -05:00
Luke
c616ffe2b1 Merge pull request #1528 from MediaBrowser/beta
Beta
2016-03-03 13:14:41 -05:00
Luke
0cc5c5dc48 Merge pull request #1527 from MediaBrowser/dev
update SocketHttpListener
2016-03-03 13:14:30 -05:00
Luke Pulverenti
03ec2caca7 update SocketHttpListener 2016-03-03 13:11:55 -05:00
Luke
2f1bedaf00 Merge pull request #1526 from MediaBrowser/beta
Beta
2016-03-03 12:57:33 -05:00
Luke
cddf33287d Merge pull request #1525 from MediaBrowser/dev
Dev
2016-03-03 12:56:58 -05:00
Luke Pulverenti
9c386e3f62 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-03-03 12:52:55 -05:00
Luke Pulverenti
8ac11ee1e5 update live tv auto-organize 2016-03-03 12:52:47 -05:00
Luke
6ef747b339 Merge pull request #1523 from MediaBrowser/beta
Beta
2016-03-03 02:20:14 -05:00
Luke
74f6e00e19 Merge pull request #1522 from MediaBrowser/dev
Dev
2016-03-03 02:19:41 -05:00
Luke
af94e15900 update mac project 2016-03-03 02:07:26 -05:00
Luke Pulverenti
fc1b0edd9d update Ssdp/SsdpHandler.cs 2016-03-03 01:54:20 -05:00
Luke Pulverenti
ff000d581c 3.0.5880 2016-03-03 01:37:13 -05:00
Luke
010ce1bb79 Merge pull request #1520 from MediaBrowser/beta
Beta
2016-03-03 01:38:16 -05:00
Luke
ca6f72e792 Merge pull request #1519 from MediaBrowser/dev
update components
2016-03-03 01:27:20 -05:00
Luke Pulverenti
3996d537e1 3.0.5896 2016-03-03 01:20:49 -05:00
Luke
f85cd1dbbf Merge pull request #1518 from MediaBrowser/master
merge from master
2016-03-03 01:22:35 -05:00
Luke
def6bd6a6b Merge pull request #1517 from MediaBrowser/dev
fix live tv auto-organize
2016-03-03 01:20:21 -05:00
Luke Pulverenti
5983f6957d fix live tv auto-organize 2016-03-03 01:17:30 -05:00
Luke
b52eeb5816 Merge pull request #1516 from MediaBrowser/dev
Dev
2016-03-03 01:06:15 -05:00
Luke Pulverenti
721e50ce7a disable sat/ip host for now 2016-03-03 01:03:23 -05:00
Luke Pulverenti
32204107dd add advanced setting 2016-03-03 00:17:00 -05:00
Luke Pulverenti
e1b119fd3d 3.0.5872 2016-03-02 16:04:55 -05:00
Luke
8fc7d7ba02 Merge pull request #1514 from MediaBrowser/beta
Beta
2016-03-02 16:06:25 -05:00
Luke
81e96ed4f6 Merge pull request #1513 from MediaBrowser/dev
Dev
2016-03-02 15:53:55 -05:00
Luke Pulverenti
11a5bbf9b5 update recording data 2016-03-02 13:42:39 -05:00
Luke Pulverenti
a1df4e4842 3.0.5895 2016-03-02 12:09:38 -05:00
Luke
6eaf10679e Merge pull request #1512 from MediaBrowser/dev
Dev
2016-03-02 12:08:39 -05:00
Luke Pulverenti
e52eb2219b use shared usersettings 2016-03-01 23:46:10 -05:00
Luke Pulverenti
b2d922e305 switch collapsible 2016-03-01 22:59:23 -05:00
Luke Pulverenti
6b1f786a44 update FindByPath 2016-03-01 14:43:03 -05:00
Luke Pulverenti
076a07a546 optimize FindByPath 2016-03-01 14:39:46 -05:00
Luke Pulverenti
3e4d64fc0b 3.0.5894 2016-03-01 13:45:20 -05:00
Luke
68c511581a Merge pull request #1511 from MediaBrowser/dev
dlna fix
2016-03-01 13:45:07 -05:00
Luke Pulverenti
177cc41e3d dlna fix 2016-03-01 13:42:39 -05:00
Luke
c46cd976bc Merge pull request #1510 from MediaBrowser/dev
dlna fix
2016-03-01 13:37:57 -05:00
Luke Pulverenti
8454aaf053 dlna fix 2016-03-01 13:30:46 -05:00
Luke Pulverenti
5ce7c4cd05 3.0.5893 2016-03-01 11:20:32 -05:00
Luke
6aa4015e03 Merge pull request #1509 from MediaBrowser/dev
Dev
2016-03-01 11:20:30 -05:00
Luke Pulverenti
aa66c1defe dlna fixes 2016-03-01 11:17:03 -05:00
Luke Pulverenti
9d20e298e1 exclude recordings from CleanDatabaseScheduledTask 2016-03-01 01:02:55 -05:00
Luke Pulverenti
60b2165414 unify appSettings 2016-03-01 01:02:03 -05:00
Luke Pulverenti
2eb492f865 update recording stoppage 2016-02-29 23:24:42 -05:00
Luke Pulverenti
c3eb571d1d add null check to SyncJobProcessor 2016-02-29 23:24:14 -05:00
Luke Pulverenti
156a047cfe add null check to ScheduleDirect 2016-02-29 23:23:58 -05:00
Luke Pulverenti
0e25c5a6c7 3.0.5892 2016-02-29 11:30:58 -05:00
Luke
3e0a218076 Merge pull request #1508 from MediaBrowser/dev
Dev
2016-02-29 11:32:32 -05:00
Luke Pulverenti
6da57c86cd update recordings 2016-02-29 11:25:21 -05:00
Luke Pulverenti
bd38cb7a8b update EpisodeFileOrganizer 2016-02-29 11:25:09 -05:00
Luke Pulverenti
d0ca9b1c07 update components 2016-02-29 11:23:30 -05:00