michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,578 Commits 2 Branches 79 Tags 73 MiB
dc3f24c112
Commit Graph

2954 Commits

Author SHA1 Message Date
Ryan Petris
3fa3a9d57a
Preemptively throw a LiveTvConflictException when the tracked live streams for a given device/tuner will exceed the number of supported streams. 2020-09-23 14:23:04 -07:00
Ryan Petris
4db5700e18
Don't take a lock if there's no intention to manipulate the list of open streams. Instead, use a ConcurrentDictionary so that, in those situations, thread-safe access to the dictionary is ensured. 2020-09-23 14:12:26 -07:00
Anthony Lavado
5aa743a6a2
Merge pull request #4163 from Bond-009/minor4 
Minor improvements
 2020-09-23 10:30:13 -04:00
Anthony Lavado
af24c43118
Merge pull request #4192 from nielsvanvelzen/generalcommand-sucks 
Use GeneralCommandType enum in GeneralCommand
 2020-09-23 09:57:45 -04:00
Oatavandi
9bcd81a5dd Translated using Weblate (Tamil) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ta/
 2020-09-23 09:12:57 -04:00
dkanada
236dfe3ed8
Merge pull request #4170 from BaronGreenback/VersioningImprovement 
Plugin versioning - amended for plugins without meta.json
 2020-09-23 20:06:35 +09:00
dkanada
8a299ba7c0
Merge pull request #4178 from hoanghuy309/patch-1 
Update LocalizationManager.cs
 2020-09-23 20:04:09 +09:00
dkanada
dfb2ef5cfe
Merge pull request #4126 from crobibero/3.1.8 
update to dotnet 3.1.8
 2020-09-23 19:52:37 +09:00
hoanghuy309
a1511add06 Translated using Weblate (Vietnamese) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/
 2020-09-22 21:47:09 -04:00
hoanghuy309
fa1df73d10 Translated using Weblate (Vietnamese) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/
 2020-09-22 12:25:54 -04:00
Nelson Tham
03cbf5cfbf Translated using Weblate (Chinese (Traditional)) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant/
 2020-09-21 15:21:58 -04:00
Niels van Velzen
3459655bb4 Use GeneralCommandType enum in GeneralCommand name 2020-09-21 16:56:22 +02:00
hoanghuy309
7da03d67a7 Translated using Weblate (Vietnamese) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/
 2020-09-21 08:13:38 -04:00
장건
849835b486 Translated using Weblate (Korean) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ko/
 2020-09-21 08:13:38 -04:00
hoanghuy309
1f2e227610 Translated using Weblate (Vietnamese) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/
 2020-09-21 06:22:51 -04:00
josteinh
983aa05e76 Translated using Weblate (Norwegian Bokmål) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nb_NO/
 2020-09-21 04:26:11 -04:00
jeremletrol81
d39b70de32 Translated using Weblate (French) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fr/
 2020-09-20 07:09:22 -04:00
Anton Fernandez Príncipe
484cd88766 Translated using Weblate (Galician) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/gl/
 2020-09-19 12:01:32 -04:00
hoanghuy309
675fcab451 Translated using Weblate (Vietnamese) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/
 2020-09-19 03:50:37 -04:00
hoanghuy309
f363d8afd5
Update LocalizationManager.cs 2020-09-18 22:31:09 +07:00
BaronGreenback
92b63db569
Update ApplicationHost.cs 2020-09-17 15:57:11 +01:00
BaronGreenback
826148dc84
Added versioning to files without meta.json 2020-09-17 11:01:46 +01:00
Joshua M. Boniface
bc5404cd6f
Merge pull request #3401 from BaronGreenback/Plugins 
Fix for windows plug-in upgrades issue: #1623
 2020-09-16 17:22:58 -04:00
spookbits
5cca8bffea Removed browser auto-load functionality from the server. 
Added profiles in launchSettings to start either the web client or the swagger API page.
Removed --noautorunwebapp as this is the default functionality.
 2020-09-16 13:22:04 -04:00
