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
|
cfa8f6c6ec
|
reduce use of timers throughout the system
Conflicts:
MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
|
9 years ago |
|
Luke Pulverenti
|
3510ef3d2b
|
reduce use of timers throughout the system
|
9 years ago |
|
Luke Pulverenti
|
9cdb4ac242
|
restore changes
|
9 years ago |
|
Luke Pulverenti
|
02aee9dc90
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
60cd72b974
|
update channel item images
|
9 years ago |
|
Luke Pulverenti
|
2ee91249e5
|
revert channel manager changes
|
9 years ago |
|
Luke Pulverenti
|
5013fddc2d
|
update channel manager
|
9 years ago |
|
Luke Pulverenti
|
ce34c35b94
|
encode with qsv
|
9 years ago |
|
Luke Pulverenti
|
6aa3313bc0
|
make sure ._ osx files are properly ignored
|
9 years ago |
|
Luke Pulverenti
|
4503ec6174
|
update channel images
|
9 years ago |
|
Luke Pulverenti
|
fbf8d27637
|
update channel db
|
9 years ago |
|
Luke Pulverenti
|
32babe2b94
|
update images
|
9 years ago |
|
Luke Pulverenti
|
994cc020f8
|
restore video grouping feature
|
9 years ago |
|
Luke Pulverenti
|
8523d0aa2b
|
fix dlna playlist
|
9 years ago |
|
Luke Pulverenti
|
d74ded0fd6
|
resolved issue with setting up mixed library
|
9 years ago |
|
Luke Pulverenti
|
034c0b95b2
|
3.0.5768.1
|
9 years ago |
|
Luke Pulverenti
|
d577e1c7b0
|
support image stubbing
|
9 years ago |
|
Luke Pulverenti
|
49d222a6d5
|
retry image saving to internal location
|
9 years ago |
|
Luke Pulverenti
|
4ad96e4ff5
|
update logging levels
|
9 years ago |
|
Luke Pulverenti
|
5c613f2dda
|
update channel db
|
9 years ago |
|
Luke Pulverenti
|
078277ebc2
|
continue file system rework
|
9 years ago |
|
Luke Pulverenti
|
8ad702060e
|
begin file system rework
|
9 years ago |
|
Luke Pulverenti
|
35fc099114
|
removed dead db fields
|
9 years ago |
|
Luke Pulverenti
|
a2c371ec60
|
rework collection editor
|
9 years ago |
|
Luke Pulverenti
|
8cf45a3e4a
|
add more methods to IFileSystem
|
9 years ago |
|
Luke
|
14de062681
|
update file system methods
|
9 years ago |
|
Luke Pulverenti
|
fafa879eef
|
keep channels db clean
|
9 years ago |
|
Luke Pulverenti
|
0e9c9a53ba
|
update channels
|
9 years ago |
|
Luke Pulverenti
|
45c8f51a9c
|
update user views
|
9 years ago |
|
Luke Pulverenti
|
032891c9f3
|
update user views
|
9 years ago |
|
Luke Pulverenti
|
da837ffbf0
|
update translations
|
9 years ago |
|
Luke Pulverenti
|
8f75454d76
|
update image processing
|
9 years ago |
|
Luke Pulverenti
|
4d7f983618
|
update recording scheduler
|
9 years ago |
|
Luke Pulverenti
|
3799ad5940
|
update task triggers
|
9 years ago |
|
Luke Pulverenti
|
7300a475d1
|
update live tv setup
|
9 years ago |
|
Luke Pulverenti
|
8afd04ae37
|
consolidate people access
|
9 years ago |
|
Luke Pulverenti
|
1e7b3af9c2
|
update naming project
|
10 years ago |
|
Luke Pulverenti
|
3cc0ad2a35
|
add notification services tab
|
10 years ago |
|
Luke Pulverenti
|
4655a60d29
|
remove copyts from hls
|
10 years ago |
|
Luke Pulverenti
|
5965afecde
|
live tv fix
|
10 years ago |
|
Luke Pulverenti
|
578dec0c71
|
update stream generation
|
10 years ago |
|
Luke Pulverenti
|
bd2ea703e3
|
implement modular media sources
|
10 years ago |
|
Luke Pulverenti
|
dbb7fd61ff
|
add dynamic images
|
10 years ago |
|
Luke Pulverenti
|
5d4fec778c
|
sync updates
|
10 years ago |
|
Luke Pulverenti
|
ee00f8bf72
|
added HasSyncJob
|
10 years ago |
|
Luke Pulverenti
|
1af651bc56
|
add Add to collection buttons
|
10 years ago |
|
Luke Pulverenti
|
449485d3d2
|
add organize now/sync prepare buttons
|
10 years ago |
|
Luke Pulverenti
|
d26707708d
|
move string.Replace extension
|
10 years ago |
