Luke Pulverenti
|
04317f66b7
|
merge from dev
|
9 years ago |
|
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
|
9 years ago |
|
Luke Pulverenti
|
0297d8f7d3
|
update locking
|
9 years ago |
|
Luke Pulverenti
|
fb91b7c808
|
update locking
|
9 years ago |
|
Luke Pulverenti
|
dc43c1077d
|
merge from dev
|
9 years ago |
|
Luke Pulverenti
|
74d85e8b19
|
update recording logging
|
9 years ago |
|
Luke Pulverenti
|
a38cf5566a
|
update recording logging
|
9 years ago |
|
Luke Pulverenti
|
9d6f1a8b61
|
update recording logging
|
9 years ago |
|
Luke Pulverenti
|
8f291320c9
|
update recording logging
|
9 years ago |
|
Luke Pulverenti
|
2b8cf9b89d
|
add logging
|
9 years ago |
|
Luke Pulverenti
|
ea378d7850
|
add logging
|
9 years ago |
|
Luke Pulverenti
|
2bb234c1f8
|
comment out satip discovery
|
9 years ago |
|
Luke Pulverenti
|
51cd5e90b0
|
restart timers on wake
|
9 years ago |
|
Luke Pulverenti
|
eb1ab74759
|
restart timers on wake
|
9 years ago |
|
Luke Pulverenti
|
fcd12c8314
|
add recording logging
|
9 years ago |
|
Luke Pulverenti
|
422a9fab9d
|
add recording logging
|
9 years ago |
|
Luke Pulverenti
|
6c38f81d49
|
stub out sat/ip
|
9 years ago |
|
Luke Pulverenti
|
a10347a455
|
update wake timer
|
9 years ago |
|
Luke Pulverenti
|
06f8047ee6
|
support system wake on recording schedule
|
9 years ago |
|
Luke Pulverenti
|
dc1c69ea7b
|
update wake timer
|
9 years ago |
|
Luke Pulverenti
|
657e90c98b
|
support system wake on recording schedule
|
9 years ago |
|
Luke Pulverenti
|
172e4d8466
|
refresh series timers on changes
|
9 years ago |
|
Luke Pulverenti
|
b23f976511
|
add delete to multi-select
|
9 years ago |
|
Luke Pulverenti
|
a2a620a4c4
|
add delete to multi-select
|
9 years ago |
|
Luke
|
0ffac65444
|
update schedules direct to automatically reacquire token
|
9 years ago |
|
Luke
|
c5c23f932b
|
update schedules direct to automatically reacquire token
|
9 years ago |
|
Luke Pulverenti
|
3f8f0ff111
|
add aspect ratio to search results
|
9 years ago |
|
Luke Pulverenti
|
e0f47a4c28
|
add aspect ratio to search results
|
9 years ago |
|
Luke Pulverenti
|
75bbaf2646
|
ensure recording filename is unique
|
9 years ago |
|
Luke Pulverenti
|
355edfa202
|
ensure recording filename is unique
|
9 years ago |
|
Luke Pulverenti
|
4bf13f7754
|
set channel media type
|
9 years ago |
|
Luke Pulverenti
|
36680906ff
|
increase hdhomerun bitrates
|
9 years ago |
|
Luke Pulverenti
|
8d1877d43f
|
increase hdhomerun bitrates
|
9 years ago |
|
Luke
|
0b3ec059c3
|
Merge pull request #1373 from MediaBrowser/master
add tuner error handling
|
9 years ago |
|
Luke
|
a7c7446bd0
|
Merge pull request #1372 from MediaBrowser/master
add tuner error handling
|
9 years ago |
|
Luke Pulverenti
|
de1495763f
|
add tuner error handling
|
9 years ago |
|
Luke Pulverenti
|
2b6b76775f
|
update server project
|
9 years ago |
|
Luke
|
5faf6483cd
|
Merge pull request #1300 from MediaBrowser/master
fixes #1245 - Emby seems unable to find [REC] unless brackets are rem…
|
9 years ago |
|
Luke Pulverenti
|
efd8eccd10
|
adjust recording time filter
|
9 years ago |
|
Luke Pulverenti
|
532af87452
|
update qsv encoding
|
9 years ago |
|
Luke Pulverenti
|
4415506837
|
support qsv encoding
|
9 years ago |
|
Luke Pulverenti
|
1ee7826be6
|
restore changes
|
9 years ago |
|
Luke Pulverenti
|
708c000be5
|
fix merge conflicts
|
9 years ago |
|
Luke Pulverenti
|
d6952fe66e
|
update live tv manager
|
9 years ago |
|
Luke Pulverenti
|
9cdb4ac242
|
restore changes
|
9 years ago |
|
Luke Pulverenti
|
170f463664
|
mix merge conflicts
|
9 years ago |
|
Luke Pulverenti
|
6de54e5ec7
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
057c4b5494
|
support image placeholders
|
9 years ago |
|
Luke Pulverenti
|
fe5537f779
|
update EmbyTV
|
9 years ago |
|
Luke Pulverenti
|
b9699fde05
|
update schedules direct
|
9 years ago |
