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 #3323] [CLOSED] merge master into api-migration #9453

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

📋 Pull Request Information

Original PR: https://github.com/jellyfin/jellyfin/pull/3323
Author: @crobibero
Created: 6/12/2020
Status: ❌ Closed

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

📝 Commits (10+)

📊 Changes

952 files changed (+19537 additions, -9175 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

Attempt #3, actually update api-migration before merging.

Controllers updated:
ActivityLogController

🔄 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/3323 **Author:** [@crobibero](https://github.com/crobibero) **Created:** 6/12/2020 **Status:** ❌ Closed **Base:** `api-migration` ← **Head:** `api-migration-merge` --- ### 📝 Commits (10+) - [`512725a`](https://github.com/jellyfin/jellyfin/commit/512725a7d1c1b45fa588d76046c262b96614f58a) Fix style issue in TmdbSeriesProvider - [`6967637`](https://github.com/jellyfin/jellyfin/commit/69676373ca01411dc1053677974a9b519b5a253e) Merge pull request #3098 from barronpm/remove-ilogger - [`f08830e`](https://github.com/jellyfin/jellyfin/commit/f08830ea00e7111d68f12b001995edc56177f6e4) Merge pull request #2774 from mark-monteiro/simplify-https-config - [`511d20a`](https://github.com/jellyfin/jellyfin/commit/511d20a100398baca38f24adfabc56f6f3cfac9c) Apply review suggestions - [`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 ### 📊 Changes **952 files changed** (+19537 additions, -9175 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 Attempt #3, actually update api-migration before merging. Controllers updated: ActivityLogController --- <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:24 +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#9453
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?