lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,393 Commits 2 Branches 0 Tags 64 MiB
a418c24806
Commit Graph

2210 Commits

Author SHA1 Message Date
dkanada
ddebc9301e
Merge pull request #3116 from Artiume/patch-2 
Update Books Resolver File Types and add .opf Mime Type
 2020-05-16 16:01:59 +09: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
artiume
a765272c17
Update MimeTypes.cs 2020-05-15 09:38:26 -04:00
artiume
527029af92 Update MediaStream.cs 2020-05-15 09:36:30 -04:00
artiume
d41cdb3b7a Update Interlace 2020-05-15 09:36:30 -04:00
artiume
eb3ce3fb87 Fix Progressive Stream 'P' capitalization 2020-05-15 09:36:30 -04:00
artiume
9ed8c6cb11
Add opf mimetype 2020-05-15 07:59:46 -04:00
Patrick Barron
87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Patrick Barron
b94afc597c Address review comments 2020-05-14 17:13:45 -04:00
MrTimscampi
234292453f Add HLG to the video range detection 2020-05-14 18:44:51 +02:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron
a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Patrick Barron
c1360a1dc3 Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Entities/User.cs
#	Jellyfin.Data/ISavingChanges.cs
#	Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
#	Jellyfin.Server.Implementations/JellyfinDb.cs
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Model/Notifications/NotificationOptions.cs
#	MediaBrowser.sln
 2020-05-12 22:22:20 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Patrick Barron
6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00:00
Mark Monteiro
dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
gion
5c8cbd4087 Fix code issues 2020-05-09 14:34:07 +02:00
gion
8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
gion
6e22e9222b Fix code issues 2020-05-09 12:37:23 +02:00
artiume
3e14b1b50f
Remove ogg video mimetype 2020-05-07 15:58:20 -04:00
Bond-009
62da4d0e5c
Merge pull request #2492 from Polpetta/fix-api-private-data-leak 
Fix emby/user/public API leaking sensitive data
 2020-05-07 14:52:10 +02:00
Davide Polonio
5c6339d8fd
Fix typo in PublicUserDto 
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
 2020-05-07 09:14:00 +02:00
Davide Polonio
57cf19f058 Fix variable declaration and follow sonarcloud suggestions 2020-05-06 17:25:41 +02:00
dkanada
cd07bc23f8
Merge pull request #3050 from Artiume/patch-1 
Update MimeTypes.cs
 2020-05-06 21:56:45 +09:00
artiume
1388464329
Update MimeTypes.cs 2020-05-06 08:23:56 -04:00
artiume
1058c80a41
Update MediaBrowser.Model/Net/MimeTypes.cs 2020-05-06 07:45:40 -04:00
artiume
0aff46631f
Update MediaBrowser.Model/Net/MimeTypes.cs 
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
 2020-05-06 07:38:19 -04:00
Mark Monteiro
432aae0fcc Add missing comma 2020-05-05 11:17:03 -04:00
artiume
183514ebe2
add azw3 2020-05-05 07:25:32 -04:00
artiume
25651362bf
Update MimeTypes.cs 2020-05-04 12:13:50 -04:00
artiume
675cbd8a16
Update MimeTypes.cs 2020-05-03 18:23:25 -04:00
Patrick Barron
032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Bond_009
7659a2ab32 Remove ListHelper extensions 2020-05-01 16:48:33 +02:00
Bond-009
690fb65cd8
Merge pull request #2985 from sparky8251/prometheus 
Add Prometheus exporters
 2020-04-29 11:36:05 +02:00
Vasily
5922c35d69
Merge pull request #2920 from Bond-009/tests2 
Add some simple tests
 2020-04-29 12:17:01 +03:00
gion
73fcbe90c0 Send error messages to clients 2020-04-27 22:39:37 +02:00
gion
083d3272d0 Refactor and other minor changes 2020-04-27 22:39:37 +02:00
gion
40889702d0 Update session ping 2020-04-27 22:39:37 +02:00
gion
6519eebabb Implement NTP like time sync 2020-04-27 22:39:37 +02:00
gion
84d92ba9ce Check that client is playing the right item 
Send date when playback command is emitted
Rename some classes
 2020-04-27 22:39:20 +02:00
gion
459297211e Implement syncplay permissions for a user 2020-04-27 22:09:02 +02:00
gion
10c2c62f07 Implement syncplay backend 2020-04-27 22:07:33 +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
Bond-009
c0b3c11b2e
Merge pull request #2846 from jellyfin/azure 
Remove requirement to build web during server builds
 2020-04-22 00:17:44 +02:00
Mark Monteiro
c5f163293f Add <ProjectGuid> properties to all project files 
This is required for SonarCloud analysis to run
 2020-04-21 16:21:09 -04:00
Vasily
07143bcb68
Merge pull request #2466 from dkanada/plugin 
Update plugin classes for nightly builds
 2020-04-21 01:45:52 +03:00
Bond_009
7f4a229cd2 Add some simple tests 2020-04-20 10:18:12 +02:00
dkanada
e6ef680775 add code suggestions 2020-04-20 14:27:46 +09:00
dkanada
eda208e258
Merge pull request #2829 from Bond-009/warn19 
Fix some warnings
 2020-04-19 12:04:02 +09:00
