telans
5bb639a59a
newlines after braces
2020-06-20 21:13:48 +12:00
Bond-009
9af6eda0b4
Merge pull request #3343 from telans/comment-stops
...
Add full stop at end of comments (SA1629)
2020-06-16 11:54:58 +02:00
telans
247f9c61e6
fix SA1513/SA1516
2020-06-16 16:11:30 +12:00
telans
9018f8d8be
Add full stop at end of comments (SA1629)
2020-06-16 10:37:52 +12:00
dkanada
dabb869a6b
Merge branch 'master' into hwaccel
2020-06-15 20:21:25 +09:00
Patrick Barron
7a115024aa
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Providers/Users/UserMetadataService.cs
2020-06-11 18:23:12 -04:00
artiume
b79957d07e
Split HEVC VP9 10bit
2020-06-08 14:45:27 +03:00
Vasily
4999831604
Merge remote-tracking branch 'upstream/master' into hwaccel
2020-06-08 14:44:21 +03:00
dkanada
6d4f3c42a2
Merge pull request #3208 from jellyfin/plugins
...
More work for core plugins
2020-06-06 12:27:45 +09:00
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
2020-06-04 16:52:23 -04:00
Vasily
668e10ceb7
Merge pull request #2767 from Bond-009/nullable3
...
Enable nullabe reference types for MediaBrowser.Model
2020-06-03 12:26:54 +03:00
Anthony Lavado
c31b2798a5
Merge pull request #3180 from xumix/master
...
Refactor copy codec checks
2020-06-03 02:47:15 -04:00
dkanada
d72bb8358e
minor changes to server configuration file
2020-05-31 15:20:17 +09:00
Bond_009
7439e095e2
Merge branch 'master' into nullable3
2020-05-27 20:49:18 +02:00
Patrick Barron
7c823464bc
Fix merge conflicts with SyncPlay
2020-05-26 20:52:05 -04:00
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
2020-05-26 20:29:11 -04:00
nyanmisaka
b4b93995f7
add more separate hw decoding toggles
2020-05-26 18:06:49 +03:00
gion
e4838b0faa
Merge remote-tracking branch 'upstream/master' into syncplay
2020-05-26 10:23:09 +02:00
xumix
46420dfd68
Refactor copy codec checks
2020-05-26 00:58:19 +03:00
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
2020-05-15 17:20:07 -04:00
gion
029bb80910
Merge remote-tracking branch 'upstream/master' into syncplay
2020-05-15 18:59:35 +02:00
Patrick Barron
b94afc597c
Address review comments
2020-05-14 17:13:45 -04:00
Patrick Barron
9ad839c776
Initial migration code
2020-05-12 22:10:35 -04:00
Mark Monteiro
dc5165b97f
Merge branch 'master' into simplify-https-config
2020-05-10 14:43:57 -04:00
gion
8a6ec2fb71
Rename Syncplay to SyncPlay
2020-05-09 12:37:39 +02:00
gion
459297211e
Implement syncplay permissions for a user
2020-04-27 22:09:02 +02:00
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
2020-04-26 12:07:54 -04:00
Mark Monteiro
93649ad77b
Merge remote-tracking branch 'upstream/master' into simplify-https-config
2020-04-26 11:44:42 -04:00
sparky8251
68c7a914c3
Added option to disable metrics collection and defaulted it to off
2020-04-26 11:28:17 -04:00
Mark Monteiro
bcf1ef319a
Update documentation for EnableUPnP
2020-04-17 00:27:18 -04:00
Mark Monteiro
c78413cf7c
Disable UPnP by default
2020-04-16 22:41:19 -04:00
Bond_009
30ce346f34
Enable nullabe reference types for MediaBrowser.Model
2020-04-05 18:10:56 +02:00
Mark Monteiro
387fa474aa
Document HTTPS configuration options
2020-04-02 17:45:33 -04:00
Vasily
07ea120ba9
Merge pull request #2601 from mark-monteiro/support-running-without-web-content
...
Support Running Server Without Web Content
2020-04-01 23:38:43 +03:00
Peter Maar
adbf375efe
Merge pull request #1 from jellyfin/master
...
Pull latest to my fork
2020-03-19 22:02:08 -04:00
Mark Monteiro
e2685c51ec
Merge remote-tracking branch 'upstream/master' into support-running-without-web-content
2020-03-15 18:07:02 +01:00
Mark Monteiro
99bf6edba2
Merge remote-tracking branch 'upstream/master' into support-running-without-web-content
2020-03-11 23:04:47 +01:00
Bond-009
94fe9b8f6d
Merge branch 'master' into warn17
2020-03-11 20:26:43 +01:00
Joshua M. Boniface
e0381c8854
Set EnableHttps disabled by default
...
Prevents issues on first setup when behind a reverse proxy. Also
prevents issues saving the Networking page by default if SSL is not
fully configured.
2020-03-07 11:55:02 -05:00
Vasily
acd67c7152
Add tracking of JF version used to run this config previously
2020-03-05 16:22:15 +03:00
dkanada
2dc1a18203
Merge pull request #2501 from JustAMan/pedal-to-the-metal-from-the-get-go
...
Default transcoding throttling to false for new installs
2020-03-04 01:37:44 +09:00
Vasily
c1aafd2ba0
Default transcoding throttling to false for new installs
2020-03-03 19:14:31 +03:00
Mark Monteiro
d95ccbacac
Use IsHostingContent instead of explicitly checking ContentRoot
2020-02-26 16:11:09 +01:00
dkanada
4ae80a5d56
partially fix issue with music scans
2020-02-24 14:35:30 +09:00
Peter Maar
818695a01e
Improve controls for deinterlace method; matches with jellyfin-web changes
2020-02-23 21:40:53 -05:00
Bond_009
07cc4be6a7
Fix some warnings
...
* Add analyzers to MediaBrowser.XbmcMetadata
* Enable TreatWarningsAsErrors for MediaBrowser.XbmcMetadata
* Add analyzers to MediaBrowser.WebDashboard
* Enable TreatWarningsAsErrors for MediaBrowser.WebDashboard
* Disable SA1600 in favor of CS1591
2020-02-23 12:11:43 +01:00
Peter Maar
7716deddf0
Add encoding option bobandweave, change back the EncodingHelper logic
2020-02-22 17:01:56 -05:00
Ulrich Wagner
d7f199bb1c
#2407 : Prefer MP4-Metadata for episodes
2020-02-17 14:57:07 +01:00
Bond_009
f5db4c8402
Another baseurl related fix
...
Baseurl always starts with a '/' (unless it's empty)
2020-02-12 20:57:34 +01:00
Bond_009
f47ad85011
Fix warnings MediaBrowser.Model
2020-02-04 01:49:27 +01:00