Commit graph

9294 commits

Author SHA1 Message Date
Luke 1d0e341652 Merge pull request #2115 from Diefenthal/patch-1
Update SatIpDiscovery.cs
2016-08-28 12:12:06 -04:00
hatharry 71386f0ceb Check service running before checking self restart 2016-08-29 01:42:25 +12:00
hatharry cabf2cdc1b Merge branch 'dev' of https://github.com/hatharry/Emby.git 2016-08-29 01:27:43 +12:00
hatharry e564b54686 Support service restart and update 2016-08-29 01:27:22 +12:00
hatharry c974641a35 Merge pull request #22 from MediaBrowser/dev
Dev
2016-08-28 12:51:32 +00:00
Kay Diefenthal 6aa4583081 Update SatIpDiscovery.cs
Expand and correcting the Reading of the DeviceDescription Capability Field 
now can you look for how many Tuners and wicht type ( DVBS DVBT DVBC ) it is
2016-08-28 11:19:50 +02:00
Luke 81765ff29f Merge pull request #2089 from softworkz/OrganizeFixes3
AutoorganizeLog: Fixed error when log empty; re-introduced full reload on task completion
2016-08-27 17:10:35 -04:00
Luke 17df76e46a Merge pull request #2107 from faush01/dev
allow scroll bar on filters pane
2016-08-27 16:56:04 -04:00
Luke Pulverenti 71b5433d99 3.0.6300 2016-08-27 15:56:34 -04:00
Luke Pulverenti 4d996a3cc9 restore version 2016-08-27 15:53:36 -04:00
Luke 6c156ce841 Merge pull request #2112 from MediaBrowser/beta
Beta
2016-08-27 15:53:08 -04:00
Luke Pulverenti a8fb422fe4 fix merge conflict 2016-08-27 15:52:58 -04:00
Luke Pulverenti 9d762c3878 fix merge conflict 2016-08-27 15:47:12 -04:00
Luke Pulverenti 633cdb99c2 3.1.126 2016-08-27 15:39:19 -04:00
Luke 0bea5725d3 Merge pull request #2111 from MediaBrowser/dev
Dev
2016-08-27 15:36:29 -04:00
Luke Pulverenti 92d8e9f564 remove test code 2016-08-27 15:35:19 -04:00
Luke Pulverenti 2c603f2269 update subtitles in dlna profiles 2016-08-27 14:39:48 -04:00
Luke Pulverenti 73ede8c4a1 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-08-27 14:34:32 -04:00
Luke Pulverenti 05760afcca 3.1.125 2016-08-27 14:33:48 -04:00
Luke a19b5e074a Merge pull request #2110 from MediaBrowser/dev
update sony dlna profiles
2016-08-27 14:33:01 -04:00
Luke Pulverenti 794df5cbad update sony dlna profiles 2016-08-27 14:28:37 -04:00
Luke c6b360c9b4 Merge pull request #2109 from MediaBrowser/dev
update sony dlna profiles
2016-08-27 14:19:05 -04:00
Luke Pulverenti f41f29a92a update sony dlna profiles 2016-08-27 14:18:02 -04:00
Luke 3f41aae7ac Merge pull request #2108 from MediaBrowser/dev
Dev
2016-08-27 14:13:56 -04:00
Luke Pulverenti 08d212c7a2 update sony dlna profiles 2016-08-27 14:11:06 -04:00
Luke Pulverenti d68e984120 add new sony dlna profiles 2016-08-27 13:27:48 -04:00
Luke Pulverenti 73bafa7cda fix saving of IsVirtualItem 2016-08-27 12:47:09 -04:00
Luke Pulverenti 4fa0df37e2 fix fields that shouldn't be required 2016-08-27 00:35:06 -04:00
softworkz 803a96cb4e AutoOrganize: Differentiate server events 2016-08-27 03:51:15 +02:00
softworkz cf64c40413 AutoorganizeLog: Fixed error when log empty; re-introduced full reload on task completion 2016-08-27 03:51:14 +02:00
Luke Pulverenti 23c3b35983 3.1.124 2016-08-26 16:39:58 -04:00
Luke 9305573e96 Merge pull request #2106 from MediaBrowser/dev
fix version comparison
2016-08-26 16:38:30 -04:00
Luke Pulverenti ae331babed fix version comparison 2016-08-26 16:37:19 -04:00
Luke Pulverenti 76daf16535 3.1.123 2016-08-26 15:37:01 -04:00
Luke 22b3b33589 Merge pull request #2104 from MediaBrowser/dev
Dev
2016-08-26 15:32:40 -04:00
Luke Pulverenti 510fbf139c fix repeated guide refreshes 2016-08-26 15:29:28 -04:00
Luke 4964899fa3 Merge pull request #2091 from softworkz/EtagForSync
Provide (unique) ETag value for synced media sources
2016-08-26 13:34:45 -04:00
Luke Pulverenti d3ce29b5c3 3.1.122 2016-08-26 13:28:05 -04:00
Luke 07bdea0322 Merge pull request #2103 from MediaBrowser/dev
fix sync container statuses
2016-08-26 13:26:41 -04:00
Luke Pulverenti 6377e7365b fix sync container statuses 2016-08-26 13:24:04 -04:00
Luke Pulverenti 54886db5e5 3.0.6200 2016-08-25 17:48:59 -04:00
Luke Pulverenti 012c0ae983 fix update level migration 2016-08-25 17:48:43 -04:00
Luke 79c2ddb3ca Merge pull request #2102 from MediaBrowser/dev
fix update level migration
2016-08-25 17:30:57 -04:00
Luke Pulverenti 86bc77fd6a fix update level migration 2016-08-25 17:30:35 -04:00
Luke Pulverenti e2a06e51a3 3.0.6100 2016-08-25 14:47:41 -04:00
Luke ba9577f380 Merge pull request #2101 from MediaBrowser/beta
Beta
2016-08-25 14:46:19 -04:00
Luke Pulverenti 870c843194 fix merge conflict 2016-08-25 14:45:56 -04:00
Luke Pulverenti 1ffd9b3157 3.1.121 2016-08-25 14:30:04 -04:00
Luke 60a353137c Merge pull request #2100 from MediaBrowser/dev
fix hover menus
2016-08-25 14:28:14 -04:00
Luke 259c5b9d44 Merge pull request #2099 from MediaBrowser/dev
Dev
2016-08-25 14:26:39 -04:00