[PR #3332] [MERGED] Merge master into api-migration #9459

New Issue

OVERLORD · 2026-02-07T06:02:29+03:00

OVERLORD commented

2026-02-07 06:02:29 +03:00

📋 Pull Request Information

Original PR: https://github.com/jellyfin/jellyfin/pull/3332
Author: @crobibero
Created: 6/13/2020
Status: ✅ Merged
Merged: 6/13/2020
Merged by: @joshuaboniface

Base: api-migration ← Head: api-migration

📝 Commits (10+)

a8f0d0a Merge branch 'master' into activitydb-efcore
1e9b261 Remove more unused code
1fecd55 Merge branch 'activitydb-efcore' of https://github.com/barronpm/jellyfin into activitydb-efcore
9925742 Implement more review suggestions
2849d2b Fix compile warnings in Jellyfin.Naming.Tests
11dd96f Merge pull request #3089 from MrTimscampi/tmdb-original-title
2e09311 Merge branch 'master' into websocket
5ce008e Merge pull request #2162 from Bond-009/websocket
428e1b0 Add color transfer to ffprobe results
2342924 Add HLG to the video range detection

📊 Changes

999 files changed (+19803 additions, -9331 deletions)

View changed files

📝 .ci/azure-pipelines-abi.yml (+21 -28)
📝 .ci/azure-pipelines-main.yml (+42 -49)
📝 .ci/azure-pipelines-test.yml (+46 -18)
📝 .ci/azure-pipelines.yml (+12 -12)
➖ .copr/Makefile (+0 -59)
➕ .copr/Makefile (+1 -0)
📝 .editorconfig (+7 -10)
➕ .github/CODEOWNERS (+3 -0)
➕ .github/dependabot.yml (+9 -0)
📝 .gitignore (+12 -7)
📝 .vscode/tasks.json (+11 -1)
📝 Dockerfile (+1 -1)
📝 Dockerfile.arm (+1 -1)
📝 DvdLib/BigEndianBinaryReader.cs (+2 -0)
📝 DvdLib/DvdLib.csproj (+6 -0)
📝 DvdLib/Ifo/Cell.cs (+2 -0)
📝 DvdLib/Ifo/CellPlaybackInfo.cs (+2 -0)
📝 DvdLib/Ifo/CellPositionInfo.cs (+2 -0)
📝 DvdLib/Ifo/Chapter.cs (+2 -0)
📝 DvdLib/Ifo/Dvd.cs (+2 -0)

...and 80 more files

📄 Description

Merge without fix, then fix in ec3e15db57

_{🔄 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/3332 **Author:** [@crobibero](https://github.com/crobibero) **Created:** 6/13/2020 **Status:** ✅ Merged **Merged:** 6/13/2020 **Merged by:** [@joshuaboniface](https://github.com/joshuaboniface) **Base:** `api-migration` ← **Head:** `api-migration` --- ### 📝 Commits (10+) - [`a8f0d0a`](https://github.com/jellyfin/jellyfin/commit/a8f0d0aa0dfe589f4dd5148d0c328bf83271ffb2) Merge branch 'master' into activitydb-efcore - [`1e9b261`](https://github.com/jellyfin/jellyfin/commit/1e9b2613c690f4afe561eb8401705834bb51b6b8) Remove more unused code - [`1fecd55`](https://github.com/jellyfin/jellyfin/commit/1fecd55ac053afc1e785da7183f35e0e819336b3) Merge branch 'activitydb-efcore' of https://github.com/barronpm/jellyfin into activitydb-efcore - [`9925742`](https://github.com/jellyfin/jellyfin/commit/992574291821ba417ac624aeb0bf0022159b5c30) Implement more review suggestions - [`2849d2b`](https://github.com/jellyfin/jellyfin/commit/2849d2b134691539ff990774073a8c03f2014918) Fix compile warnings in Jellyfin.Naming.Tests - [`11dd96f`](https://github.com/jellyfin/jellyfin/commit/11dd96f6c715b0f701903e636f08ee910c9a08eb) Merge pull request #3089 from MrTimscampi/tmdb-original-title - [`2e09311`](https://github.com/jellyfin/jellyfin/commit/2e09311a93cbf7b4d0629e058974a84e70c4b800) Merge branch 'master' into websocket - [`5ce008e`](https://github.com/jellyfin/jellyfin/commit/5ce008e02f0500c5d0298067fa401a740742e3f0) Merge pull request #2162 from Bond-009/websocket - [`428e1b0`](https://github.com/jellyfin/jellyfin/commit/428e1b04fc942b66dafaa04081d3b9dc5de62f1d) Add color transfer to ffprobe results - [`2342924`](https://github.com/jellyfin/jellyfin/commit/234292453f9b05f1fd6c2a00280a1a4b4254a4fa) Add HLG to the video range detection ### 📊 Changes **999 files changed** (+19803 additions, -9331 deletions) <details> <summary>View changed files</summary> 📝 `.ci/azure-pipelines-abi.yml` (+21 -28) 📝 `.ci/azure-pipelines-main.yml` (+42 -49) 📝 `.ci/azure-pipelines-test.yml` (+46 -18) 📝 `.ci/azure-pipelines.yml` (+12 -12) ➖ `.copr/Makefile` (+0 -59) ➕ `.copr/Makefile` (+1 -0) 📝 `.editorconfig` (+7 -10) ➕ `.github/CODEOWNERS` (+3 -0) ➕ `.github/dependabot.yml` (+9 -0) 📝 `.gitignore` (+12 -7) 📝 `.vscode/tasks.json` (+11 -1) 📝 `Dockerfile` (+1 -1) 📝 `Dockerfile.arm` (+1 -1) 📝 `DvdLib/BigEndianBinaryReader.cs` (+2 -0) 📝 `DvdLib/DvdLib.csproj` (+6 -0) 📝 `DvdLib/Ifo/Cell.cs` (+2 -0) 📝 `DvdLib/Ifo/CellPlaybackInfo.cs` (+2 -0) 📝 `DvdLib/Ifo/CellPositionInfo.cs` (+2 -0) 📝 `DvdLib/Ifo/Chapter.cs` (+2 -0) 📝 `DvdLib/Ifo/Dvd.cs` (+2 -0) _...and 80 more files_ </details> ### 📄 Description Merge without fix, then fix in https://github.com/jellyfin/jellyfin/pull/3332/commits/ec3e15db5789b6218482beb488433f41f9a0d8ba --- <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:02:29 +03:00

OVERLORD closed this issue

2026-02-07 06:02:30 +03:00

Sign in to join this conversation.

Branches Tags

master

renovate/major-skiasharp-monorepo

renovate/sharpcompress-0.x

renovate/svg.skia-5.x

renovate/ghcr.io-devcontainers-features-docker-in-docker-4.x

release-10.11.z

standards-fix

release-10.9.z

openapi-cache

release-10.10.z

explicit-load

explicit-load-v2

feature/entity-framework

only-count-folder-item

fix/ci-workflow-refactor

release-10.8.z

release-10.7.z

EraYaN-add-management-interface

release-10.6.z

release-10.5.z

release-10.4.z

release-10.3.z

release-10.2.z

release-10.1.0

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/jellyfin#9459