alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-05 09:46:17 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
28,024 Commits 23 Branches 103 Tags
openapi-cache
Commit Graph

28024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Barron
46a0a2a601 Update migrations and fix a few bugs 2020-05-26 21:20:55 -04: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
Joshua M. Boniface
7c72f69189 Merge pull request #2733 from OancaAndrei/syncplay 
Add syncplay feature
 2020-05-26 20:00:01 -04:00
Joshua M. Boniface
b33fa06efa Merge pull request #3187 from jellyfin/revert-2492-fix-api-private-data-leak 
Revert "Fix emby/user/public API leaking sensitive data"
 2020-05-26 19:57:24 -04:00
Bond-009
b61ee09a36 Update WebSocketSharpRequest.cs 2020-05-26 20:00:37 +02:00
Bond-009
0676d1c2f4 Update WebSocketSharpRequest.cs 2020-05-26 19:33:20 +02:00
Anthony Lavado
9c00226f11 Merge pull request #3033 from neilsb/autodiscover-url-override 
Allow override of address published by auto discovery
 2020-05-26 12:20:42 -04:00
Vasily
8be13b63d4 More cleanup 2020-05-26 19:19:49 +03:00
Joshua M. Boniface
0be3dfe7c5 Revert "Fix emby/user/public API leaking sensitive data" 2020-05-26 12:14:40 -04:00
Vasily
92008baf85 Some simple cleanup 2020-05-26 19:13:11 +03:00
Vasily
aa17a53e83 Skip only line saying "Hardware acceleration methods:" instead of some random one 2020-05-26 19:05:44 +03:00
Vasily
3e381cfd5e Clean GetHwaccelType Windows handling a tiny bit 2020-05-26 19:02:22 +03:00
Vasily
628734931c Fix missing commas and merge defects 2020-05-26 18:49:15 +03:00
artiume
3c82379759 Update EncoderValidator.cs 2020-05-26 18:29:58 +03:00
artiume
abc7558f51 Update EncodingHelper.cs 2020-05-26 18:29:58 +03:00
artiume
f056704c78 add videotoolbox 2020-05-26 18:29:58 +03:00
artiume
407de0209e Update MediaEncoder.cs 2020-05-26 18:29:58 +03:00
artiume
1ff95289ef Update EncoderValidator.cs 2020-05-26 18:29:58 +03:00
artiume
62e47d056d Update IMediaEncoder.cs 2020-05-26 18:29:58 +03:00
artiume
0eb5791c70 Comments 2020-05-26 18:29:58 +03:00
Nyanmisaka
22ef0e3574 drop 'force_original_aspect_ratio' 
graphical subtitles can be off-center in some cases
 2020-05-26 18:21:31 +03:00
Nyanmisaka
5fd3ea8b21 minor changes 2020-05-26 18:21:31 +03:00
Nyanmisaka
695f20b303 probe Main/High 10 more specifically 2020-05-26 18:21:31 +03:00
Nyanmisaka
161b2a2da9 minor changes 2020-05-26 18:19:14 +03:00
nyanmisaka
c4ba71d96a resolve conflicts 2020-05-26 18:13:20 +03:00
nyanmisaka
b4b93995f7 add more separate hw decoding toggles 2020-05-26 18:06:49 +03:00
David
a5a39300bc Don't send Exception message in Production Environment 2020-05-26 16:55:27 +02:00
David
e9ebe07ecc Don't send Exception message in Production Environment 2020-05-26 16:36:54 +02:00
gion
e42bfc92f3 Fix code issues 2020-05-26 11:37:52 +02:00
gion
e4838b0faa Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-26 10:23:09 +02:00
Anthony Lavado
976ae36bea Merge pull request #3173 from joshuaboniface/fix-arm-docker 
Add -k to keyserver curl command
 2020-05-26 00:41:58 -04:00
Anthony Lavado
b93145c2f1 Merge pull request #3174 from jellyfin/checkbox 
Remove uses of fnchecked from plugins
 2020-05-25 19:50:39 -04:00
Vasily
f575415e0b Pick blurhash sizes depending on image aspect ratio 2020-05-26 02:33:52 +03:00
Vasily
0f32b0ffad Change image blurhash mapping to "image type to blurhash" 2020-05-26 01:04:40 +03:00
xumix
46420dfd68 Refactor copy codec checks 2020-05-26 00:58:19 +03:00
Bond_009
10e381f66f Fix some 'bugs' flagged by sonarcloud 2020-05-25 23:52:51 +02:00
Vasily
279f0da980 Rename ImageInfo.Hash to ImageInfo.BlurHash 2020-05-26 00:52:13 +03:00
Vasily
29443e3681 Apply suggestions from code review 
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
 2020-05-26 00:50:29 +03:00
Bond-009
5c95037234 Merge pull request #2953 from crobibero/api-startup 
Convert StartupController to ActionResult
 2020-05-25 15:17:42 +02:00
dkanada
f75a09838e remove uses of fnchecked from plugins 2020-05-25 18:25:45 +09:00
Joshua M. Boniface
35da965cd3 Add -k to keyserver curl command 
This command seems to inexplicably fail in Docker builds, despite
working on the CLI, similar to what happened with the command directly
above it in c257d6071c. Fix it in the same
way by adding `-k`.
 2020-05-25 01:30:55 -04:00
crobibero
e02cc8da53 Add Swashbuckle TODO note 2020-05-24 16:04:47 -06:00
crobibero
483e24607b Fix optional parameter binding 2020-05-24 16:01:53 -06:00
crobibero
40762f13c6 Fix route parameter casing 2020-05-24 15:54:34 -06:00
crobibero
62ea9b2821 Merge upstream/api-migration 2020-05-24 12:33:16 -06:00
crobibero
1f9cda6a66 Add ImageTags to SwaggerGenTypes 2020-05-24 12:19:37 -06:00
crobibero
70c42eb0ac Apply review suggestions 2020-05-24 12:19:26 -06:00
Neil Burrows
09915363c2 Update Emby.Server.Implementations/Udp/UdpServer.cs 
Co-authored-by: Mark Monteiro <marknr.monteiro@protonmail.com>
 2020-05-24 09:22:13 +01:00
dkanada
deafe59b7e add the timestamp property back to the version info 2020-05-24 16:59:05 +09:00