Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 07:10:34 +02:00
Code Issues Packages Projects Releases Wiki Activity
16206 commits 29 branches 75 tags 1.3 GiB
Commit graph

2760 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
Bond-009 2dbb9d4895 Fix build 2020-06-03 11:54:01 +02:00
Vasily 668e10ceb7
Merge pull request #2767 from Bond-009/nullable3 
Enable nullabe reference types for MediaBrowser.Model
 2020-06-03 12:26:54 +03:00
Anthony Lavado c31b2798a5
Merge pull request #3180 from xumix/master 
Refactor copy codec checks
 2020-06-03 02:47:15 -04:00
Anthony Lavado 91b089c0fa
Merge pull request #3179 from Bond-009/bugs 
Fix some 'bugs' flagged by sonarcloud
 2020-06-03 02:45:22 -04:00
Vasily b9618c8c01
Merge pull request #2676 from GranPC/public-pr/blurhash 
Implement Blurhash generation for images
 2020-06-02 17:25:45 +03:00
danieladov be5ce32bb6
refactor MediaBrowser.Api/VideosService.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-05-31 20:42:22 +02:00
danieladov 8e0b1109bc
refactor 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-05-31 20:35:09 +02:00
Mister Rajoy 1b90798b90 Order ids to merge to avoid stack overflow 
As said in https://github.com/jellyfin/jellyfin/issues/3176, merging 1 with 2 and then 2 with 1 cause an stack overflow. sorting ids first fix the problem
 2020-05-31 20:23:23 +02:00
Bond_009 7439e095e2 Merge branch 'master' into nullable3 2020-05-27 20:49:18 +02:00
dkanada ecadde1e18
Merge pull request #3192 from jellyfin/audio 
Fix issue with audio transcoding
 2020-05-27 20:20:50 +09:00
dkanada 73d123fe36 fix issue with audio transcoding 2020-05-27 13:55:45 +09:00
Patrick Barron 31f725fdbf Fix a bug in Emby.Notifications and clean up 2020-05-26 23:08:27 -04:00
Patrick Barron eef7cfd912 Make SonarCloud less angry 2020-05-26 22:43:03 -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
Joshua M. Boniface 7c72f69189
Merge pull request #2733 from OancaAndrei/syncplay 
Add syncplay feature
 2020-05-26 20:00:01 -04:00
Joshua M. Boniface 0be3dfe7c5
Revert "Fix emby/user/public API leaking sensitive data" 2020-05-26 12:14:40 -04:00
gion e42bfc92f3 Fix code issues 2020-05-26 11:37:52 +02:00
gion e4838b0faa Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-26 10:23:09 +02:00
xumix 46420dfd68 Refactor copy codec checks 2020-05-26 00:58:19 +03:00
Bond_009 10e381f66f Fix some 'bugs' flagged by sonarcloud 2020-05-25 23:52:51 +02:00
Vasily 279f0da980 Rename ImageInfo.Hash to ImageInfo.BlurHash 2020-05-26 00:52:13 +03:00
Vasily 1f83a21288 Rename Hash to BlurHash in all properties and methods for clarity 2020-05-21 01:43:19 +03:00
Patrick Barron c464f700db Remove redundant qualifiers 2020-05-20 13:07:53 -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
Vasily a226a4ee03 Compute hash only when one is not computed in DB, small optimizations here and there 2020-05-19 14:50:14 +03:00
Vasily 02da312f8a Fix compilation after rebase 2020-05-19 00:22:52 +03:00
Jesús Higueras fe480caf54 Add endpoint to update all items in library 2020-05-18 23:21:38 +03:00
Jesús Higueras b9fc0d2628 Add BlurHash support to backend 2020-05-18 23:21:37 +03: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
Vasily d21feb2b18
Merge pull request #2970 from barronpm/activitydb-efcore 
Migrate Activity Database to Entity Framework Core
 2020-05-15 22:04:23 +03:00
gion 8c04049a59 Fix some code smells 2020-05-15 20:06:41 +02:00
gion 029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
gion e8f45248aa Fix code issues 2020-05-15 18:47:16 +02:00
Patrick Barron dcaffd3812 Fix regressions introduced by #3098 2020-05-14 20:11:34 -04: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 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
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 62420a6eb1 Remove support for injecting ILogger directly 2020-05-12 16:03:15 -04:00
Patrick Barron 6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00:00
gion 5c8cbd4087 Fix code issues 2020-05-09 14:34:07 +02:00
gion 8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
gion 6e22e9222b Fix code issues 2020-05-09 12:37:23 +02:00