Commit Graph

2814 Commits

Author SHA1 Message Date
Patrick Barron
c3915cdb78
Merge pull request #2926 from crobibero/api-display-preferences
DisplayPreferences to Jellyfin.Api
2020-06-20 00:47:55 +00:00
Patrick Barron
116284fe99
Merge pull request #3321 from Ullmie02/api-librarystructure
Move LibraryStructureService to Jellyfin.Api
2020-06-17 23:27:47 +00:00
Patrick Barron
b4da357db2
Merge pull request #2944 from crobibero/api-image
ImageNameService to Jellyfin.Api
2020-06-17 17:15:32 +00:00
David
226a9d5d2e
Merge pull request #2946 from crobibero/api-image2
Move RemoteImageService to Jellyfin.API
2020-06-17 19:07:20 +02:00
David
bf133d044a
Merge pull request #3269 from crobibero/api-filter
Move FilterService to Jellyfin.Api
2020-06-17 18:53:03 +02:00
crobibero
444605703c Merge remote-tracking branch 'upstream/api-migration' into api-filter 2020-06-17 10:43:04 -06:00
Cody Robibero
f27f977f01
Merge pull request #3333 from crobibero/api-item-refresh
Move ItemRefreshService.cs to Jellyfin.Api
2020-06-17 09:12:41 -06:00
Cody Robibero
5a7ad6b2dc
Merge pull request #3274 from crobibero/api-localization
Move LocalizationService to Jellyfin.Api
2020-06-17 09:12:33 -06:00
David
efe998ecf4
Merge pull request #3280 from crobibero/api-plugin
Move PluginService to Jellyfin.Api
2020-06-17 17:07:37 +02:00
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
dkanada
4f2ae5c9e1
Merge pull request #3158 from Artiume/patch-5
Update Library Service
2020-06-15 10:46:54 +09:00
David
ac0a3180d7 Merge remote-tracking branch 'upstream/api-migration' into api-librarystructure 2020-06-14 12:49:19 +02:00
David
d01f56bc42 Merge remote-tracking branch 'upstream/api-migration' into api-subtitles 2020-06-14 12:45:49 +02:00
Patrick Barron
42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00
Patrick Barron
aa4ac5902e Fix concurrency exception 2020-06-13 18:08:17 -04:00
crobibero
276750f310 Move ItemRefreshService.cs to Jellyfin.Api 2020-06-13 15:33:42 -06:00
crobibero
8a834fb728 Merge remote-tracking branch 'upstream/api-migration' into api-filter 2020-06-13 15:25:02 -06:00
crobibero
81030a0a5a Merge remote-tracking branch 'upstream/api-migration' into api-plugin 2020-06-13 15:24:34 -06:00
crobibero
9ee6ea86ea Merge remote-tracking branch 'upstream/api-migration' into api-localization 2020-06-13 15:21:13 -06:00
crobibero
3c18745f53 Remove RemoteImageService.cs 2020-06-13 15:15:27 -06:00
crobibero
bd09753976 Merge remote-tracking branch 'upstream/api-migration' into api-image 2020-06-13 15:07:04 -06:00
crobibero
7666a1201f Merge remote-tracking branch 'upstream/api-migration' into api-display-preferences 2020-06-13 15:03:43 -06:00
crobibero
ec3e15db57 Fix merge and build 2020-06-13 13:11:41 -06:00
crobibero
829eb1a849 merge master into api-migration 2020-06-13 13:03:09 -06:00
dkanada
403cd3205f
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
2020-06-13 00:29:43 +09:00
David
618b893c48 Move LibraryStructureService to Jellyfin.Api 2020-06-12 15:39:06 +02:00
Patrick Barron
6429e60c40
Merge pull request #2931 from crobibero/api-attachment
AttachmentsService to Jellyfin.Api
2020-06-11 23:56:16 -04:00
Patrick Barron
6a62c3c628
Merge pull request #3281 from Ullmie02/api-activitylog
Move ActivityLogService to Jellyfin.Api
2020-06-11 23:00:41 -04:00
Patrick Barron
a6573e015f
Merge pull request #2983 from bruceCoelho/api-migration
PackageService to Jellyfin.API
2020-06-11 22:52:35 -04:00
Patrick Barron
fc02157b42 Fix build errors 2020-06-11 18:28:49 -04:00
Patrick Barron
7a115024aa Merge branch 'master' into userdb-efcore
# Conflicts:
#	MediaBrowser.Controller/Library/ILibraryManager.cs
#	MediaBrowser.Providers/Users/UserMetadataService.cs
2020-06-11 18:23:12 -04:00
Patrick Barron
7fba0b778e Properly remove profile images 2020-06-11 17:51:02 -04:00
David
f64e8e8757 Move SubtitleService to Jellyfin.Api 2020-06-10 18:20:54 +02:00
Cody Robibero
c61efba0c6
Merge pull request #3286 from Ullmie02/api-apikey
Move ApiKeyService to Jellyfin.Api
2020-06-10 09:22:59 -06:00
David
6a70081643 Move ApiKeyService to Jellyfin.Api 2020-06-10 15:57:31 +02:00
Cody Robibero
647b78a3c0
Merge pull request #3226 from Ullmie02/api-searchservice
Move SearchService to new API endpoint
2020-06-09 20:43:03 -06:00
David
dc190e5683 Move ActivityLogService to Jellyfin.Api 2020-06-09 18:56:17 +02:00
crobibero
0b778b8851 Move PluginService to Jellyfin.Api 2020-06-09 09:57:01 -06:00
crobibero
a4455af3e9 Move LocalizationService to Jellyfin.Api 2020-06-08 12:34:17 -06:00
crobibero
dd5579e0eb Move FilterService to Jellyfin.Api 2020-06-07 22:04:59 -06:00
Patrick Barron
75af0a4e57 Implement more review suggestions 2020-06-07 19:37:47 -04:00
aled
22a860a806 Fix a small number of compile warnings 2020-06-06 20:17:49 +01:00
Patrick Barron
bb23ce3466 Merge branch 'master' into userdb-efcore 2020-06-05 22:31:13 -04:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
Andreas B
d92b32a4c6 Fix incorrect HLS master playlist fields
Resolves: #3224
2020-06-05 22:05:33 +02: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
Cody Robibero
601e4a88c9
Merge pull request #2933 from crobibero/api-device
DeviceService to Jellyfin.Api
2020-06-04 07:29:23 -06: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