randrey
2e10d385f0 Add mime type for .mpegts files. 2020-04-17 23:11:52 -07:00
randrey
156998dd83 Add mime types for ape and wv files. 2020-04-17 22:25:54 -07: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
27ce10d0c1 Fix release build 2020-04-15 11:18:13 +02:00
Bond_009
fc049caba2 Merge branch 'master' into nullable3 2020-04-15 11:09:14 +02:00
dkanada
cb2523e2ef merge branch master into plugin 2020-04-13 14:38:19 +09:00
Bond-009
3d611743ed
Merge pull request #2680 from mark-monteiro/remove-common-process 
Remove CommonProcess and ProcessFactory
 2020-04-11 20:30:20 +02:00
dkanada
bd55bdb4e3 merge branch master into plugin 2020-04-11 20:10:16 +09:00
dkanada
cbe1fe2c8f update description and overview for plugins 2020-04-11 20:00:32 +09:00
dkanada
2da5df6c25 add new property for version changelogs 2020-04-11 19:56:42 +09:00
dkanada
abb7ed9c35 rename target abi property 2020-04-11 19:54:33 +09:00
dkanada
78abbcc251 standardize plugin version and guid properties 2020-04-11 19:52:40 +09:00
dkanada
8e9aeb84b1 remove release channel from plugin classes 2020-04-11 19:33:36 +09:00
Bond_009
49fe5e0a21 Fix some warnings 2020-04-11 12:03:10 +02:00
Bond_009
9cca964b08 Address comments 2020-04-09 19:22:29 +02:00
Vasily
5b59cd2eb2
Merge pull request #2696 from mark-monteiro/fix-extras 
Display Extras With Unknown Types
 2020-04-07 23:39:31 +03:00
dkanada
bfff9b7178
Merge pull request #2794 from mark-monteiro/dependabot/nuget/System.Text.Json-4.7.1 
Bump System.Text.Json from 4.7.0 to 4.7.1
 2020-04-08 02:05:09 +09:00
Vasily
8e514f8d63 Fix check for profile supporting a codec - it should first check if profile is talking about media type 
For example, audio-only profiles have "VideoCodec" set to "null" which translates to "any codec", which breaks some logic later on
 2020-04-07 14:23:53 +03:00
Bond_009
30ce346f34 Enable nullabe reference types for MediaBrowser.Model 2020-04-05 18:10:56 +02:00
Mark Monteiro
e0f40f57d8 Merge remote-tracking branch 'upstream/master' into remove-common-process 2020-04-03 20:22:03 -04:00
Mark Monteiro
387fa474aa Document HTTPS configuration options 2020-04-02 17:45:33 -04:00
Mark Monteiro
ca71ac72ab Replace EnableHttps and SupportsHttps with ListenWithHttps and CanConnectWithHttps 2020-04-02 17:45:04 -04:00
Bond-009
f31efce52d
Merge branch 'master' into usings 2020-04-01 22:42:43 +02: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
Bond-009
ddd5d3aaec
Merge branch 'master' into usings 2020-04-01 18:51:44 +02:00
Mark Monteiro
cc8294842a Add ExtraType.Unknown enum value and use it instead of null 2020-04-01 18:10:29 +02:00
Bond-009
5acd0521a2
Merge pull request #2639 from alset333/master 
Change DeinterlaceMethod's "bobandweave" to "yadif" or "yadif_bob", and set default value
 2020-03-29 23:03:01 +02:00
dkanada
bd4269cb59
Merge pull request #2667 from crobibero/emby-naming-warnings 
Fix warnings in Emby.Naming
 2020-03-28 04:51:35 +09:00
Mark Monteiro
b947d98266 Delete unnecessary ProcessFactory abstraction 2020-03-27 00:45:48 +01:00
Mark Monteiro
ee2f911a2b Remove unnecessary CommonProcess abstraction 2020-03-27 00:10:16 +01:00
dependabot-preview[bot]
798a765105
Bump System.Text.Json from 4.7.0 to 4.7.1 
Bumps [System.Text.Json](https://github.com/dotnet/corefx) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-26 17:15:32 +00:00
Mark Monteiro
aa9737afb3 Update .NET Core to 3.1.3 2020-03-25 20:09:48 +01:00
crobibero
cb68fbeb0a Fix warnings in Emby.Naming 2020-03-25 10:53:03 -06:00
Bond_009
e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
Jose
5a30d9ecfb Added support for netstandard2.0 besides netstandard2.1 (multi target framework) to allow usage from UWP (netstandard 2.1 not available in UWP until .net 5) 2020-03-24 09:58:04 +01:00
Mark Monteiro
debab44870 Update all packages to .NET Core 3.1.2 2020-03-22 02:03:07 +01:00
Peter Maar
adbf375efe
Merge pull request #1 from jellyfin/master 
Pull latest to my fork
 2020-03-19 22:02:08 -04:00
dkanada
af5d3e8eae
Merge pull request #2617 from Shawmon/wasm-mimetype 
add wasm mimetype
 2020-03-18 23:52:57 +09:00
dkanada
a96c0a72b8
Merge pull request #2549 from dkanada/refactor 
Refactor some provider classes
 2020-03-18 17:43:15 +09:00
Shawmon
8630d18372 add wasm mimetype 2020-03-17 11:49:32 +08: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
Bond-009
a7e1a5c96a
Merge pull request #2506 from mark-monteiro/inject-loggers-with-context 
Inject loggers with context using ILogger<T>
 2020-03-10 15:04:35 +01:00
dkanada
52fde64f10 remove unused files and fix some future warnings 2020-03-09 23:30:57 +09: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