BaronGreenback
ad00b93be5
Rename PlugInManifest.cs to PluginManifest.cs 2020-09-16 14:14:10 +01:00
Bond_009
2dbf73b989 Minor improvements 2020-09-16 14:16:44 +02:00
BaronGreenback
a2c50e8005
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
 2020-09-14 21:02:13 +01:00
BaronGreenback
5baf87663f
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
 2020-09-14 20:57:49 +01:00
BaronGreenback
02951bb8ce
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
 2020-09-14 20:57:00 +01:00
BaronGreenback
69c4b44d24
Update ApplicationHost.cs 2020-09-14 20:52:18 +01:00
BaronGreenback
51c416c832
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-14 20:23:35 +01:00
BaronGreenback
e88d3ba8c2
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-14 18:44:29 +01:00
BaronGreenback
f80e181eda
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-14 18:44:17 +01:00
Jim Cartlidge
d27d2a8990 Renamed file. 2020-09-14 18:23:50 +01:00
hoanghuy309
a626ce5bd0 Translated using Weblate (Vietnamese) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/
 2020-09-14 13:09:18 -04:00
BaronGreenback
f73e744785
Update Emby.Server.Implementations/Plugins/PlugInManifest.cs 
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
 2020-09-14 17:58:10 +01:00
BaronGreenback
68d08e94fd
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-14 16:18:39 +01:00
hoanghuy309
9183688cab Translated using Weblate (Vietnamese) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/
 2020-09-14 09:13:41 -04:00
hoanghuy309
fc827a7b25 Added translation using Weblate (Vietnamese) 2020-09-14 08:12:19 -04:00
kevin
3a75365930 Translated using Weblate (Albanian) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/sq/
 2020-09-14 07:47:18 -04:00
kevin
17f66b4943 Added translation using Weblate (Albanian) 2020-09-14 06:39:06 -04:00
BaronGreenback
7b4b101eca
Update ApplicationHost.cs 2020-09-13 18:06:13 +01:00
BaronGreenback
107d606a70
Update ApplicationHost.cs 2020-09-13 17:51:14 +01:00
BaronGreenback
6c2c2cb872
Update ApplicationHost.cs 
Global jsonserializer added
 2020-09-13 17:45:17 +01:00
BaronGreenback
ea0eb9a6ff
Update PlugInManifest.cs 
Added comments.
 2020-09-13 17:42:40 +01:00
BaronGreenback
12fb827405
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-13 17:29:10 +01:00
BaronGreenback
008aa51eb7
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-13 17:24:30 +01:00
BaronGreenback
b4edb7c90d
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-13 17:24:02 +01:00
Jim Cartlidge
5f58d2c151 With method comments. 2020-09-13 16:37:20 +01:00
Jim Cartlidge
81f655803d Modified to work with manifests. 2020-09-13 16:30:04 +01:00
crobibero
46ae51bc9a update to dotnet 3.1.8 2020-09-12 10:19:04 -06:00
Bond-009
ebdcff8b08
Merge pull request #4118 from SegiH/set-playlist-allow-duplicates-option-to-false-by-default 
Change default value for allow duplicates in playlist option to False
 2020-09-11 13:33:13 +00:00
Anthony Lavado
b198c6f4d1
Merge pull request #4108 from Bond-009/PERFORMANCE 
Minor performance improvements to item saving
 2020-09-11 08:33:36 -04:00
Bond_009
edbd4e0db6 Remove extra return statement 2020-09-11 12:57:57 +02:00
Bond_009
441301069e Fix 2020-09-11 12:56:11 +02:00
Hilman Maulana
50877761f6 Translated using Weblate (Indonesian) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/id/
 2020-09-11 03:14:25 -04:00
