crobibero
|
3329b08b40
|
Merge remote-tracking branch 'upstream/api-migration' into api-playlist
|
4 years ago |
David Ullmer
|
d4c86b82e0
|
Merge remote-tracking branch 'remotes/upstream/api-migration' into api-sessionservice
# Conflicts:
# Jellyfin.Api/Helpers/RequestHelpers.cs
|
4 years ago |
Patrick Barron
|
804764e1fb
|
Merge pull request #3363 from Ullmie02/api-user
Move UserService to Jellyfin.Api
|
4 years ago |
Patrick Barron
|
c3915cdb78
|
Merge pull request #2926 from crobibero/api-display-preferences
DisplayPreferences to Jellyfin.Api
|
4 years ago |
David
|
42385a14f0
|
Merge remote-tracking branch 'remotes/upstream/api-migration' into api-sessionservice
# Conflicts:
# MediaBrowser.Api/Sessions/SessionService.cs
|
4 years ago |
David
|
762eeb51e6
|
Merge remote-tracking branch 'remotes/upstream/api-migration' into api-user
|
4 years ago |
David
|
713ae7ae36
|
Add xml comments; Add status codes; Use return instead of exception
|
4 years ago |
Patrick Barron
|
116284fe99
|
Merge pull request #3321 from Ullmie02/api-librarystructure
Move LibraryStructureService to Jellyfin.Api
|
4 years ago |
Patrick Barron
|
b4da357db2
|
Merge pull request #2944 from crobibero/api-image
ImageNameService to Jellyfin.Api
|
4 years ago |
David
|
226a9d5d2e
|
Merge pull request #2946 from crobibero/api-image2
Move RemoteImageService to Jellyfin.API
|
4 years ago |
David
|
bf133d044a
|
Merge pull request #3269 from crobibero/api-filter
Move FilterService to Jellyfin.Api
|
4 years ago |
crobibero
|
444605703c
|
Merge remote-tracking branch 'upstream/api-migration' into api-filter
|
4 years ago |
Cody Robibero
|
f27f977f01
|
Merge pull request #3333 from crobibero/api-item-refresh
Move ItemRefreshService.cs to Jellyfin.Api
|
4 years ago |
Cody Robibero
|
5a7ad6b2dc
|
Merge pull request #3274 from crobibero/api-localization
Move LocalizationService to Jellyfin.Api
|
4 years ago |
David
|
efe998ecf4
|
Merge pull request #3280 from crobibero/api-plugin
Move PluginService to Jellyfin.Api
|
4 years ago |
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
|
8a8bf4b686
|
Merge remote-tracking branch 'upstream/api-migration' into api-sessionservice
|
4 years ago |
David
|
ac0a3180d7
|
Merge remote-tracking branch 'upstream/api-migration' into api-librarystructure
|
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
|
276750f310
|
Move ItemRefreshService.cs to Jellyfin.Api
|
4 years ago |
crobibero
|
8a834fb728
|
Merge remote-tracking branch 'upstream/api-migration' into api-filter
|
4 years ago |
crobibero
|
81030a0a5a
|
Merge remote-tracking branch 'upstream/api-migration' into api-plugin
|
4 years ago |
crobibero
|
9ee6ea86ea
|
Merge remote-tracking branch 'upstream/api-migration' into api-localization
|
4 years ago |
crobibero
|
3c18745f53
|
Remove RemoteImageService.cs
|
4 years ago |
crobibero
|
bd09753976
|
Merge remote-tracking branch 'upstream/api-migration' into api-image
|
4 years ago |
crobibero
|
7666a1201f
|
Merge remote-tracking branch 'upstream/api-migration' into api-display-preferences
|
4 years ago |
crobibero
|
ec3e15db57
|
Fix merge and build
|
4 years ago |
crobibero
|
829eb1a849
|
merge master into api-migration
|
4 years ago |
David
|
fff3c789b9
|
Move SessionService to Jellyfin.Api
|
4 years ago |
dkanada
|
403cd3205f
|
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
|
4 years ago |
David
|
618b893c48
|
Move LibraryStructureService to Jellyfin.Api
|
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
|
5 years ago |
Patrick Barron
|
7a115024aa
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Providers/Users/UserMetadataService.cs
|
5 years ago |
Patrick Barron
|
7fba0b778e
|
Properly remove profile images
|
5 years ago |
David
|
f64e8e8757
|
Move SubtitleService to Jellyfin.Api
|
5 years ago |
Cody Robibero
|
c61efba0c6
|
Merge pull request #3286 from Ullmie02/api-apikey
Move ApiKeyService to Jellyfin.Api
|
5 years ago |
David
|
6a70081643
|
Move ApiKeyService to Jellyfin.Api
|
5 years ago |
Cody Robibero
|
647b78a3c0
|
Merge pull request #3226 from Ullmie02/api-searchservice
Move SearchService to new API endpoint
|
5 years ago |
David
|
dc190e5683
|
Move ActivityLogService to Jellyfin.Api
|
5 years ago |
crobibero
|
0b778b8851
|
Move PluginService to Jellyfin.Api
|
5 years ago |
crobibero
|
7a77b9928f
|
Move PlaylistService to Jellyfin.Api
|
5 years ago |
crobibero
|
d97e306cda
|
Move PlaylistService to Jellyfin.Api
|
5 years ago |
crobibero
|
a4455af3e9
|
Move LocalizationService to Jellyfin.Api
|
5 years ago |
crobibero
|
dd5579e0eb
|
Move FilterService to Jellyfin.Api
|
5 years ago |