crobibero
|
589735f60c
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
4 years ago |
dkanada
|
4f2ae5c9e1
|
Merge pull request #3158 from Artiume/patch-5
Update Library Service
|
4 years ago |
David
|
d01f56bc42
|
Merge remote-tracking branch 'upstream/api-migration' into api-subtitles
|
4 years ago |
Patrick Barron
|
42b4f0aa2e
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
|
4 years ago |
|
Patrick Barron
|
aa4ac5902e
|
Fix concurrency exception
|
4 years ago |
|
crobibero
|
ec3e15db57
|
Fix merge and build
|
4 years ago |
|
crobibero
|
829eb1a849
|
merge master into api-migration
|
4 years ago |
|
dkanada
|
403cd3205f
|
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
|
4 years ago |
Patrick Barron
|
6429e60c40
|
Merge pull request #2931 from crobibero/api-attachment
AttachmentsService to Jellyfin.Api
|
4 years ago |
|
Patrick Barron
|
6a62c3c628
|
Merge pull request #3281 from Ullmie02/api-activitylog
Move ActivityLogService to Jellyfin.Api
|
4 years ago |
|
Patrick Barron
|
a6573e015f
|
Merge pull request #2983 from bruceCoelho/api-migration
PackageService to Jellyfin.API
|
4 years ago |
|
Patrick Barron
|
fc02157b42
|
Fix build errors
|
4 years ago |
|
Patrick Barron
|
7a115024aa
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Providers/Users/UserMetadataService.cs
|
4 years ago |
|
Patrick Barron
|
7fba0b778e
|
Properly remove profile images
|
4 years ago |
|
David
|
f64e8e8757
|
Move SubtitleService to Jellyfin.Api
|
4 years ago |
|
Cody Robibero
|
c61efba0c6
|
Merge pull request #3286 from Ullmie02/api-apikey
Move ApiKeyService to Jellyfin.Api
|
4 years ago |
|
David
|
6a70081643
|
Move ApiKeyService to Jellyfin.Api
|
4 years ago |
|
Cody Robibero
|
647b78a3c0
|
Merge pull request #3226 from Ullmie02/api-searchservice
Move SearchService to new API endpoint
|
4 years ago |
|
David
|
dc190e5683
|
Move ActivityLogService to Jellyfin.Api
|
4 years ago |
|
Patrick Barron
|
75af0a4e57
|
Implement more review suggestions
|
4 years ago |
aled
|
22a860a806
|
Fix a small number of compile warnings
|
4 years ago |
|
Patrick Barron
|
bb23ce3466
|
Merge branch 'master' into userdb-efcore
|
4 years ago |
|
crobibero
|
44957c5a9a
|
Use typed logger where possible
|
4 years ago |
Andreas B
|
d92b32a4c6
|
Fix incorrect HLS master playlist fields
Resolves: #3224
|
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 |
|
Cody Robibero
|
601e4a88c9
|
Merge pull request #2933 from crobibero/api-device
DeviceService to Jellyfin.Api
|
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 |
Anthony Lavado
|
c31b2798a5
|
Merge pull request #3180 from xumix/master
Refactor copy codec checks
|
4 years ago |
|
Anthony Lavado
|
91b089c0fa
|
Merge pull request #3179 from Bond-009/bugs
Fix some 'bugs' flagged by sonarcloud
|
4 years ago |
|
Vasily
|
b9618c8c01
|
Merge pull request #2676 from GranPC/public-pr/blurhash
Implement Blurhash generation for images
|
4 years ago |
|
David
|
638cfa32ab
|
Move SearchService to new API endpoint
|
4 years ago |
danieladov
|
be5ce32bb6
|
refactor MediaBrowser.Api/VideosService.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
5 years ago |
|
danieladov
|
8e0b1109bc
|
refactor
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
5 years ago |
|
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
|
5 years ago |
|
Bond_009
|
7439e095e2
|
Merge branch 'master' into nullable3
|
5 years ago |
|
dkanada
|
ecadde1e18
|
Merge pull request #3192 from jellyfin/audio
Fix issue with audio transcoding
|
5 years ago |
|
dkanada
|
73d123fe36
|
fix issue with audio transcoding
|
5 years ago |
|
Patrick Barron
|
31f725fdbf
|
Fix a bug in Emby.Notifications and clean up
|
5 years ago |
|
Patrick Barron
|
eef7cfd912
|
Make SonarCloud less angry
|
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
|
e42bfc92f3
|
Fix code issues
|
5 years ago |
|
gion
|
e4838b0faa
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
5 years ago |
xumix
|
46420dfd68
|
Refactor copy codec checks
|
5 years ago |
|
Bond_009
|
10e381f66f
|
Fix some 'bugs' flagged by sonarcloud
|
5 years ago |
Vasily
|
279f0da980
|
Rename ImageInfo.Hash to ImageInfo.BlurHash
|
5 years ago |
artiume
|
a661b37c12
|
Update LibraryService.cs
|
5 years ago |
|
Vasily
|
1f83a21288
|
Rename Hash to BlurHash in all properties and methods for clarity
|
5 years ago |
