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
|
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
|
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
|
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
|
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 |
|
David Ullmer
|
1491e93d84
|
Add response code documentation
|
2020-06-09 11:00:37 +02:00 |
|
dkanada
|
b3f8928fbb
|
Merge pull request #3218 from crobibero/api-cors
Enable CORS and Authentation
|
2020-06-09 14:29:52 +09:00 |
|
David
|
cefa9d3c08
|
Add default values for parameters and fix spelling
|
2020-06-07 18:10:08 +02:00 |
|
David
|
7fa374f8a2
|
Move Split method from BaseJellyfinApiController.cs to RequestHelpers.cs
|
2020-06-07 15:41:49 +02:00 |
|
David
|
f3029428cd
|
Fix suggestions
|
2020-06-07 15:33:54 +02:00 |
|
dkanada
|
f7f59fe9a3
|
Merge branch 'api-migration' into api-config-json
|
2020-06-07 15:34:31 +09:00 |
|
crobibero
|
6be862545a
|
Merge remote-tracking branch 'upstream/api-migration' into api-cors
|
2020-06-06 17:07:29 -06: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 |
|
crobibero
|
3e749eabdf
|
Fix doc errors
|
2020-06-04 07:29:00 -06:00 |
|
Bond-009
|
af93ec750c
|
Enable TreatWarningsAsErrors for more projects
|
2020-06-03 13:22:40 +02:00 |
|
crobibero
|
cf9cbfff56
|
Add second endpoint for Startup/User
|
2020-06-02 08:28:37 -06:00 |
|
crobibero
|
0e41c4727d
|
revert to System.Text.JsonSerializer
|
2020-06-02 08:23:12 -06:00 |
|
David
|
638cfa32ab
|
Move SearchService to new API endpoint
|
2020-06-02 15:07:07 +02:00 |
|
crobibero
|
e30a85025f
|
Remove log spam when using legacy api
|
2020-06-01 12:42:59 -06:00 |
|
crobibero
|
9f0b5f347a
|
Switch Config controller to System.Text.Json
|
2020-06-01 11:06:15 -06:00 |
|
Cody Robibero
|
297ab2e423
|
Merge pull request #2962 from crobibero/api-config
Move ConfigurationService to Jellyfin.Api
|
2020-06-01 09:29:34 -06:00 |
|
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
|
2020-05-26 20:29:11 -04:00 |
|
Bond-009
|
5c95037234
|
Merge pull request #2953 from crobibero/api-startup
Convert StartupController to ActionResult
|
2020-05-25 15:17:42 +02:00 |
|
crobibero
|
2689865858
|
Remove unused using
|
2020-05-19 13:02:35 -06:00 |
|
crobibero
|
51d54a8ca4
|
Fix return content type
|
2020-05-19 13:02:02 -06:00 |
|
crobibero
|
b28dd47a0f
|
implement review suggestions
|
2020-05-19 12:58:09 -06:00 |
|
Bruce
|
24543b04c1
|
Applying review suggestion to documentation
|
2020-05-19 18:13:42 +01:00 |
|
crobibero
|
cdb25e355c
|
Fix return value
|
2020-05-19 10:06:25 -06:00 |
|
crobibero
|
cf78edc979
|
Fix Authorize attributes
|
2020-05-19 10:05:23 -06:00 |
|
crobibero
|
a11a193439
|
Remove CameraUpload endpoints
|
2020-05-19 10:04:09 -06:00 |
|