Matt Montgomery
4fa3d3f4f3
Merge remote-tracking branch 'upstream/master' into quickconnect
4 years ago
Matt Montgomery
a40fe86776
Merge remote-tracking branch 'upstream/master' into quickconnect
4 years ago
Bond-009
ab9c1295ce
Merge pull request #3538 from Ullmie02/api-fix
...
Fix value parsing in Jellyfin.Api
5 years ago
crobibero
1385064497
Merge remote-tracking branch 'upstream/master' into api-migration-merge
5 years ago
David
262e19b691
Add X-Response-Time-ms header and log slow server response time
5 years ago
David
ee03b919f9
Fix parsing
5 years ago
Bond-009
89ef8d79d6
Merge pull request #3465 from BaronGreenback/BugFix2
...
10.6.0.0 Null Pointer fix
5 years ago
BaronGreenback
2f4860741c
_config.Configuration.PluginRespositories not instantiated causing InstallationManager.cs to crash with a null pointer.
5 years ago
dkanada
83ae4d074d
use constructor to set optimal config values
5 years ago
Bond-009
3d42f37538
Minor changes
5 years ago
dkanada
552a358c9c
Merge pull request #3244 from jellyfin/custom-repos
...
Initial implementation for custom plugin repositories
5 years ago
telans
5bb639a59a
newlines after braces
5 years ago
ConfusedPolarBear
e2f16fc255
Merge remote-tracking branch 'upstream/master' into quickconnect
5 years ago
ConfusedPolarBear
4be476ec53
Move all settings into the main server configuration
...
Decreased the timeout from 30 minutes to 5.
Public lookup values have been replaced with the short code.
5 years ago
dkanada
f5d82441a4
Merge branch 'master' into custom-repos
5 years ago
Bond-009
9af6eda0b4
Merge pull request #3343 from telans/comment-stops
...
Add full stop at end of comments (SA1629)
5 years ago
telans
247f9c61e6
fix SA1513/SA1516
5 years ago
telans
9018f8d8be
Add full stop at end of comments (SA1629)
5 years ago
dkanada
dabb869a6b
Merge branch 'master' into hwaccel
5 years ago
Patrick Barron
7a115024aa
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Providers/Users/UserMetadataService.cs
5 years ago
artiume
b79957d07e
Split HEVC VP9 10bit
5 years ago
Vasily
4999831604
Merge remote-tracking branch 'upstream/master' into hwaccel
5 years ago
dkanada
52cd955a8f
merge branch master into custom-repos
5 years ago
dkanada
6d4f3c42a2
Merge pull request #3208 from jellyfin/plugins
...
More work for core plugins
5 years ago
crobibero
340624c54b
Move default repo addition to migration
5 years ago
Patrick Barron
06f9cde22f
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
# Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
# Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
# Emby.Server.Implementations/TV/TVSeriesManager.cs
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
5 years ago
dkanada
b7f4b8e2b5
initial implementation for custom plugin repositories
5 years ago
Vasily
668e10ceb7
Merge pull request #2767 from Bond-009/nullable3
...
Enable nullabe reference types for MediaBrowser.Model
5 years ago
Anthony Lavado
c31b2798a5
Merge pull request #3180 from xumix/master
...
Refactor copy codec checks
5 years ago
dkanada
d72bb8358e
minor changes to server configuration file
5 years ago
Bond_009
7439e095e2
Merge branch 'master' into nullable3
5 years ago
Patrick Barron
7c823464bc
Fix merge conflicts with SyncPlay
5 years ago
Patrick Barron
01ce56016a
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
# MediaBrowser.Api/UserService.cs
# MediaBrowser.Controller/Library/IUserManager.cs
5 years ago
nyanmisaka
b4b93995f7
add more separate hw decoding toggles
5 years ago
gion
e4838b0faa
Merge remote-tracking branch 'upstream/master' into syncplay
5 years ago
xumix
46420dfd68
Refactor copy codec checks
5 years ago
Patrick Barron
aca7e221d8
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
# Emby.Server.Implementations/ApplicationHost.cs
# Emby.Server.Implementations/Devices/DeviceManager.cs
# Jellyfin.Server/Jellyfin.Server.csproj
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Controller/Devices/IDeviceManager.cs
5 years ago
gion
029bb80910
Merge remote-tracking branch 'upstream/master' into syncplay
5 years ago
Patrick Barron
b94afc597c
Address review comments
5 years ago
Patrick Barron
9ad839c776
Initial migration code
5 years ago
Mark Monteiro
dc5165b97f
Merge branch 'master' into simplify-https-config
5 years ago
gion
8a6ec2fb71
Rename Syncplay to SyncPlay
5 years ago
gion
459297211e
Implement syncplay permissions for a user
5 years ago
Mark Monteiro
57b5ec1d51
Remove unnecessary properties from SystemInfo response object
...
These properties do not provide any useful information to the client. The client would already have to have all this information in order to connect to the endpoint to retrieve it
5 years ago
Mark Monteiro
93649ad77b
Merge remote-tracking branch 'upstream/master' into simplify-https-config
5 years ago
sparky8251
68c7a914c3
Added option to disable metrics collection and defaulted it to off
5 years ago
Mark Monteiro
bcf1ef319a
Update documentation for EnableUPnP
5 years ago
Mark Monteiro
c78413cf7c
Disable UPnP by default
5 years ago
Bond_009
30ce346f34
Enable nullabe reference types for MediaBrowser.Model
5 years ago
Mark Monteiro
387fa474aa
Document HTTPS configuration options
5 years ago