Commit Graph

3807 Commits

Author SHA1 Message Date
ConfusedPolarBear
4be476ec53 Move all settings into the main server configuration
Decreased the timeout from 30 minutes to 5.
Public lookup values have been replaced with the short code.
2020-06-19 23:32:24 -05:00
BaronGreenback
46006a1aff Re-ordered code for the match 2020-06-19 22:32:07 +01:00
BaronGreenback
02f6ced07a Merged 2020-06-19 22:07:25 +01:00
dkanada
e8e5208fbd Merge pull request #3360 from Bond-009/fix-3359
Fix Task that ignores cancellation request
2020-06-20 03:04:24 +09:00
wky
62d86293eb Translated using Weblate (Chinese (Hong Kong))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant_HK/
2020-06-19 12:17:39 -04:00
Bond-009
a3c0b8a826 Merge branch 'master' into buffer 2020-06-18 17:01:15 +02:00
Bond_009
46276acc22 Fix Task that ignores cancellation request 2020-06-17 19:20:43 +02:00
crobibero
4962e230af revert adding Jellyfin to auth header 2020-06-17 06:52:15 -06:00
Cody Robibero
b451eb0bdc Update Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
2020-06-16 16:45:17 -06:00
crobibero
0651d7512b Enable BlurHash for People 2020-06-16 15:12:48 -06:00
dkanada
f5d82441a4 Merge branch 'master' into custom-repos 2020-06-17 02:09:32 +09:00
Bond-009
9af6eda0b4 Merge pull request #3343 from telans/comment-stops
Add full stop at end of comments (SA1629)
2020-06-16 11:54:58 +02:00
Bond-009
4d91060c25 Merge pull request #3341 from telans/brace-spacing
Add newlines after closing braces (SA1513/SA1516)
2020-06-16 11:49:42 +02:00
Prokash Sarkar
ebfd1e7c47 Translated using Weblate (Bengali)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/bn/
2020-06-16 03:11:10 -04:00
telans
247f9c61e6 fix SA1513/SA1516 2020-06-16 16:11:30 +12:00
telans
9018f8d8be Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
crobibero
a8adbef74f Add GetAuthorizationInfo for netcore HttpRequest 2020-06-15 13:21:18 -06:00
Joe DF
741db0287a Translated using Weblate (French (Canada))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fr_CA/
2020-06-15 15:01:30 -04:00
crobibero
4aac936721 Add more authorization handlers, actually authorize requests 2020-06-15 12:49:54 -06:00
Bond-009
73481c3ba4 Merge pull request #3344 from jellyfin/dependabot/nuget/PlaylistsNET-1.0.6
Bump PlaylistsNET from 1.0.4 to 1.0.6
2020-06-15 19:07:47 +02:00
crobibero
24f54837e1 Switch to M3uContent 2020-06-15 08:34:24 -06:00
Bond-009
75b7fea024 Merge pull request #3350 from jellyfin/dependabot/nuget/sharpcompress-0.25.1
Bump sharpcompress from 0.25.0 to 0.25.1
2020-06-15 16:17:04 +02:00
dependabot[bot]
58118aca0c Bump IPNetwork2 from 2.4.0.126 to 2.5.211
Bumps [IPNetwork2](https://github.com/lduchosal/ipnetwork) from 2.4.0.126 to 2.5.211.
- [Release notes](https://github.com/lduchosal/ipnetwork/releases)
- [Commits](https://github.com/lduchosal/ipnetwork/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-15 12:01:38 +00:00
dependabot[bot]
6d99d55fd6 Bump sharpcompress from 0.25.0 to 0.25.1
Bumps [sharpcompress](https://github.com/adamhathcock/sharpcompress) from 0.25.0 to 0.25.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.25...0.25.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-15 12:01:36 +00:00
Anthony Lavado
100e9d586d Merge pull request #3336 from telans/specific-fixes
Fix trivial SA1005, SA1111, SA1508, SA1510 warnings
2020-06-14 22:51:29 -04:00
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
dkanada
6db1878011 Merge pull request #3315 from crobibero/dashboard-update
Add MessageId to websocket message, fix ws exception
2020-06-15 10:55:33 +09:00
telans
afc9224ede fix SA1111 2020-06-15 10:46:43 +12:00
telans
3d9049ef08 fix SA1508 2020-06-15 10:45:55 +12:00
telans
acd4389653 fix SA1005 2020-06-15 10:41:00 +12:00
telans
726e116d5b fix SA1510 2020-06-15 10:40:57 +12: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
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
dkanada
6033058f51 Merge pull request #3313 from crobibero/update-dotnet-core
Update to .NET Core 3.1.5
2020-06-12 13:34:42 +09:00
Anthony Lavado
5d3ff25e26 Merge pull request #3291 from cvium/fix_authenticationexception
Use the "legacy" AuthenticationException in AuthService
2020-06-11 23:14:33 -04:00
Patrick Barron
d0e2027b05 (Hopefully) fix concurrency exceptions. 2020-06-11 19:45:31 -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
crobibero
30609c848b Add MessageId to websocket message, add JsonNonStringKeyDictionaryConverter 2020-06-11 10:51:47 -06:00
crobibero
a6815018dc Update to .NET Core 3.1.5 2020-06-11 07:13:56 -06:00
dependabot[bot]
09e0abebf9 Bump ServiceStack.Text.Core from 5.8.0 to 5.9.0
Bumps [ServiceStack.Text.Core](https://github.com/ServiceStack/ServiceStack.Text) from 5.8.0 to 5.9.0.
- [Release notes](https://github.com/ServiceStack/ServiceStack.Text/releases)
- [Commits](https://github.com/ServiceStack/ServiceStack.Text/compare/v5.8...v5.9)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-11 10:30:27 +00:00
Claus Vium
5bb630ea7c Use the "legacy" AuthenticationException 2020-06-11 10:59:57 +02:00
ConfusedPolarBear
82887ec710 Add IDisposable 2020-06-09 18:40:35 -05:00
aled
299e49f39d Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Bond-009
ad5c41b542 Merge pull request #3258 from aled/2149-fix-a-small-number-of-compile-warnings-1
Fix a small number of compile warnings
2020-06-09 22:22:36 +02:00
ConfusedPolarBear
86624e92d3 Finish addressing review comments 2020-06-09 15:18:26 -05:00
ConfusedPolarBear
7d9b552403 Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-06-09 13:28:40 -05:00
dkanada
19edd11292 Merge pull request #3185 from Ullmie02/api-exception-handling
Don't Send Exception Messages (Old API)
2020-06-09 14:22:45 +09:00
ConfusedPolarBear
001c78573e Add XML documentation 2020-06-08 17:14:20 -05:00