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
16217 commits 29 branches 75 tags 1.3 GiB
Commit graph

2192 commits

Author SHA1 Message Date
Patrick Barron fa80f84f26 Merge branch 'userdb-efcore' of https://github.com/barronpm/jellyfin into userdb-efcore 2020-06-05 22:33:34 -04: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
dkanada fe16c3fad4
Merge branch 'master' into install-plugin 2020-06-04 03:20:48 +09: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
Vasily 959a9655c8
Update MediaBrowser.Model/Services/IHasRequestFilter.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-06-03 12:26:40 +03:00
Anthony Lavado c31b2798a5
Merge pull request #3180 from xumix/master 
Refactor copy codec checks
 2020-06-03 02:47:15 -04:00
Patrick Barron bb828d54c5 Remove unused methods 2020-06-02 14:40:48 -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
Bond_009 7439e095e2 Merge branch 'master' into nullable3 2020-05-27 20:49:18 +02:00
Vasily 2482bcb3b1 Add blurhashes to ImageBlurHashes for all images 2020-05-27 16:27:27 +03:00
Patrick Barron 7c823464bc Fix merge conflicts with SyncPlay 2020-05-26 20:52:05 -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 e4838b0faa Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-26 10:23:09 +02:00
Vasily 0f32b0ffad Change image blurhash mapping to "image type to blurhash" 2020-05-26 01:04:40 +03:00
xumix 46420dfd68 Refactor copy codec checks 2020-05-26 00:58:19 +03:00
Vasily 279f0da980 Rename ImageInfo.Hash to ImageInfo.BlurHash 2020-05-26 00:52:13 +03:00
Vasily 29443e3681
Apply suggestions from code review 
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
 2020-05-26 00:50:29 +03:00
dkanada deafe59b7e add the timestamp property back to the version info 2020-05-24 16:59:05 +09:00
dkanada 7972daaba4 fix a few issues with the plugin manifest 2020-05-24 15:40:27 +09:00
Vasily 1f83a21288 Rename Hash to BlurHash in all properties and methods for clarity 2020-05-21 01:43:19 +03:00
artiume ae4c407b6d
Add .edl Mimetype 2020-05-20 16:46:33 -04: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 3eeb6576d8 Migrate User DB to EF Core 2020-05-20 10:04:00 -04:00
Jesús Higueras b9fc0d2628 Add BlurHash support to backend 2020-05-18 23:21:37 +03:00
Mark Monteiro 3ed76d7e08 Update to .NET Core 3.1.4 2020-05-17 13:33:38 -04:00
dkanada 4b4b50f3ee
Merge pull request #3115 from MrTimscampi/ffprobe 
Parse color transfer and color primaries from ffprobe, and fix video range
 2020-05-18 00:06:07 +09:00
MrTimscampi 9314434bbf Fix suggestions 2020-05-16 17:35:34 +02:00
dkanada 8921c7a5bf
Merge pull request #3113 from Artiume/patch-1 
Fix Progressive and Interlaced Stream capitalization
 2020-05-16 21:56:25 +09:00
dkanada ddebc9301e
Merge pull request #3116 from Artiume/patch-2 
Update Books Resolver File Types and add .opf Mime Type
 2020-05-16 16:01:59 +09: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
gion 029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
artiume a765272c17
Update MimeTypes.cs 2020-05-15 09:38:26 -04:00
artiume 527029af92 Update MediaStream.cs 2020-05-15 09:36:30 -04:00
artiume d41cdb3b7a Update Interlace 2020-05-15 09:36:30 -04:00
artiume eb3ce3fb87 Fix Progressive Stream 'P' capitalization 2020-05-15 09:36:30 -04:00
artiume 9ed8c6cb11
Add opf mimetype 2020-05-15 07:59:46 -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
MrTimscampi 234292453f Add HLG to the video range detection 2020-05-14 18:44:51 +02: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 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 6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00:00
Mark Monteiro dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
gion 5c8cbd4087 Fix code issues 2020-05-09 14:34:07 +02:00