michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,221 Commits 2 Branches 79 Tags 73 MiB
d85308b474
Commit Graph

362 Commits

Author SHA1 Message Date
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
Patrick Barron
585fdbad39 Apply review suggestion and fix entity concurrency tokens. 2020-05-31 17:00:57 -04:00
Bond_009
4748105dce Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode 2020-05-29 11:28:19 +02:00
Patrick Barron
8ca78f33e9 Fix bug when migrating user db with users that have never logged in. 2020-05-28 14:21:26 -04:00
Patrick Barron
fefb282137 Fixed issue when LastLoginDate or LastActivityDate were null 2020-05-26 22:30:23 -04:00
Patrick Barron
46a0a2a601 Update migrations and fix a few bugs 2020-05-26 21:20:55 -04:00
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
Anthony Lavado
9c00226f11
Merge pull request #3033 from neilsb/autodiscover-url-override 
Allow override of address published by auto discovery
 2020-05-26 12:20:42 -04:00
Patrick Barron
e052128c52 Cleanup and fix more bugs 2020-05-23 16:07:42 -04:00
Patrick Barron
e8173df9dc Cleanup 2020-05-23 15:33:14 -04:00
Patrick Barron
7d9d54d2ec Fix profile images. 2020-05-20 12:09:52 -04:00
Patrick Barron
1d1a145ad4 Fix issues and add profile image support 2020-05-20 10:04:00 -04:00
Patrick Barron
d35a7ba8bd Fix more issues 2020-05-20 10:04:00 -04:00
Patrick Barron
e7b297c67b Add some missing properties 2020-05-20 10:04:00 -04:00
Patrick Barron
3eeb6576d8 Migrate User DB to EF Core 2020-05-20 10:04:00 -04:00
Neil Burrows
d7b2c2a176 Renaming variable and refactoring IF statement 2020-05-20 09:11:26 +01: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
Mark Monteiro
757643e326 Merge remote-tracking branch 'upstream/master' into no-more-doppelgangers 2020-05-15 15:23:44 -04:00
Mark Monteiro
6e68702799 Do not run DELETE command if no extras are detected 
Also log a message if no extras were detected 
Also log the path used for the database backup
Also add some comments to explain the migration
 2020-05-15 15:12:26 -04:00
Vasily
43dc604e87 Fixed compilation, added backing db before removing extras 2020-05-15 21:49:45 +03:00
Patrick Barron
79dee27299 Fixed indentation 2020-05-15 14:33:36 -04:00
Vasily
034fe97eeb
Apply suggestions from code review 
Co-authored-by: Mark Monteiro <marknr.monteiro@protonmail.com>
 2020-05-15 21:32:56 +03:00
Patrick Barron
a7c2e524a9 Apply more review suggestions 2020-05-15 14:09:15 -04:00
Patrick Barron
a5dee36808 Apply more review suggestions 2020-05-15 12:51:18 -04:00
Vasily
7c57134535 Implement a cleanup migration 2020-05-15 02:30:28 +03:00
Patrick Barron
87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Patrick Barron
b94afc597c Address review comments 2020-05-14 17:13:45 -04:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron
9925742918 Implement more review suggestions 2020-05-13 17:55:31 -04:00
Patrick Barron
a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Patrick Barron
511d20a100 Apply review suggestions 2020-05-13 15:03:35 -04:00
Vasily
f08830ea00
Merge pull request #2774 from mark-monteiro/simplify-https-config 
Simplify HTTPS Properties
 2020-05-13 20:36:54 +03:00
Patrick Barron
b7621d762c 2nd half of changes 2020-05-13 00:00:57 -04:00
Patrick Barron
c1360a1dc3 Merge branch 'master' into userdb-efcore 
# 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-12 22:22:20 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Patrick Barron
bac4bf96a0 Fix build errors 2020-05-12 12:50:17 -04:00
Patrick Barron
6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00:00
Bond-009
dabd67d127
Merge pull request #2900 from mark-monteiro/migration-dependency-injection 
Use dependency injection to construct migration routines
 2020-05-11 10:15:35 +02:00
Mark Monteiro
a10aec6956 Fix merge 2020-05-10 18:17:12 -04:00
Mark Monteiro
dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
dkanada
176159d0a8
Merge pull request #2969 from BaronGreenback/my-feature 
http in development mode crashed -
 2020-05-07 02:24:42 +09:00
BaronGreenback
ba2134de13 Made changes to message and exception class 2020-05-06 16:04:07 +01:00
Mark Monteiro
1c06111497 Merge remote-tracking branch 'upstream/master' into integration-tests 2020-05-03 01:04:19 -04:00
Patrick Barron
032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Neil Burrows
b737301c70 Auto discover published URL override 2020-05-02 17:56:09 +01:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Bond-009
690fb65cd8
Merge pull request #2985 from sparky8251/prometheus 
Add Prometheus exporters
 2020-04-29 11:36:05 +02:00
sparky8251
e3a42a8fe9 Address reviews 2020-04-27 08:42:46 -04:00
Mark Monteiro
679f97d5e9 Merge remote-tracking branch 'upstream/master' into simplify-https-config 
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
 2020-04-26 17:37:30 -04:00