Segi Hovav
73bff9da9d Change default value for allow duplicates in playlist option to False 2020-09-10 10:03:08 -07:00
cvium
7576824cee Standardize use of IsLocal and RemoteIp 2020-09-10 14:16:41 +02:00
Bond_009
15be11fca8 Fix build 2020-09-09 14:22:27 +02:00
Bond_009
48e1cf9fd7 Minor performance improvements to item saving 2020-09-09 13:38:27 +02:00
BaronGreenback
60e8f47194
Update ApplicationHost.cs 2020-09-08 17:52:08 +01:00
BaronGreenback
ddfb13f945
Update Emby.Server.Implementations/Updates/InstallationManager.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-08 17:50:37 +01:00
BaronGreenback
f4eb34a966
Update Emby.Server.Implementations/Updates/InstallationManager.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-08 17:50:19 +01:00
BaronGreenback
a9d8b53658
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-08 17:49:55 +01:00
BaronGreenback
2eff0db804
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-08 17:49:38 +01:00
Anthony Lavado
cd40688584
Merge pull request #4076 from Bond-009/warn29 
Fix some warnings
 2020-09-07 19:41:58 -04:00
Anthony Lavado
cc6b03296a
Merge pull request #3899 from crobibero/plugin-install 
Install specific plugin version if requested
 2020-09-07 19:39:55 -04:00
crobibero
a2e90170da Use existing configuration manager 2020-09-07 14:21:30 -06:00
crobibero
7de0fcfc94 Merge remote-tracking branch 'upstream/master' into startup-complete 2020-09-07 14:07:15 -06:00
linzack
23f6616e63 Translated using Weblate (Chinese (Traditional)) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant/
 2020-09-07 11:34:39 -04:00
linzack
b711e78fe2 Translated using Weblate (Chinese (Traditional)) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant/
 2020-09-07 11:28:54 -04:00
linzack
5751d4765a Translated using Weblate (Chinese (Traditional)) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant/
 2020-09-07 11:25:41 -04:00
BaronGreenback
cf87b3afb7 Remove excess code. 2020-09-07 12:28:48 +01:00
Bond_009
384ab39f5b Fix some warnings 2020-09-07 13:20:39 +02:00
crobibero
26c432b564 Rename StartupCompleted to StartupWizardCompleted 2020-09-06 14:27:31 -06:00
crobibero
db9bcdcdc9 Use proper StartupCompleted flag 2020-09-05 18:48:19 -06:00
Patrick Barron
8a15ad160b Fix plugin events not being called and clean up InstallationManager.cs 2020-09-05 18:58:16 -04:00
BaronGreenback
0f6ea123ea
Update ApplicationHost.cs 2020-09-05 20:55:42 +01:00
BaronGreenback
8439860b2a
Merge branch 'master' into Plugins 2020-09-05 20:49:04 +01:00
BaronGreenback
e33824d286
Changed to named tuples 2020-09-05 20:20:15 +01:00
crobibero
9a74ace84b Add flag for startup completed 2020-09-05 09:20:58 -06:00
crobibero
23df4991b6 Use proper buffer size 2020-09-04 08:24:21 -06:00
crobibero
2a8653b309 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-04 08:16:49 -06:00
Vijay Raghav
1cbe4896e2 Translated using Weblate (Tamil) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ta/
 2020-09-03 15:58:15 -04:00
Joshua M. Boniface
52aea85e7f
Merge pull request #4031 from Bond-009/warn28 
Fix some warnings
 2020-09-03 14:40:29 -04:00
josteinh
22ac6b9a48 Translated using Weblate (Norwegian Nynorsk) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nn/
 2020-09-03 12:40:22 -04:00
josteinh
a013d3f4f8 Translated using Weblate (Norwegian Bokmål) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nb_NO/
 2020-09-03 12:40:22 -04:00
crobibero
82f30a35db Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-03 10:40:08 -06:00
crobibero
b035a642d2 Merge remote-tracking branch 'upstream/master' into plugin-install 2020-09-03 10:37:35 -06:00
crobibero
5ad81f7fe6 Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-09-03 09:29:07 -06:00
crobibero
fb422ff741 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-03 07:46:52 -06:00
Anthony Lavado
a2d6ea2eed
Merge pull request #4043 from cvium/remove_shit_and_shit_adjacent_shit 
Split HttpListenerHost into middlewares
 2020-09-03 09:45:17 -04:00
