Commit Graph

16462 Commits

Author SHA1 Message Date
crobibero
3169b0af89 fix merge 2020-06-22 20:24:59 -06:00
crobibero
f4d8e0e20c Merge remote-tracking branch 'upstream/master' into easypassword 2020-06-22 20:23:06 -06:00
dkanada
0be10db5a5
Merge pull request #3416 from jellyfin/dependabot/nuget/prometheus-net.AspNetCore-3.6.0
Bump prometheus-net.AspNetCore from 3.5.0 to 3.6.0
2020-06-23 01:43:23 +09:00
Anthony Lavado
649cccfc05
Merge pull request #3409 from Bond-009/scanerror
Fix scan crashed
2020-06-22 10:38:32 -04:00
Bond-009
464066f362
Merge pull request #3411 from neilsb/system-plugin-removal
Prevent system plugins from being uninstalled
2020-06-22 15:23:35 +02:00
dependabot[bot]
35d80392ec
Bump prometheus-net.AspNetCore from 3.5.0 to 3.6.0
Bumps [prometheus-net.AspNetCore](https://github.com/prometheus-net/prometheus-net) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/prometheus-net/prometheus-net/releases)
- [Changelog](https://github.com/prometheus-net/prometheus-net/blob/master/History)
- [Commits](https://github.com/prometheus-net/prometheus-net/compare/v3.5.0...v3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-22 13:16:21 +00:00
dkanada
a3bc82727a
Merge pull request #3414 from jellyfin/dependabot/nuget/prometheus-net-3.6.0
Bump prometheus-net from 3.5.0 to 3.6.0
2020-06-22 22:11:08 +09:00
dkanada
8320ed685a
Merge pull request #3415 from jellyfin/dependabot/nuget/Swashbuckle.AspNetCore-5.5.0
Bump Swashbuckle.AspNetCore from 5.4.1 to 5.5.0
2020-06-22 22:10:48 +09:00
dkanada
2498c5f0ab
Merge pull request #3417 from jellyfin/dependabot/nuget/Moq-4.14.3
Bump Moq from 4.14.1 to 4.14.3
2020-06-22 22:10:29 +09:00
dkanada
552a358c9c
Merge pull request #3244 from jellyfin/custom-repos
Initial implementation for custom plugin repositories
2020-06-22 22:08:43 +09:00
dkanada
3d65cbdf07
apply suggestions from code review
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-06-22 21:59:56 +09:00
dependabot[bot]
3e57898d6b
Bump Moq from 4.14.1 to 4.14.3
Bumps [Moq](https://github.com/moq/moq4) from 4.14.1 to 4.14.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.1...v4.14.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-22 12:01:53 +00:00
dependabot[bot]
12f700fb2a
Bump Swashbuckle.AspNetCore from 5.4.1 to 5.5.0
Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 5.4.1 to 5.5.0.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v5.4.1...v5.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-22 12:01:34 +00:00
dependabot[bot]
be4fdd2394
Bump prometheus-net from 3.5.0 to 3.6.0
Bumps [prometheus-net](https://github.com/prometheus-net/prometheus-net) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/prometheus-net/prometheus-net/releases)
- [Changelog](https://github.com/prometheus-net/prometheus-net/blob/master/History)
- [Commits](https://github.com/prometheus-net/prometheus-net/compare/v3.5.0...v3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-22 12:01:32 +00:00
Neil Burrows
0bab57ebbc Wrapping long line on function parameters (take 2) 2020-06-22 11:56:18 +01:00
Neil Burrows
966ebfaf68 Wrapping long line on function parameters 2020-06-22 11:53:15 +01:00
Neil Burrows
a20fd34161
Update Emby.Server.Implementations/Updates/InstallationManager.cs
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-06-22 11:04:20 +01:00
Neil Burrows
c20400fa40 Prevent system plugins from being uninstalled 2020-06-22 10:13:28 +01:00
Bond-009
f75024fade Fix scan crashed 2020-06-22 10:06:35 +02:00
Nitish Raj Uprety
c3349038c4 Translated using Weblate (Nepali)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ne/
2020-06-21 15:37:41 -04:00
andyguerra
18602b4724 Translated using Weblate (Spanish (Latin America))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/es_419/
2020-06-21 12:54:20 -04:00
Nitish Raj Uprety
1c371812aa Added translation using Weblate (Nepali) 2020-06-21 10:23:49 -04:00
Joshua M. Boniface
680dd95292
Merge pull request #3394 from Ullmie02/fix-startupwizzard
Fix startup wizard in 10.6
2020-06-21 03:12:12 -04:00
Anthony Lavado
3a5df3d060
Merge pull request #3007 from BaronGreenback/SSDP
Fix for #2986
2020-06-20 17:39:00 -04:00
Cody Robibero
43221fc26b
Merge branch 'master' into SSDP 2020-06-20 15:33:13 -06:00
David
82c1da34be Fix tests 2020-06-20 18:29:29 +02:00
Anthony Lavado
bb947718ea
Merge pull request #3380 from Bond-009/warn20
Enable TreatWarningsAsErrors in Release for MediaBrowser.Providers
2020-06-20 12:26:02 -04:00
David
1c78482b48 Use authorization code from api-migration to fix startup wizard 2020-06-20 18:02:03 +02:00
Bond-009
beb3896d7f
Merge pull request #3390 from telans/fixes
Multiple warning fixes
2020-06-20 16:48:48 +02:00
telans
6556bec646
brace multiline if statements (cont.) 2020-06-20 21:19:16 +12:00
telans
5bb639a59a
newlines after braces 2020-06-20 21:13:48 +12:00
telans
7f307f9082
brace multiline if statements 2020-06-20 21:12:36 +12:00
telans
98db8f72e0
fix SA1503 for one line if statements 2020-06-20 20:35:29 +12:00
telans
8e3d874802
remove regions 2020-06-20 18:20:33 +12:00
telans
8de6452967
fix some documentation periods 2020-06-20 18:13:11 +12:00
telans
afe09612e8
fix SA1119 2020-06-20 18:13:11 +12:00
BaronGreenback
46006a1aff Re-ordered code for the match 2020-06-19 22:32:07 +01:00
BaronGreenback
6c2139a4c1 Merge branch 'SSDP' of https://github.com/BaronGreenback/jellyfin into SSDP 2020-06-19 22:07:43 +01:00
BaronGreenback
02f6ced07a Merged 2020-06-19 22:07:25 +01:00
Bond_009
eba488a0f8 Enable TreatWarningsAsErrors in Release for MediaBrowser.Providers 2020-06-19 20:24:13 +02: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
cae3ed8aeb
Merge pull request #3316 from aled/check-stored-password-exists
Fix server error when user enters a password, but none is set.
2020-06-19 16:59:35 +02:00
Bond_009
46276acc22 Fix Task that ignores cancellation request 2020-06-17 19:20:43 +02:00
Bond-009
fbefddbb81
Merge pull request #3334 from crobibero/warning-local-metadata
Remove warnings from MediaBrowser.LocalMetadata
2020-06-17 18:07:59 +02:00
Cody Robibero
8604b712bd
Update MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-06-17 09:53:02 -06:00
Anthony Lavado
fde63e16cb
Merge pull request #3358 from crobibero/people-blurhash
Enable BlurHash for People
2020-06-16 21:23:20 -04:00
crobibero
a639663aa7 Merge remote-tracking branch 'upstream/master' into warning-local-metadata 2020-06-16 18:30:10 -06:00
crobibero
0651d7512b Enable BlurHash for People 2020-06-16 15:12:48 -06:00
aled
991b6fb739 Merge remote-tracking branch 'upstream/master' into check-stored-password-exists 2020-06-16 19:30:54 +01:00