Commit Graph

177 Commits

Author SHA1 Message Date
crobibero
3329b08b40 Merge remote-tracking branch 'upstream/api-migration' into api-playlist 2020-06-20 15:56:42 -06:00
David Ullmer
d4c86b82e0 Merge remote-tracking branch 'remotes/upstream/api-migration' into api-sessionservice
# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs
2020-06-20 20:45:16 +02:00
Patrick Barron
804764e1fb
Merge pull request #3363 from Ullmie02/api-user
Move UserService to Jellyfin.Api
2020-06-20 16:52:58 +00:00
Patrick Barron
e26f487fc8
Merge pull request #3377 from crobibero/api-pragma
Convert pragma to SuppressMessage
2020-06-20 00:49:35 +00:00
Patrick Barron
c3915cdb78
Merge pull request #2926 from crobibero/api-display-preferences
DisplayPreferences to Jellyfin.Api
2020-06-20 00:47:55 +00:00
David Ullmer
68ea589f1a Use direct return instead of Ok() 2020-06-19 18:11:46 +02:00
crobibero
d53a2899b1 remove #nullable 2020-06-19 09:03:04 -06:00
crobibero
d820c0fff5 Convert pragma to supresswarning 2020-06-19 08:49:42 -06:00
David
a5bd7f2d6e Use new authorization and session functions 2020-06-19 13:03:53 +02:00
David
42385a14f0 Merge remote-tracking branch 'remotes/upstream/api-migration' into api-sessionservice
# Conflicts:
#	MediaBrowser.Api/Sessions/SessionService.cs
2020-06-19 12:32:38 +02:00
David
77bea56708 Add request body models 2020-06-18 19:35:29 +02:00
David
762eeb51e6 Merge remote-tracking branch 'remotes/upstream/api-migration' into api-user 2020-06-18 18:52:01 +02:00
David
522e44de59
Merge pull request #3357 from crobibero/api-authorization
Add Authorization handlers
2020-06-18 18:37:08 +02:00
David
713ae7ae36 Add xml comments; Add status codes; Use return instead of exception 2020-06-18 18:09:58 +02:00
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
David
f2d7eac418 [WIP] Move UserService to Jellyfin.Api 2020-06-17 21:08:58 +02: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
crobibero
c24666253c Add Default authorization policy 2020-06-16 14:15:58 -06: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
8a8bf4b686 Merge remote-tracking branch 'upstream/api-migration' into api-sessionservice 2020-06-14 12:49:43 +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
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
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
David
fff3c789b9 Move SessionService to Jellyfin.Api 2020-06-12 18:54:25 +02: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