Commit Graph

7171 Commits

Author SHA1 Message Date
Luke Pulverenti
1bfde59af4 3.0.5881 2016-02-18 13:21:53 -05:00
Luke
09e01d9aad Merge pull request #1476 from MediaBrowser/dev
merge from dev
2016-02-18 13:23:48 -05:00
Luke
32b200e5c5 Merge pull request #1475 from MediaBrowser/master
merge from master
2016-02-18 13:23:25 -05:00
Luke Pulverenti
f1745245ba add comment 2016-02-17 22:18:35 -05:00
Luke Pulverenti
76eb1c46e3 support more embedded video metadata 2016-02-17 21:55:15 -05:00
Luke Pulverenti
bfa1b30cab update RespondToSearch 2016-02-17 16:40:17 -05:00
Luke Pulverenti
f13ca8f343 update device discovery 2016-02-17 16:24:01 -05:00
Luke Pulverenti
ffbe92e51e activate unicast listener 2016-02-16 23:44:31 -05:00
Luke Pulverenti
1f004c978a add path to ListingsProviderInfo 2016-02-16 22:07:15 -05:00
Luke
9638b242a4 update mac project 2016-02-16 15:39:48 -05:00
Luke
235d61ffd1 Merge pull request #1471 from MediaBrowser/dev
Dev
2016-02-16 15:21:58 -05:00
Luke Pulverenti
41d6c949cf Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-02-16 15:21:44 -05:00
Luke
4da8f7a7fd Merge pull request #1472 from MediaBrowser/beta
Beta
2016-02-16 15:23:19 -05:00
Luke Pulverenti
deb712b165 restore change 2016-02-16 15:21:36 -05:00
Luke Pulverenti
b42317c0c4 fix merge conflict 2016-02-16 15:20:48 -05:00
Luke Pulverenti
3212338802 update photo album images 2016-02-16 15:14:46 -05:00
Luke Pulverenti
b9ce0a3223 3.0.5871 2016-02-16 13:06:36 -05:00
Luke Pulverenti
753360922d 3.0.5880 2016-02-16 12:19:55 -05:00
Luke Pulverenti
8a43554c59 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-02-16 12:15:59 -05:00
Luke
2c6064cb65 Merge pull request #1469 from MediaBrowser/beta
Beta
2016-02-16 12:17:44 -05:00
Luke Pulverenti
e37bf6b986 restore changes 2016-02-16 12:15:50 -05:00
Luke Pulverenti
78484a2813 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-02-16 12:15:15 -05:00
Luke
25a3207543 Merge pull request #1468 from MediaBrowser/dev
Dev
2016-02-16 12:16:32 -05:00
Luke Pulverenti
1285512160 fix merge conflict 2016-02-16 12:15:06 -05:00
Luke Pulverenti
cc98b04c5d fix xbox one, ps4 not seeing dlna server 2016-02-16 12:09:32 -05:00
Luke Pulverenti
5bf7e6d80c update libs 2016-02-16 11:38:00 -05:00
Luke Pulverenti
f7d046d00e enable shared components 2016-02-16 11:15:36 -05:00
Luke Pulverenti
600aa76865 update recordings 2016-02-15 23:54:20 -05:00
Luke Pulverenti
41bf9e26f4 3.0.5879 2016-02-15 12:57:33 -05:00
Luke
8a2eeba914 Merge pull request #1467 from MediaBrowser/dev
merge from dev
2016-02-15 12:56:03 -05:00
Luke Pulverenti
f95e780a4d update linux ffmpeg 2016-02-15 12:37:34 -05:00
Luke Pulverenti
0069da65b9 update music filters 2016-02-15 11:57:51 -05:00
Luke Pulverenti
1dcdabe5e5 update episode filters 2016-02-15 11:42:57 -05:00
Luke Pulverenti
dc36859ae9 update game filters 2016-02-15 10:51:08 -05:00
Luke Pulverenti
947d895fe8 stub out sat/ip discovery 2016-02-15 00:47:23 -05:00
Luke Pulverenti
ea83790305 3.0.5870 2016-02-14 23:51:14 -05:00
Luke
dd9f5270ea Merge pull request #1465 from MediaBrowser/beta
Beta
2016-02-14 23:49:23 -05:00
Luke
bfd53d0c43 Merge pull request #1464 from MediaBrowser/dev
update migration process
2016-02-14 23:49:11 -05:00
Luke Pulverenti
4700546875 update migration process 2016-02-14 23:46:51 -05:00
Luke Pulverenti
681ffa96b3 3.0.5868 2016-02-14 23:28:25 -05:00
Luke
5bee5acd27 Merge pull request #1463 from MediaBrowser/beta
Beta
2016-02-14 23:29:42 -05:00
Luke Pulverenti
65e0cd7740 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-02-14 23:18:13 -05:00
Luke
95347ba7b3 Merge pull request #1462 from MediaBrowser/dev
merge from dev
2016-02-14 23:19:31 -05:00
Luke Pulverenti
77d7d562bd 3.0.5878 2016-02-14 23:18:05 -05:00
Luke Pulverenti
622b0558d4 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-02-14 23:17:20 -05:00
Luke Pulverenti
82f4518c55 fix merge conflict 2016-02-14 23:17:10 -05:00
Luke Pulverenti
1551ae6566 update upcoming 2016-02-14 22:18:46 -05:00
Luke Pulverenti
723f4de97d remove duplicate query 2016-02-14 21:51:14 -05:00
Luke Pulverenti
f3554ece19 fixes #1461 - DLNA Info Spam 2016-02-14 21:25:14 -05:00
Luke Pulverenti
afcfbb3d20 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-02-14 17:41:31 -05:00