crobibero
ae8ff1ca54 last time I swear 2020-09-03 07:30:34 -06:00
crobibero
4d4dc0b555 Remove ResponseHeadersRead in SchedulesDirect 2020-09-03 07:22:32 -06:00
crobibero
d8a0edc511 Revert "Remove ResponseHeadersRead where applicable" 
This reverts commit 85844a84b6.
 2020-09-03 07:20:33 -06:00
crobibero
85844a84b6 Remove ResponseHeadersRead where applicable 2020-09-03 06:48:19 -06:00
Claus Vium
2f79c3095b Fix startup message 2020-09-03 11:54:38 +02:00
Claus Vium
571d0570f5 Kill HttpListenerHost 2020-09-03 11:32:22 +02:00
Claus Vium
5813f8073c Move HttpListenerHost middleware up the pipeline 2020-09-03 00:32:56 +02:00
Bond-009
52b34eb407
Merge pull request #4039 from cvium/remove_shit_and_shit_adjacent_shit 
Remove ServiceStack and related stuff
 2020-09-02 23:18:32 +02:00
Airichan
59597b6c7f Translated using Weblate (Thai) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/th/
 2020-09-02 14:51:51 -04:00
Sverre
9383ae6061 Translated using Weblate (Norwegian Bokmål) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nb_NO/
 2020-09-02 14:51:50 -04:00
Airichan
191f109da9 Translated using Weblate (Thai) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/th/
 2020-09-02 13:07:44 -04:00
Claus Vium
38be506849 Fix xml doc 2020-09-02 13:29:20 +02:00
Claus Vium
12710cdf42 More fixes 2020-09-02 13:06:14 +02:00
Claus Vium
e337756428 Remove ServiceStack and related stuff 2020-09-02 12:22:14 +02:00
crobibero
f443c534bf Merge remote-tracking branch 'upstream/master' into package-install-repo 2020-09-01 18:24:42 -06:00
crobibero
b111b9e2c9 Fix styling 2020-09-01 07:58:05 -06:00
crobibero
e1d0b430d9 Remove HttpRequestOptions 2020-09-01 07:51:55 -06:00
crobibero
4038d15c83 Properly migrate all HttpCompletionOption 2020-09-01 07:51:06 -06:00
fernando012
2d198292a3 Translated using Weblate (Spanish (Dominican Republic)) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/es_DO/
 2020-09-01 00:18:27 -04:00
Bond-009
8ee042483a
Merge pull request #2888 from ConfusedPolarBear/quickconnect 
Add quick connect (login without typing password)
 2020-08-31 23:01:27 +02:00
Bond_009
e653eef44f Fix some warnings 2020-08-31 22:20:19 +02:00
crobibero
8d592777c4 change to using declaration 2020-08-31 12:46:42 -06:00
crobibero
f498e1ee59 remove IHttpClient 🎉 2020-08-31 12:10:49 -06:00
crobibero
6ae4da709e migrate to IHttpClientFactory in M3UTunerHost 2020-08-31 12:08:45 -06:00
crobibero
5b93b3b15e migrate to IHttpClientFactory in M3uParser 2020-08-31 12:08:37 -06:00
crobibero
af9ebef577 migrate to IHttpClientFactory in SharedHttpStream 2020-08-31 12:06:42 -06:00
crobibero
96fdee38cb migrate to IHttpClientFactory in HdHomerunHost 2020-08-31 12:03:41 -06:00
crobibero
97cc3d54bb migrate to IHttpClientFactory in XmlTvListingsProvider 2020-08-31 12:00:09 -06:00
crobibero
652e688cc1 migrate to IHttpClientFactory in SchedulesDirect 2020-08-31 11:57:11 -06:00
crobibero
50a1e35765 migrate to IHttpClientFactory in EmbyTV 2020-08-31 11:39:40 -06:00
crobibero
804b0fc034 migrate to IHttpClientFactory in DirectRecorder 2020-08-31 11:38:47 -06:00
crobibero
6d19adbecf migrate to IHttpClientFactory in ApplicationHost 2020-08-31 11:36:29 -06:00
crobibero
533b981668 migrate to IHttpClientFactory in InstallationManager 2020-08-31 11:30:05 -06:00
Bond-009
95142643f6
Merge pull request #3871 from Ullmie02/plugins-api 
Allow plugins to define their own api endpoints
 2020-08-31 18:28:11 +02:00
