aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
AgeCommit message (Collapse)Author
2020-05-26Fix merge conflicts with SyncPlayPatrick Barron
2020-05-26Merge branch 'master' into userdb-efcorePatrick Barron
# Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj # MediaBrowser.Api/UserService.cs # MediaBrowser.Controller/Library/IUserManager.cs
2020-05-26Merge pull request #2733 from OancaAndrei/syncplayJoshua M. Boniface
Add syncplay feature
2020-05-26Revert "Fix emby/user/public API leaking sensitive data"Joshua M. Boniface
2020-05-26add more separate hw decoding togglesnyanmisaka
2020-05-26Merge remote-tracking branch 'upstream/master' into syncplaygion
2020-05-26Change image blurhash mapping to "image type to blurhash"Vasily
2020-05-26Refactor copy codec checksxumix
2020-05-26Rename ImageInfo.Hash to ImageInfo.BlurHashVasily
2020-05-26Apply suggestions from code reviewVasily
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
2020-05-24add the timestamp property back to the version infodkanada
2020-05-24fix a few issues with the plugin manifestdkanada
2020-05-23Remove 'General' as an ExternalIdMediaType, and instead use 'null' to ↵Mark Monteiro
represent a general external id type
2020-05-23Specify enum values for ExternalIdMediaType explicitlyMark Monteiro
2020-05-21Rename Hash to BlurHash in all properties and methods for clarityVasily
2020-05-20Add .edl Mimetypeartiume
2020-05-20Remove redundant qualifiersPatrick Barron
2020-05-20Fix profile images.Patrick Barron
2020-05-20Migrate User DB to EF CorePatrick Barron
2020-05-18Add BlurHash support to backendJesús Higueras
2020-05-17Rename Name to ProviderNameMark Monteiro
2020-05-17Clean up some doc commentsMark Monteiro
2020-05-17Do not convert 'Type' value to string unnecessarily, and do not replace ↵Mark Monteiro
'General' type with null
2020-05-17Move ExternalIdMediaType enum to MediaBrowser.ModelMark Monteiro
2020-05-17Clean up documentationMark Monteiro
2020-05-17Merge branch 'master' into externalid-typeMark Monteiro
2020-05-17Update to .NET Core 3.1.4Mark Monteiro
2020-05-18Merge pull request #3115 from MrTimscampi/ffprobedkanada
Parse color transfer and color primaries from ffprobe, and fix video range
2020-05-16Fix suggestionsMrTimscampi
2020-05-16Merge pull request #3113 from Artiume/patch-1dkanada
Fix Progressive and Interlaced Stream capitalization
2020-05-16Merge pull request #3116 from Artiume/patch-2dkanada
Update Books Resolver File Types and add .opf Mime Type
2020-05-15Merge branch 'master' into userdb-efcorePatrick Barron
# Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs
2020-05-15Merge remote-tracking branch 'upstream/master' into syncplaygion
2020-05-15Update MimeTypes.csartiume
2020-05-15Update MediaStream.csartiume
2020-05-15Update Interlaceartiume
2020-05-15Fix Progressive Stream 'P' capitalizationartiume
2020-05-15Add opf mimetypeartiume
2020-05-14Merge branch 'master' into activitydb-efcorePatrick Barron
2020-05-14Address review commentsPatrick Barron
2020-05-14Add HLG to the video range detectionMrTimscampi
2020-05-14Merge branch 'master' into websocketMark Monteiro
2020-05-13Merge branch 'master' into activitydb-efcorePatrick Barron
2020-05-12Merge branch 'master' into userdb-efcorePatrick Barron
# Conflicts: # Emby.Server.Implementations/Data/SqliteUserDataRepository.cs # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Entities/User.cs # Jellyfin.Data/ISavingChanges.cs # Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj # Jellyfin.Server.Implementations/JellyfinDb.cs # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Model/Notifications/NotificationOptions.cs # MediaBrowser.sln
2020-05-12Initial migration codePatrick Barron
2020-05-12Merge branch 'master' into activitydb-efcorePatrick Barron
2020-05-10Merge branch 'master' into simplify-https-configMark Monteiro
2020-05-09Fix code issuesgion
2020-05-09Rename Syncplay to SyncPlaygion
2020-05-09Fix code issuesgion
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-25 02:17:00 +0000