crobibero
|
5c66f9e471
|
changes from merge
|
2020-07-20 14:43:54 -06:00 |
|
crobibero
|
1385064497
|
Merge remote-tracking branch 'upstream/master' into api-migration-merge
|
2020-07-20 14:28:33 -06:00 |
|
telans
|
9018f8d8be
|
Add full stop at end of comments (SA1629)
|
2020-06-16 10:37:52 +12:00 |
|
David
|
8a8bf4b686
|
Merge remote-tracking branch 'upstream/api-migration' into api-sessionservice
|
2020-06-14 12:49:43 +02:00 |
|
crobibero
|
829eb1a849
|
merge master into api-migration
|
2020-06-13 13:03:09 -06:00 |
|
David
|
fff3c789b9
|
Move SessionService to Jellyfin.Api
|
2020-06-12 18:54:25 +02:00 |
|
David
|
6a70081643
|
Move ApiKeyService to Jellyfin.Api
|
2020-06-10 15:57:31 +02:00 |
|
Patrick Barron
|
06f9cde22f
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
# Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
# Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
# Emby.Server.Implementations/TV/TVSeriesManager.cs
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
|
2020-06-04 16:52:23 -04:00 |
|
Bond_009
|
10e381f66f
|
Fix some 'bugs' flagged by sonarcloud
|
2020-05-25 23:52:51 +02: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
|
9ad839c776
|
Initial migration code
|
2020-05-12 22:10:35 -04:00 |
|
Bond_009
|
15634a1913
|
Merge branch 'master' into websocket
|
2020-05-02 00:54:04 +02:00 |
|
Mark Monteiro
|
b67e9cde8c
|
Replace ILogger with ILogger<T> wherever possible
Log entries will contain additional class context when using this interface
|
2020-03-03 23:07:10 +01:00 |
|
dkanada
|
53db526667
|
merge branch master into refactor
|
2020-02-14 03:02:06 +09:00 |
|
dkanada
|
1cb51a8ac7
|
rename session folder
|
2020-02-06 00:47:50 +09:00 |
|