jellyfin/Emby.Server.Implementations
Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore
# 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-15 17:20:07 -04:00
..
Activity Merge branch 'master' into userdb-efcore 2020-05-15 17:20:07 -04:00
AppBase Switch to using declaration 2020-04-14 15:11:21 -04:00
Archiving Document and clean up ZipClient.cs 2020-04-14 15:16:04 -04:00
Branding Apply code review suggestions 2020-04-19 13:39:12 -04:00
Browser Do not include a double slash in URLs when a base URL is not set 2020-05-10 18:07:56 -04:00
Channels Initial migration code 2020-05-12 22:10:35 -04:00
Collections Initial migration code 2020-05-12 22:10:35 -04:00
Configuration Address review comments 2020-05-14 17:13:45 -04:00
Cryptography Clean up and document CryptographyProvider.cs 2020-04-14 16:13:41 -04:00
Data 2nd half of changes 2020-05-13 00:00:57 -04:00
Devices Merge branch 'master' into userdb-efcore 2020-05-15 17:20:07 -04:00
Dto Initial migration code 2020-05-12 22:10:35 -04:00
EntryPoints Merge branch 'master' into userdb-efcore 2020-05-15 17:20:07 -04:00
HttpClientManager Register and construct IHttpClient correctly 2020-04-04 21:18:09 -04:00
HttpServer Merge branch 'master' into userdb-efcore 2020-05-15 17:20:07 -04:00
Images
IO Register and construct ILibraryMonitor correctly 2020-04-04 17:33:00 -04:00
Library Merge branch 'master' into userdb-efcore 2020-05-15 17:20:07 -04:00
LiveTv Merge branch 'master' into userdb-efcore 2020-05-15 17:20:07 -04:00
Localization Translated using Weblate (Norwegian Bokmål) 2020-05-14 23:26:47 -04:00
MediaEncoder Address comments 2020-04-01 19:05:41 +02:00
Net Fix merge errors 2020-05-02 01:09:35 +02:00
Networking Remove unused usings 2020-03-24 16:12:06 +01:00
Playlists Initial migration code 2020-05-12 22:10:35 -04:00
Properties
ScheduledTasks Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-11 10:00:39 -04:00
Security Register and construct IAuthenticationRepository correctly 2020-04-04 19:36:27 -04:00
Serialization
Services Add some simple tests 2020-04-20 10:18:12 +02:00
Session Merge branch 'master' into userdb-efcore 2020-05-15 17:20:07 -04:00
SocketSharp Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Sorting Initial migration code 2020-05-12 22:10:35 -04:00
TV Initial migration code 2020-05-12 22:10:35 -04:00
Udp
Updates merge branch master into plugin 2020-04-11 20:10:16 +09:00
UserViews
ApplicationHost.cs Merge branch 'master' into userdb-efcore 2020-05-15 17:20:07 -04:00
ConfigurationOptions.cs Fix VideoResolver and tests 2020-04-21 12:11:55 +02:00
Emby.Server.Implementations.csproj Address review comments 2020-05-14 17:13:45 -04:00
IStartupOptions.cs Add '--plugin-manifest-url' command line option and 'InstallationManager:PluginManifestUrl' config option 2020-04-05 13:46:36 -04:00
ResourceFileManager.cs
ServerApplicationPaths.cs Ensure metadata path is created on app startup, and also each time it is updated 2020-04-26 15:51:41 -04:00