aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
AgeCommit message (Collapse)Author
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-17Rename external id type 'None' to 'General'Mark 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-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 pull request #2970 from barronpm/activitydb-efcoreVasily
Migrate Activity Database to Entity Framework Core
2020-05-15Merge remote-tracking branch 'upstream/master' into syncplaygion
2020-05-14Rename functionFrank Riley
2020-05-14Fix #3083: Set the Access-Control-Allow-Origin header to the request ↵Frank Riley
origin/host header if possible
2020-05-14Merge branch 'master' into activitydb-efcorePatrick Barron
2020-05-14Merge branch 'master' into websocketMark Monteiro
2020-05-13Merge branch 'activitydb-efcore' of https://github.com/barronpm/jellyfin ↵Patrick Barron
into activitydb-efcore
2020-05-13Remove more unused codePatrick Barron
2020-05-13Merge branch 'master' into activitydb-efcorePatrick Barron
2020-05-13Apply review suggestionsPatrick Barron
2020-05-13Apply documentation suggestions from code reviewMark Monteiro
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-05-132nd half of changesPatrick 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-10Do not include a double slash in URLs when a base URL is not setMark Monteiro
2020-05-10Merge branch 'master' into simplify-https-configMark Monteiro
2020-05-10Add GetLoopbackHttpApiUrl() helper method to replace forceHttps functionalityMark Monteiro
Also refactor to use return a Uri instead of a string and use UriBuilder under the hood
2020-05-09Fix code issuesgion
2020-05-09Rename Syncplay to SyncPlaygion
2020-05-09Fix code issuesgion
2020-05-08Add Post subtitle in APIredSpoutnik
2020-05-07Merge pull request #2492 from Polpetta/fix-api-private-data-leakBond-009
Fix emby/user/public API leaking sensitive data
2020-05-02Make SonarCloud happyBond_009
2020-05-02Merge branch 'master' into websocketBond_009
2020-04-29Merge pull request #2817 from ferferga/masterVasily
Remove unnecessary space in hardware decoders argument for ffmpeg
2020-04-27Refactor and other minor changesgion
2020-04-27Implement KeepAlive for WebSocketsgion
2020-04-27Check that client is playing the right itemgion
Send date when playback command is emitted Rename some classes
2020-04-27Refactor: rename user to sessiongion
2020-04-27Implement syncplay backendgion
2020-04-26Merge remote-tracking branch 'upstream/master' into simplify-https-configMark Monteiro
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
2020-04-26Merge pull request #2990 from mark-monteiro/create-missing-foldersJoshua M. Boniface
Create Missing Data Folders
2020-04-26Ensure metadata path is created on app startup, and also each time it is updatedMark Monteiro
2020-04-26Merge pull request #2798 from JustAMan/fix-livetv-againJoshua M. Boniface
Make localhost LiveTV restreams always use plain HTTP port
2020-04-26Apply style changeJoshua M. Boniface
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-04-26Apply style changeJoshua M. Boniface
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-04-26Apply style changeJoshua M. Boniface
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-04-26Merge remote-tracking branch 'upstream/master' into simplify-https-configMark Monteiro
2020-04-23Merge pull request #2861 from mark-monteiro/fix-auth-response-codesdkanada
Fix Auth Response Codes
2020-04-22Merge branch 'master' into register-services-correctlyBond-009
2020-04-22Merge branch 'master' into fix-auth-response-codesBond-009
2020-04-22Merge pull request #2846 from jellyfin/azureBond-009
Remove requirement to build web during server builds
2020-04-21Add <ProjectGuid> properties to all project filesMark Monteiro
This is required for SonarCloud analysis to run
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-15 07:18:54 +0000