michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,979 Commits 2 Branches 79 Tags 73 MiB
86925d5be0
Commit Graph

411 Commits

Author SHA1 Message Date
Luke Pulverenti
04317f66b7 merge from dev 2016-02-01 22:24:58 -05:00
Luke Pulverenti
1cdb420d2e Merge branch 'beta' into dev 
Conflicts:
	MediaBrowser.Api/StartupWizardService.cs
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
	MediaBrowser.Server.Implementations/Dto/DtoService.cs
	MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
	MediaBrowser.Server.Implementations/Library/LibraryManager.cs
	MediaBrowser.Server.Implementations/Localization/Core/ca.json
	MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
	MediaBrowser.Server.Implementations/packages.config
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/bower.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/ca.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ca.json
	SharedVersion.cs
 2016-02-01 22:21:58 -05:00
Luke Pulverenti
0297d8f7d3 update locking 2016-01-31 20:00:04 -05:00
Luke Pulverenti
fb91b7c808 update locking 2016-01-31 19:57:40 -05:00
Luke Pulverenti
dc43c1077d merge from dev 2016-01-30 16:32:58 -05:00
Luke Pulverenti
74d85e8b19 update recording logging 2016-01-29 00:14:57 -05:00
Luke Pulverenti
a38cf5566a update recording logging 2016-01-28 22:43:20 -05:00
Luke Pulverenti
9d6f1a8b61 update recording logging 2016-01-28 14:18:47 -05:00
Luke Pulverenti
8f291320c9 update recording logging 2016-01-28 14:10:56 -05:00
Luke Pulverenti
2b8cf9b89d add logging 2016-01-27 12:14:48 -05:00
Luke Pulverenti
ea378d7850 add logging 2016-01-27 11:58:08 -05:00
Luke Pulverenti
2bb234c1f8 comment out satip discovery 2016-01-27 11:57:56 -05:00
Luke Pulverenti
51cd5e90b0 restart timers on wake 2016-01-27 01:11:20 -05:00
Luke Pulverenti
eb1ab74759 restart timers on wake 2016-01-27 01:07:01 -05:00
Luke Pulverenti
fcd12c8314 add recording logging 2016-01-26 13:20:36 -05:00
Luke Pulverenti
422a9fab9d add recording logging 2016-01-26 13:18:54 -05:00
Luke Pulverenti
6c38f81d49 stub out sat/ip 2016-01-25 16:33:36 -05:00
Luke Pulverenti
a10347a455 update wake timer 2016-01-21 12:47:47 -05:00
Luke Pulverenti
06f8047ee6 support system wake on recording schedule 2016-01-21 12:47:18 -05:00
Luke Pulverenti
dc1c69ea7b update wake timer 2016-01-21 12:45:42 -05:00
Luke Pulverenti
657e90c98b support system wake on recording schedule 2016-01-21 12:29:14 -05:00
Luke Pulverenti
172e4d8466 refresh series timers on changes 2016-01-19 22:48:37 -05:00
Luke Pulverenti
b23f976511 add delete to multi-select 2016-01-19 14:10:16 -05:00
Luke Pulverenti
a2a620a4c4 add delete to multi-select 2016-01-19 14:03:46 -05:00
Luke
0ffac65444 update schedules direct to automatically reacquire token 2016-01-18 14:00:15 -05:00
Luke
c5c23f932b update schedules direct to automatically reacquire token 2016-01-17 23:47:55 -05:00
Luke Pulverenti
3f8f0ff111 add aspect ratio to search results 2016-01-16 14:21:29 -05:00
Luke Pulverenti
e0f47a4c28 add aspect ratio to search results 2016-01-16 00:01:57 -05:00
Luke Pulverenti
75bbaf2646 ensure recording filename is unique 2016-01-12 01:49:48 -05:00
Luke Pulverenti
355edfa202 ensure recording filename is unique 2016-01-11 21:38:43 -05:00
Luke Pulverenti
4bf13f7754 set channel media type 2016-01-02 16:51:08 -05:00
Luke Pulverenti
36680906ff increase hdhomerun bitrates 2015-12-29 11:26:42 -05:00
Luke Pulverenti
8d1877d43f increase hdhomerun bitrates 2015-12-29 11:12:33 -05:00
Luke
0b3ec059c3 Merge pull request #1373 from MediaBrowser/master 
add tuner error handling
 2015-12-28 13:42:42 -05:00
Luke
a7c7446bd0 Merge pull request #1372 from MediaBrowser/master 
add tuner error handling
 2015-12-28 13:42:34 -05:00
Luke Pulverenti
de1495763f add tuner error handling 2015-12-28 13:41:53 -05:00
Luke Pulverenti
2b6b76775f update server project 2015-12-27 14:23:59 -05:00
Luke
5faf6483cd Merge pull request #1300 from MediaBrowser/master 
fixes #1245 - Emby seems unable to find [REC] unless brackets are rem…
 2015-12-07 10:46:04 -05:00
Luke Pulverenti
efd8eccd10 adjust recording time filter 2015-12-07 10:41:22 -05:00
Luke Pulverenti
532af87452 update qsv encoding 2015-11-26 23:34:11 -05:00
Luke Pulverenti
4415506837 support qsv encoding 2015-11-26 23:33:20 -05:00
Luke Pulverenti
1ee7826be6 restore changes 2015-11-23 11:04:57 -05:00
Luke Pulverenti
708c000be5 fix merge conflicts 2015-11-23 11:02:48 -05:00
Luke Pulverenti
d6952fe66e update live tv manager 2015-11-22 18:06:11 -05:00
Luke Pulverenti
9cdb4ac242 restore changes 2015-11-21 00:01:16 -05:00
Luke Pulverenti
170f463664 mix merge conflicts 2015-11-20 23:55:26 -05:00
Luke Pulverenti
6de54e5ec7 fix merge conflict 2015-11-20 23:54:41 -05:00
Luke Pulverenti
057c4b5494 support image placeholders 2015-11-20 23:44:22 -05:00
Luke Pulverenti
fe5537f779 update EmbyTV 2015-11-20 23:34:55 -05:00
Luke Pulverenti
b9699fde05 update schedules direct 2015-11-20 22:13:43 -05:00