David Ullmer
b37cc7bfaf Don't evaluate twice 2020-08-31 18:03:13 +02:00
David Ullmer
7f79f2ee0e Use .Distinct on assembly 2020-08-31 17:53:55 +02:00
David Ullmer
b7c07f6821 Merge branch 'master' into library-pictures 2020-08-31 16:16:01 +02:00
crobibero
5d528e202f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:10:15 -06:00
Bond-009
4cc7406fe9
Merge pull request #4026 from jellyfin/dependabot/nuget/prometheus-net.DotNetRuntime-3.4.0 
Bump prometheus-net.DotNetRuntime from 3.3.1 to 3.4.0
 2020-08-31 16:05:55 +02:00
crobibero
bd66fd25df Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:00:05 -06:00
dependabot[bot]
5804f9a55f
Bump prometheus-net.DotNetRuntime from 3.3.1 to 3.4.0 
Bumps [prometheus-net.DotNetRuntime](https://github.com/djluck/prometheus-net.DotNetRuntime) from 3.3.1 to 3.4.0.
- [Release notes](https://github.com/djluck/prometheus-net.DotNetRuntime/releases)
- [Commits](https://github.com/djluck/prometheus-net.DotNetRuntime/compare/3.3.1...3.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-31 12:02:24 +00:00
dependabot[bot]
5d557927b5
Bump IPNetwork2 from 2.5.211 to 2.5.224 
Bumps [IPNetwork2](https://github.com/lduchosal/ipnetwork) from 2.5.211 to 2.5.224.
- [Release notes](https://github.com/lduchosal/ipnetwork/releases)
- [Commits](https://github.com/lduchosal/ipnetwork/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-31 12:02:07 +00:00
Hilman Maulana
b0a8c31e0f Translated using Weblate (Indonesian) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/id/
 2020-08-28 02:24:38 -04:00
Kraisorn Thongsuk
ba7bdbc494 Translated using Weblate (Thai) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/th/
 2020-08-27 03:54:08 -04:00
Matt Montgomery
df0d197dc8 Apply suggestions from code review 2020-08-26 15:24:24 -05:00
Bond-009
4f6c98b325
Merge pull request #3984 from crobibero/json-prerelease 
Use Prerelease System.Text.Json
 2020-08-26 18:59:46 +02:00
Matt Montgomery
2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05:00
crobibero
de4cfa2234 Apply suggestions from code review 2020-08-26 08:45:59 -06:00
crobibero
acd88dae45 fix build 2020-08-25 08:11:50 -06:00
crobibero
5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06:00
Patrick Barron
9fa4fff15d Merge branch 'master' into event-rewrite-1 
# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
 2020-08-24 20:04:13 -04:00
crobibero
9626101c9f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-24 07:39:16 -06:00
crobibero
340f83c3f5 Ignore null json values 2020-08-23 07:48:12 -06:00
Hilman Maulana
e88b7b8d0e Translated using Weblate (Indonesian) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/id/
 2020-08-22 18:45:59 -04:00
Joshua M. Boniface
3e65cae70e
Merge pull request #3955 from Bond-009/async3 
Make some methods async
 2020-08-21 18:03:07 -04:00
Bond_009
2b832de289 Fix build 2020-08-21 22:19:16 +02:00
Bond_009
119f64f5e7 Make some methods async 2020-08-21 22:01:19 +02:00
David
a3020f2917 Use backdrop with library name as library thumbnail 2020-08-21 19:53:55 +02:00