Patrick Barron
|
fa80f84f26
|
Merge branch 'userdb-efcore' of https://github.com/barronpm/jellyfin into userdb-efcore
|
4 years ago |
|
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
|
4 years ago |
dkanada
|
fe16c3fad4
|
Merge branch 'master' into install-plugin
|
4 years ago |
Bond-009
|
2dbb9d4895
|
Fix build
|
4 years ago |
Vasily
|
668e10ceb7
|
Merge pull request #2767 from Bond-009/nullable3
Enable nullabe reference types for MediaBrowser.Model
|
4 years ago |
|
Vasily
|
959a9655c8
|
Update MediaBrowser.Model/Services/IHasRequestFilter.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
4 years ago |
Anthony Lavado
|
c31b2798a5
|
Merge pull request #3180 from xumix/master
Refactor copy codec checks
|
4 years ago |
|
Patrick Barron
|
bb828d54c5
|
Remove unused methods
|
4 years ago |
|
Vasily
|
b9618c8c01
|
Merge pull request #2676 from GranPC/public-pr/blurhash
Implement Blurhash generation for images
|
4 years ago |
|
Bond_009
|
7439e095e2
|
Merge branch 'master' into nullable3
|
5 years ago |
Vasily
|
2482bcb3b1
|
Add blurhashes to ImageBlurHashes for all images
|
5 years ago |
|
Patrick Barron
|
7c823464bc
|
Fix merge conflicts with SyncPlay
|
5 years ago |
|
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
|
5 years ago |
Joshua M. Boniface
|
7c72f69189
|
Merge pull request #2733 from OancaAndrei/syncplay
Add syncplay feature
|
5 years ago |
|
Joshua M. Boniface
|
0be3dfe7c5
|
Revert "Fix emby/user/public API leaking sensitive data"
|
5 years ago |
gion
|
e4838b0faa
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
5 years ago |
|
Vasily
|
0f32b0ffad
|
Change image blurhash mapping to "image type to blurhash"
|
5 years ago |
xumix
|
46420dfd68
|
Refactor copy codec checks
|
5 years ago |
|
Vasily
|
279f0da980
|
Rename ImageInfo.Hash to ImageInfo.BlurHash
|
5 years ago |
|
Vasily
|
29443e3681
|
Apply suggestions from code review
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
|
5 years ago |
|
dkanada
|
deafe59b7e
|
add the timestamp property back to the version info
|
5 years ago |
|
dkanada
|
7972daaba4
|
fix a few issues with the plugin manifest
|
5 years ago |
|
Vasily
|
1f83a21288
|
Rename Hash to BlurHash in all properties and methods for clarity
|
5 years ago |
artiume
|
ae4c407b6d
|
Add .edl Mimetype
|
5 years ago |
|
Patrick Barron
|
c464f700db
|
Remove redundant qualifiers
|
5 years ago |
|
Patrick Barron
|
7d9d54d2ec
|
Fix profile images.
|
5 years ago |
|
Patrick Barron
|
3eeb6576d8
|
Migrate User DB to EF Core
|
5 years ago |
Jesús Higueras
|
b9fc0d2628
|
Add BlurHash support to backend
|
5 years ago |
Mark Monteiro
|
3ed76d7e08
|
Update to .NET Core 3.1.4
|
5 years ago |
|
dkanada
|
4b4b50f3ee
|
Merge pull request #3115 from MrTimscampi/ffprobe
Parse color transfer and color primaries from ffprobe, and fix video range
|
5 years ago |
MrTimscampi
|
9314434bbf
|
Fix suggestions
|
5 years ago |
|
dkanada
|
8921c7a5bf
|
Merge pull request #3113 from Artiume/patch-1
Fix Progressive and Interlaced Stream capitalization
|
5 years ago |
|
dkanada
|
ddebc9301e
|
Merge pull request #3116 from Artiume/patch-2
Update Books Resolver File Types and add .opf Mime Type
|
5 years ago |
|
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
|
5 years ago |
|
gion
|
029bb80910
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
5 years ago |
|
artiume
|
a765272c17
|
Update MimeTypes.cs
|
5 years ago |
|
artiume
|
527029af92
|
Update MediaStream.cs
|
5 years ago |
|
artiume
|
d41cdb3b7a
|
Update Interlace
|
5 years ago |
|
artiume
|
eb3ce3fb87
|
Fix Progressive Stream 'P' capitalization
|
5 years ago |
|
artiume
|
9ed8c6cb11
|
Add opf mimetype
|
5 years ago |
Patrick Barron
|
87c63e668c
|
Merge branch 'master' into activitydb-efcore
|
5 years ago |
|
Patrick Barron
|
b94afc597c
|
Address review comments
|
5 years ago |
|
MrTimscampi
|
234292453f
|
Add HLG to the video range detection
|
5 years ago |
|
Mark Monteiro
|
2e09311a93
|
Merge branch 'master' into websocket
|
5 years ago |
|
Patrick Barron
|
a8f0d0aa0d
|
Merge branch 'master' into activitydb-efcore
|
5 years ago |
|
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
|
5 years ago |
|
Patrick Barron
|
9ad839c776
|
Initial migration code
|
5 years ago |
|
Patrick Barron
|
6379391f87
|
Merge branch 'master' into activitydb-efcore
|
5 years ago |
|
Mark Monteiro
|
dc5165b97f
|
Merge branch 'master' into simplify-https-config
|
5 years ago |
|
gion
|
5c8cbd4087
|
Fix code issues
|
5 years ago |
