Patrick Barron
|
01ce56016a
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
# MediaBrowser.Api/UserService.cs
# MediaBrowser.Controller/Library/IUserManager.cs
|
2020-05-26 20:29:11 -04:00 |
|
Mark Monteiro
|
3ed76d7e08
|
Update to .NET Core 3.1.4
|
2020-05-17 13:33:38 -04:00 |
|
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 |
|
Patrick Barron
|
b94afc597c
|
Address review comments
|
2020-05-14 17:13:45 -04:00 |
|
Patrick Barron
|
a78184ef44
|
Add the user data to the schema
|
2020-05-04 16:00:41 -04:00 |
|
Patrick Barron
|
032de931b1
|
Migrate activity db to EF Core
|
2020-05-02 18:32:22 -04:00 |
|