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-26Merge remote-tracking branch 'upstream/master' into syncplaygion
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-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
2020-05-07Remove ogg video mimetypeartiume
2020-05-07Merge pull request #2492 from Polpetta/fix-api-private-data-leakBond-009
Fix emby/user/public API leaking sensitive data
2020-05-07Fix typo in PublicUserDtoDavide Polonio
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-05-06Fix variable declaration and follow sonarcloud suggestionsDavide Polonio
2020-05-06Merge pull request #3050 from Artiume/patch-1dkanada
Update MimeTypes.cs
2020-05-06Update MimeTypes.csartiume
2020-05-06Update MediaBrowser.Model/Net/MimeTypes.csartiume
2020-05-06Update MediaBrowser.Model/Net/MimeTypes.csartiume
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
2020-05-05Add missing commaMark Monteiro
2020-05-05add azw3artiume
2020-05-04Update MimeTypes.csartiume
2020-05-03Update MimeTypes.csartiume
2020-05-02Migrate activity db to EF CorePatrick Barron
2020-05-02Merge branch 'master' into websocketBond_009
2020-05-01Remove ListHelper extensionsBond_009
2020-04-29Merge pull request #2985 from sparky8251/prometheusBond-009
Add Prometheus exporters
2020-04-29Merge pull request #2920 from Bond-009/tests2Vasily
Add some simple tests
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-29 13:36:40 +0000