starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-16 05:43:54 +03:00
Code Issues 822 Packages Projects Releases 17 Wiki Activity

[PR #3825] [MERGED] Merge master into api-migration #9716

New Issue
Closed
opened 2026-02-07 06:07:11 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2026-02-07 06:07:11 +03:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/jellyfin/jellyfin/pull/3825
Author: @crobibero
Created: 8/5/2020
Status: ✅ Merged
Merged: 8/5/2020
Merged by: @joshuaboniface

Base: api-migration ← Head: api-merge-again

📝 Commits (10+)

  • a6d80f5 Add a much shorter timeout to the CollectArtifacts job
  • 7c60510 Experiment for the SSH task.
  • 3ee28c0 Switch to sudo -n
  • d191fec Minor fixes for websocket code
  • 6f306f0 Minor fixes to ActivityManager
  • e7af118 Update README.md
  • b4c6ae9 disable compatibility checks for now
  • 2b355c3 Minor improvements
  • b9d1d1c Merge pull request #3801 from michael9dk/patch-1
  • 4980db1 Fix spelling

📊 Changes

31 files changed (+316 additions, -240 deletions)

View changed files

📝 .ci/azure-pipelines-abi.yml (+16 -12)
📝 .ci/azure-pipelines-package.yml (+7 -12)
📝 Emby.Server.Implementations/Data/SqliteItemRepository.cs (+32 -26)
📝 Emby.Server.Implementations/HttpServer/HttpListenerHost.cs (+1 -1)
📝 Emby.Server.Implementations/HttpServer/WebSocketConnection.cs (+4 -4)
📝 Jellyfin.Api/Controllers/DynamicHlsController.cs (+1 -1)
📝 Jellyfin.Api/Controllers/SubtitleController.cs (+1 -2)
📝 Jellyfin.Server.Implementations/Activity/ActivityManager.cs (+3 -2)
📝 MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs (+2 -0)
📝 MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs (+14 -5)
📝 MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs (+4 -0)
📝 MediaBrowser.MediaEncoding/BdInfo/BdInfoFileInfo.cs (+11 -8)
📝 MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs (+2 -32)
➕ MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationStore.cs (+38 -0)
📝 MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs (+17 -15)
📝 MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs (+2 -0)
📝 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs (+47 -30)
📝 MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj (+13 -0)
📝 MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs (+3 -0)
📝 MediaBrowser.MediaEncoding/Probing/MediaChapter.cs (+2 -0)

...and 11 more files

📄 Description

393666e

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/jellyfin/jellyfin/pull/3825 **Author:** [@crobibero](https://github.com/crobibero) **Created:** 8/5/2020 **Status:** ✅ Merged **Merged:** 8/5/2020 **Merged by:** [@joshuaboniface](https://github.com/joshuaboniface) **Base:** `api-migration` ← **Head:** `api-merge-again` --- ### 📝 Commits (10+) - [`a6d80f5`](https://github.com/jellyfin/jellyfin/commit/a6d80f557df8587c178c1a65722c1aa968a051e7) Add a much shorter timeout to the CollectArtifacts job - [`7c60510`](https://github.com/jellyfin/jellyfin/commit/7c60510bc954c10792a10098f70c6db621a66188) Experiment for the SSH task. - [`3ee28c0`](https://github.com/jellyfin/jellyfin/commit/3ee28c016aa5e159c9b077a7d16a1e0fae7c2019) Switch to sudo -n - [`d191fec`](https://github.com/jellyfin/jellyfin/commit/d191fec3ac46942b567f4fc2ce9a34ff64302320) Minor fixes for websocket code - [`6f306f0`](https://github.com/jellyfin/jellyfin/commit/6f306f0a17571eba7466a5f8bd591498d252e1be) Minor fixes to ActivityManager - [`e7af118`](https://github.com/jellyfin/jellyfin/commit/e7af1185eb0ea404989c6adc7b595e6f7669e77e) Update README.md - [`b4c6ae9`](https://github.com/jellyfin/jellyfin/commit/b4c6ae9aba4153c042e6e98719b18c32abd608f7) disable compatibility checks for now - [`2b355c3`](https://github.com/jellyfin/jellyfin/commit/2b355c36ff8328f962f607df4aa305e53f2e003e) Minor improvements - [`b9d1d1c`](https://github.com/jellyfin/jellyfin/commit/b9d1d1c6b5d4258a10715904c73a96462d78a03b) Merge pull request #3801 from michael9dk/patch-1 - [`4980db1`](https://github.com/jellyfin/jellyfin/commit/4980db159489ce009845dd109cb4b91dc809c72c) Fix spelling ### 📊 Changes **31 files changed** (+316 additions, -240 deletions) <details> <summary>View changed files</summary> 📝 `.ci/azure-pipelines-abi.yml` (+16 -12) 📝 `.ci/azure-pipelines-package.yml` (+7 -12) 📝 `Emby.Server.Implementations/Data/SqliteItemRepository.cs` (+32 -26) 📝 `Emby.Server.Implementations/HttpServer/HttpListenerHost.cs` (+1 -1) 📝 `Emby.Server.Implementations/HttpServer/WebSocketConnection.cs` (+4 -4) 📝 `Jellyfin.Api/Controllers/DynamicHlsController.cs` (+1 -1) 📝 `Jellyfin.Api/Controllers/SubtitleController.cs` (+1 -2) 📝 `Jellyfin.Server.Implementations/Activity/ActivityManager.cs` (+3 -2) 📝 `MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs` (+2 -0) 📝 `MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs` (+14 -5) 📝 `MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs` (+4 -0) 📝 `MediaBrowser.MediaEncoding/BdInfo/BdInfoFileInfo.cs` (+11 -8) 📝 `MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs` (+2 -32) ➕ `MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationStore.cs` (+38 -0) 📝 `MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs` (+17 -15) 📝 `MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs` (+2 -0) 📝 `MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs` (+47 -30) 📝 `MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj` (+13 -0) 📝 `MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs` (+3 -0) 📝 `MediaBrowser.MediaEncoding/Probing/MediaChapter.cs` (+2 -0) _...and 11 more files_ </details> ### 📄 Description 393666e --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2026-02-07 06:07:11 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
EFjellyfin.db
area:database
awaiting-feedback
backend
blocked
breaking change: web api
bug
build
ci
confirmed
discussion needed
dotnet future
downstream
duplicate
enhancement
feature
future
github-actions
good first issue
hdr
help wanted
invalid
investigation
librarydb
live-tv
lyrics
media playback
music
needs testing
nuget
performance
platform
pull-request
Mirrored from GitHub Pull Request
 question
regression
release critical
requires-web
roadmap
security
security
stale
support
syncplay
ui & ux
upstream
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/jellyfin#9716
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?