jellyfin/src/Jellyfin.Database/Jellyfin.Database.Implementations, branch v12.0-rc6Unnamed repository; edit this file 'description' to name the repository.
https://git.lodewillems.com/jellyfin/atom?h=v12.0-rc62026-08-22T15:22:41ZAdapt to master2026-08-22T15:22:41ZShadowghostGhost_of_Stone@web.de2026-08-22T15:22:41Zurn:sha1:ea2c794cb2520ccb2d322da8c186875b7cebe006Merge remote-tracking branch 'upstream/master' into fix-series-merging2026-08-22T15:18:01ZShadowghostGhost_of_Stone@web.de2026-08-22T15:18:01Zurn:sha1:e1af8dce0589b7ef9abc7889993a3c3fbb8b5f52Multiple fixes and improvements2026-08-22T05:42:56ZShadowghostGhost_of_Stone@web.de2026-08-22T05:42:56Zurn:sha1:587f06dccc67a6ad67b43cf8889b6b7605950bcf
Co-Authored-By: Cody Robibero <cody@robibe.ro>
Merge remote-tracking branch 'upstream/master' into optimize-db-helper-memory2026-08-22T05:01:58ZShadowghostGhost_of_Stone@web.de2026-08-22T05:01:58Zurn:sha1:7ad5ff6aa7804855e6805495f6c9ebcf6d459a11
# Conflicts:
# src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs
Fix series merging leaking across libraries and under-counting merged children2026-08-21T20:48:47ZShadowghostGhost_of_Stone@web.de2026-08-21T20:48:47Zurn:sha1:8e80677bdd6471d04748cfcca41f997f2f48b341Stop user updates from orphaning permission and preference rows (#17645)2026-08-20T16:35:26ZTim EiseleGhost_of_Stone@web.de2026-08-20T16:35:26Zurn:sha1:fb50b4df8b5e6dec9567772aa8baecfbccb34124
* Stop user updates from orphaning permission and preference rows
* Make UserId non-nullable
* Remove unnecessary ToList
* Update Jellyfin.Server.Implementations/Users/UserManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
---------
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>Count alternate versions in the media filters and align filter conditions2026-08-14T06:46:21ZShadowghostGhost_of_Stone@web.de2026-08-14T06:37:24Zurn:sha1:40a449c6f23feb4ebebdfd20e3cba39f49d441f6Skip alternate version links when resolving link parents2026-08-14T05:39:49ZShadowghostGhost_of_Stone@web.de2026-08-14T05:39:49Zurn:sha1:c77649d21e6bd53a662b217c6431b7d123d656b9Fix formatting2026-08-12T06:48:42ZShadowghostGhost_of_Stone@web.de2026-08-12T06:48:42Zurn:sha1:7e6709f023bab9421a1219e5a59f34e1b8208147Make the media stream filter index covering2026-08-12T06:16:09ZShadowghostGhost_of_Stone@web.de2026-08-12T05:43:12Zurn:sha1:9a07d4336b9766573c8ae60743d1294750ca3a22