Commit Graph

172 Commits

Author SHA1 Message Date
crobibero
9a51f484af Remove nullable, add async task 2020-06-18 07:11:46 -06: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
9b45ee440c User proper File constructor 2020-06-17 10:51:50 -06:00
crobibero
0d1298e851 User proper File constructor 2020-06-17 10:49:34 -06:00
crobibero
90fe8f0cbc Merge branch 'api-filter' of github.com:crobibero/jellyfin into api-filter 2020-06-17 10:43:26 -06:00
crobibero
444605703c Merge remote-tracking branch 'upstream/api-migration' into api-filter 2020-06-17 10:43:04 -06:00
Cody Robibero
f181cb3746
Update Jellyfin.Api/Controllers/FilterController.cs
Co-authored-by: David <davidullmer@outlook.de>
2020-06-17 10:41:40 -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
David
a952d15670 Await Task from _libraryManager 2020-06-16 16:08:31 +02:00
crobibero
524243a934 fix merge conflict 2020-06-14 20:18:06 -06:00
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
dkanada
e2b2f74b47
Merge pull request #3319 from Ullmie02/api-204
Use Http status code 204 instead of 200
2020-06-15 10:51:28 +09:00
David
edc5611ec7 Fix null reference to fix CI 2020-06-14 13:50:51 +02:00
David
ac0a3180d7 Merge remote-tracking branch 'upstream/api-migration' into api-librarystructure 2020-06-14 12:49:19 +02:00
David
9bedd9ac3c Merge remote-tracking branch 'upstream/api-migration' into api-204 2020-06-14 12:48:17 +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
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
552a74eb6e Fix build 2020-06-13 15:13:57 -06:00
crobibero
6c7cc92a09 Merge remote-tracking branch 'upstream/api-migration' into api-image2 2020-06-13 15:09:02 -06:00
crobibero
bd09753976 Merge remote-tracking branch 'upstream/api-migration' into api-image 2020-06-13 15:07:04 -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
David
618b893c48 Move LibraryStructureService to Jellyfin.Api 2020-06-12 15:39:06 +02:00
David
043d76bd6e Use Http status code 204 instead of 200 2020-06-12 12:38:13 +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
David
a47ff4043f Disable CA1801 2020-06-11 16:01:41 +02:00
David
fcbae95d19 Use 'await using Stream' instead of 'using Stream' 2020-06-11 15:57:31 +02:00
crobibero
a6815018dc Update to .NET Core 3.1.5 2020-06-11 07:13:56 -06:00
David
8178b19470 Fix suggestions 2020-06-11 12:29:56 +02:00
David
f64e8e8757 Move SubtitleService to Jellyfin.Api 2020-06-10 18:20:54 +02:00
Cody Robibero
355682620d
Update Jellyfin.Api/Controllers/FilterController.cs
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
2020-06-10 09:23:27 -06:00
Cody Robibero
393f5f0c25
Update Jellyfin.Api/Controllers/FilterController.cs
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
2020-06-10 09:23:20 -06: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
David
1bf6c085ed Move File; Move Route; use DateTime? in Query 2020-06-10 13:09:23 +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
dkanada
ac9bef9465
Merge pull request #3227 from crobibero/api-first-user
Add second endpoint for Startup/User
2020-06-10 11:03:35 +09:00
Patrick Barron
d105bc728d Fix startup wizard. 2020-06-09 14:04:25 -04:00
David
dc190e5683 Move ActivityLogService to Jellyfin.Api 2020-06-09 18:56:17 +02:00