Commit Graph

9479 Commits

Author SHA1 Message Date
Luke
e617e218bd Merge pull request #2133 from MediaBrowser/dev
Dev
2016-09-01 16:22:51 -04:00
Luke Pulverenti
2f67a007cd update tabs 2016-09-01 16:21:55 -04:00
Luke Pulverenti
37dfbbe477 update tabs 2016-09-01 12:36:11 -04:00
softworkz
bd4ffa898e Programmatic provider id handling for xml and nfo persistence 2016-09-01 05:42:37 +02:00
Luke Pulverenti
699bdacebc add setting to hide external content from suggestions 2016-08-31 17:07:02 -04:00
Luke Pulverenti
3862207a73 move channel view setting to global 2016-08-31 16:46:09 -04:00
Luke Pulverenti
f56d3a077a 3.1.130 2016-08-31 15:26:57 -04:00
Luke
9bf6423291 Merge pull request #2131 from MediaBrowser/dev
Dev
2016-08-31 15:26:20 -04:00
Luke Pulverenti
b80882fadc fix 3.5 project 2016-08-31 15:18:17 -04:00
Luke Pulverenti
b7cd90d992 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-08-31 15:17:22 -04:00
Luke Pulverenti
eefd697b85 update app footer 2016-08-31 15:17:11 -04:00
Eric Reed
47ceccb240 Read MCM CollectionNumber 2016-08-31 10:01:07 -04:00
Luke Pulverenti
0375990d8e Support grabbing channel number from url 2016-08-30 14:17:37 -04:00
Luke Pulverenti
d394076fb6 update image editor 2016-08-30 13:39:15 -04:00
Luke Pulverenti
5f74f69ebd 3.1.129 2016-08-30 08:41:18 -04:00
Luke
a7e9979865 Merge pull request #2126 from MediaBrowser/dev
Dev
2016-08-30 08:39:36 -04:00
Luke Pulverenti
6b3e1951e2 switch to shared image editor 2016-08-30 02:06:24 -04:00
Luke Pulverenti
f5c4fd7690 update cards 2016-08-30 00:33:24 -04:00
Luke Pulverenti
2bdaba633c make chapter images a per-library setting 2016-08-29 17:06:24 -04:00
Luke Pulverenti
4cafe5c493 add logging 2016-08-29 15:24:58 -04:00
Luke
e8977c4485 Merge pull request #2123 from MediaBrowser/dev
fix service worker registration
2016-08-29 14:59:24 -04:00
Luke Pulverenti
416e175901 3.1.128 2016-08-29 14:44:19 -04:00
Luke
814860074e Merge pull request #2122 from MediaBrowser/dev
Dev
2016-08-29 14:43:52 -04:00
Luke Pulverenti
06ebf9d3c2 update recording file name 2016-08-29 14:42:53 -04:00
Luke Pulverenti
f0864b1dae update intros 2016-08-29 03:12:34 -04:00
Luke Pulverenti
70234149eb 3.1.127 2016-08-28 15:45:53 -04:00
Luke
3b9a4be8f0 Merge pull request #2119 from MediaBrowser/dev
Dev
2016-08-28 15:45:29 -04:00
Luke Pulverenti
21a8dc77c3 fix merge conflict 2016-08-28 15:45:17 -04:00
Luke Pulverenti
30f30ae9f3 update shared components 2016-08-28 14:59:14 -04:00
Luke Pulverenti
dc9742a2ed comment out code not compiling 2016-08-28 12:57:59 -04:00
Luke Pulverenti
806c795069 update episode nfo saving 2016-08-28 12:46:28 -04:00
Luke Pulverenti
5543a556a8 restore version 2016-08-28 12:40:02 -04:00
Luke
474d201f6d Merge pull request #2118 from MediaBrowser/master
merge from master
2016-08-28 12:39:22 -04:00
Luke Pulverenti
3785298dd9 restore version 2016-08-28 12:26:37 -04:00
Luke
93207402cc Merge pull request #2117 from MediaBrowser/master
merge from master
2016-08-28 12:26:03 -04:00
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