Commit Graph

5144 Commits

Author SHA1 Message Date
Bill Thornton
9ea46b9e17 Remove existing sessions for a user on the same device on login 2023-09-11 10:49:01 -04:00
Bill Thornton
9c64f94458 Add option to include resumable items in next up requests 2023-09-06 00:35:32 -04:00
Bill Thornton
aea57c1a4a Remove unused variable 2023-09-06 00:06:08 -04:00
Bill Thornton
8d6e7d893b Remove one session per device id limitation 2023-09-05 16:49:28 -04:00
Lukáš Kucharczyk
5c5daac98c Translated using Weblate (Czech)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/cs/
2023-09-05 02:40:48 -04:00
Nick
5a860710a8 Make TrickplayManifest dictionary key a string rather than Guid 2023-09-04 12:30:20 -07:00
Slug-Cat
25bc4b875c Translated using Weblate (Pirate (pr))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/pr/
2023-09-03 01:40:49 -04:00
queeup
da6a3c2bd3 Translated using Weblate (Turkish)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/tr/
2023-09-01 10:40:48 -04:00
Daniel Martin Gonzalez
1aa0ce961b
Add new Spain content rating ERI
Add the content rating ERI to Spain list used in some providers and channels as Specially Recommended for Toddlers.
2023-08-29 11:22:55 +02:00
Bond-009
c7ca416206
Merge pull request #10138 from cvium/sqlite_client_poc 2023-08-28 11:54:35 +02:00
Bond-009
3b07d73d40
Merge pull request #10154 from goremykin/multiple-enumerations 2023-08-27 10:17:30 +02:00
NickSkier
1f083c0de2 Translated using Weblate (Russian)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ru/
2023-08-26 11:44:18 -04:00
Stepan Goremykin
0ed2aa6f06 Fix a few multiple enumerations 2023-08-26 16:57:27 +02:00
cvium
4fa7672d75 fix todos and add graylog back 2023-08-25 19:49:14 +02:00
cvium
9a246166b0 move a computation out of transaction and skip season updates if name matches 2023-08-23 12:15:21 +02:00
Bond_009
18a311d32f == null -> is null 2023-08-22 21:14:54 +02:00
cvium
cb48fe02c2 remove nullable enable 2023-08-22 20:12:16 +02:00
Bond_009
d92e9ae85e Enable nullable for more files and add tests
Adds basic tests for FFProbeVideoInfo.CreateDummyChapters
Fixed error message CreateDummyChapters instead of reporting the total minutes it only reported the minute component
2023-08-22 18:11:34 +02:00
cvium
05e40ecb93 review comments 2023-08-22 08:31:34 +02:00
cvium
0d3d9490e5 remove unused deps 2023-08-22 07:27:21 +02:00
cvium
d1190c5215 fix userdata table not being committed 2023-08-21 22:12:08 +02:00
cvium
a061e8f8e4 fix bad merge 2023-08-21 21:54:56 +02:00
cvium
c24571b5b8 Merge branch 'master' into sqlite_client_poc
# Conflicts:
#	Emby.Server.Implementations/Data/SqliteItemRepository.cs
2023-08-21 21:53:26 +02:00
cvium
e7016e38b8 remove readonly 2023-08-21 21:49:39 +02:00
cvium
791413a50f open before changing pragmas 2023-08-21 21:38:16 +02:00
cvium
cf04b43fa4 simplify extension methods 2023-08-21 21:37:18 +02:00
cvium
fb511dbae2 rename variable and fix crash 2023-08-21 20:34:50 +02:00
Bond-009
84643e328d
Reduce the amount of allocations in GetWhereClauses (#10114) 2023-08-21 18:38:32 +02:00
cvium
061d79c113 remove runintransaction 2023-08-21 14:12:49 +02:00
cvium
0867812c1f more using 2023-08-21 12:46:30 +02:00
cvium
f2d7842563 add missing using 2023-08-21 12:29:20 +02:00
cvium
493229cc15 fix guid blobs 2023-08-21 12:27:07 +02:00
cvium
613f4296e3 loading works 2023-08-21 12:13:32 +02:00
Muhammad Wafi Bin Arzu
388420faa2 Translated using Weblate (Malay)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ms/
2023-08-20 15:40:43 -04:00
0TTA
24201ef2e9 Translated using Weblate (Arabic)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ar/
2023-08-20 15:40:43 -04:00
Bond-009
260680d727
Merge pull request #10122 from cvium/remove_unnecessary_memorycache 2023-08-20 20:06:21 +02:00
cvium
2e32e335ac refactor: use ConcurrentDictionary when IMemoryCache isn't needed 2023-08-18 14:00:56 +02:00
TelepathicWalrus
4c7fb8f452
Album gain (#10085)
* Add LUFSAlbum DTO

* Get loudest track for smallest gain

* Move gain search to musicalbum
use baseitem LUFS for album

* Use .Max for enumerable

* Update DTO to be consistent with other DTOs

* Remove albumlufs,
Move dto for all types
2023-08-18 10:25:56 +02:00
Bond-009
da030ed589
Merge pull request #10117 from Elu43/master
Fix French parental rating system
2023-08-18 10:25:06 +02:00
Samuel Bartík
71e4ea1314
Add Slovak parental ratings 2023-08-17 01:07:14 +02:00
Elu43
769953ad55
Update fr.csv 2023-08-16 15:33:58 +02:00
Bond-009
623027315b
Merge pull request #10029 from tallbl0nde/fix-multi-disc-album-art-extraction 2023-08-01 20:27:18 +02:00
Bond-009
07727e1d63
Merge pull request #9875 from Shadowghost/fixes 2023-08-01 20:26:21 +02:00
Bond_009
5677566a41 Enable nullable for more files 2023-07-29 21:35:38 +02:00
Shadowghost
4bb17039d7 Apply review suggestions 2023-07-29 13:50:55 +02:00
Shadowghost
048cb208b2
Fix Australian parental rating system (#10006) 2023-07-28 22:55:54 -06:00
tallbl0nde
b8e5afbc10
Enable recursive query in BaseFolderImageProvider
Fixes album art not being extracted for multi-disc albums
2023-07-21 19:16:01 +09:30
Bond-009
db347eb7d8
Merge pull request #9992 from Blackskyliner/patch-1 2023-07-20 23:55:03 +02:00
Jothi Prasath
fbe8388f82 Translated using Weblate (Tamil)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ta/
2023-07-17 09:41:52 -04:00
Yaron Shahrabani
a17f8c56b6 Translated using Weblate (Hebrew)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/he/
2023-07-17 09:41:52 -04:00
Osa
4d2e612693 Translated using Weblate (Arabic)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ar/
2023-07-13 17:54:56 -04:00
Christoph Landsdorf
bfc0056426
Add TinyMediaManager compatibility for german parental rating
This commit adds the format which gets written by
 the tool TinyMediaManager which can be used to
 manage large media databases comfortably.

TMM writes wither multiple Codes and/or space
 divided german FSK codes, but can't be configured
 to only use the number or the slash delimited variant.

After this change the parental control for Libraries
 managed with TMM and presented/loaded into Jellyfin
 should work again.
2023-07-12 20:32:43 +02:00
Aran Chananar
1ea8150b0c Translated using Weblate (Thai)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/th/
2023-07-10 01:41:49 -04:00
Shadowghost
05d98fe24c Enforce permissions on websocket connections 2023-07-07 08:50:37 +02:00
Shadowghost
958f8f71e8 Add wrapper object for authentication event information 2023-07-07 08:50:37 +02:00
Bond-009
5b711f38d1
Merge pull request #9958 from Shadowghost/networking-fixex 2023-07-06 19:56:17 +02:00
Bond-009
b95fa294c9
Merge pull request #9799 from Bond-009/genregex 2023-07-06 19:56:00 +02:00
Balázs Meskó
fd56296270 Translated using Weblate (Hungarian)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/hu/
2023-07-06 09:41:47 -04:00
Oskari Lavinto
3ab8235358 Translated using Weblate (Finnish)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fi/
2023-07-04 00:41:47 -04:00
Shadowghost
e56275fb46 Extract networking constants 2023-07-03 22:04:59 +02:00
Joshua M. Boniface
93b400343e
Merge pull request #8147 from Shadowghost/network-rewrite 2023-07-03 13:16:21 -04:00
Shadowghost
e233a3b074 Apply review suggestions 2023-07-03 15:59:39 +02:00
Shadowghost
32ac3b580c Rename additional values in NetworkConfiguration and add migration for all changed values 2023-07-03 14:03:33 +02:00
Claus Vium
10fde0a2c1
Merge pull request #8914 from bradbeattie/augmented-tag-searching
Augment tag searching to consider individual ItemValues instead of the delimited tags field
2023-07-03 08:51:46 +02:00
Cody Robibero
52252fcd55
Fix sending websocket messages (#9948) 2023-07-02 16:14:44 -06:00
Claus Vium
80f1f5e00d
Merge pull request #9219 from ProfessionalismIsMyMiddleName/master
Add a way to handle more invalid characters when sanitizing a filename
2023-07-01 19:39:38 +02:00
Claus Vium
bfb7c60f72
Merge pull request #9447 from Bond-009/disablerealtimemonitor
Disable real time monitoring by default
2023-07-01 19:33:53 +02:00
Ronan Charles-Lorel
4dc87a6f93
Align indentation on bottom brace of new list
Should stop error SA1137 in debug build
2023-07-01 03:37:18 +02:00
Ronan Charles-Lorel
c21140eeb5
Formatting
Fixes debug build?

Co-authored-by: Bond-009 <bond.009@outlook.com>
2023-07-01 03:24:19 +02:00
Ronan Charles-Lorel
07c142d5bd
Moving invalid chars list at class level with a better name 2023-06-29 16:04:45 +02:00
Ronan Charles-Lorel
46763b7661
Remove call to Path.GetInvalidFileNameChars
Superseded by a static char list to avoid platform-dependent issues
2023-06-29 15:21:39 +02:00
Ronan Charles-Lorel
e108183b13
Merge branch 'jellyfin:master' into master 2023-06-29 15:08:52 +02:00
Cody Robibero
b5bbb98175
Fix Websocket OpenApi (#9935)
* Further split inbound and outbound messages

* Fix datatype for inbound start messages

* fixes from review
2023-06-29 05:44:36 -06:00
Nick
6d9e43cfe0 Merge branch 'master' into trickplay 2023-06-28 21:43:23 -07:00
Joshua M. Boniface
76939bbd9b
Merge pull request #9231 from JPVenson/bugfix/1907_CleanupCollections 2023-06-28 17:44:11 -04:00
Bond_009
b5f0760db8 Use RegexGenerator where possible 2023-06-28 17:07:57 +02:00
Bond-009
f954dc5c96
Do HEAD request to get content type instead of checking for extension (#8823) 2023-06-27 21:36:39 -06:00
Cody Robibero
cc82ca189f suggestions from review 2023-06-27 21:19:15 -06:00
Shadowghost
a6e9824e8a Merge branch 'master' into network-rewrite 2023-06-27 16:15:57 +02:00
JPVenson
0f60ec3013
Update Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionPathsTask.cs
Co-authored-by: Bond-009 <bond.009@outlook.com>
2023-06-27 16:05:07 +02:00
Nick
fc61933748 Minor code changes 2023-06-26 22:04:39 -07:00
Nick
ab20ceaad6 Migrate to trickplay table to EF. Rename vars/methods/members to have consistent use of tile and thumbnail 2023-06-26 17:40:10 -07:00
Sushil Shrestha
45ed1d9f88 Translated using Weblate (Nepali)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ne/
2023-06-24 11:41:43 -04:00
Nick
d7fd54197c Task localization 2023-06-22 16:23:52 -07:00
nicknsy
d84370a6f7 Make trickplay response ids have no dashes 2023-06-22 16:23:51 -07:00
nicknsy
ca7d1a1300 Trickplay generation, manager, storage 2023-06-22 16:19:59 -07:00
Shadowghost
67a58df1a3 Merge branch 'master' into network-rewrite 2023-06-21 07:57:00 +02:00
Frank Riley
1952a915e6 Move hardcoded LibraryUpdateDuration to ServerConfiguration. Fixes #9893.
Signed-off-by: Frank Riley <fhriley@gmail.com>
2023-06-19 07:31:22 -07:00
Shadowghost
32499f0e98 Merge branch 'master' into network-rewrite 2023-06-15 17:53:52 +02:00
Cody Robibero
fe9e764af2
Merge pull request #9564 from AmbulantRex/whitelist-dlls 2023-06-10 07:28:37 -06:00
Cody Robibero
81cf798430
Merge pull request #8203 from Shadowghost/nfo-season-names
Implement NFO named season parsing
2023-06-10 07:27:54 -06:00
Shadowghost
006b04dc0b Merge branch 'master' into network-rewrite 2023-06-07 08:25:32 +02:00
Mark Lopez
29368a1566
Source SQLite cache_size from an Environment Variable (#9666) 2023-06-05 10:46:13 -06:00
Bond-009
aae22865a0
Merge pull request #9667 from Silvenga/restore-default-journal-size 2023-06-02 10:54:37 +02:00
Bucky Patel
093c2e0356 Translated using Weblate (Hindi)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/hi/
2023-06-02 03:21:58 -04:00
Bond-009
6dca53047f
Merge pull request #9818 from Shadowghost/fixes 2023-05-30 10:00:53 +02:00
pranelio
1bf7840936 Translated using Weblate (Lithuanian)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/lt/
2023-05-27 10:21:58 -04:00
Shadowghost
81746666de Fix TotalRecordCount calculation 2023-05-26 11:06:04 +02:00
Shadowghost
d8d5c86d49 Merge branch 'master' into network-rewrite 2023-05-25 17:07:43 +02:00
Bond_009
b44c9eb88e Check for Imdb id for series 2023-05-23 16:23:25 +02:00
Shadowghost
b37e9209df Apply review suggestion 2023-05-22 10:39:58 +02:00
Shimul Roy
45e99d2523 Translated using Weblate (Bengali)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/bn/
2023-05-21 14:21:58 -04:00
PakuDrag
bf90f502ae Translated using Weblate (Turkish)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/tr/
2023-05-21 14:21:58 -04:00
Shadowghost
6ddc449a89 Implement NFO named season parsing 2023-05-20 18:57:56 +02:00
Anvesh
3aa03a4640 Translated using Weblate (Telugu)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/te/
2023-05-18 04:21:44 -04:00
Abhinivesh Vijayan
55b10d298c Translated using Weblate (Malayalam)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ml/
2023-05-18 04:21:44 -04:00
Bill Thornton
dea1f60b0d
Merge pull request #9776 from thornbill/default-files
Use default files to remove index.html from url
2023-05-16 00:49:54 -04:00
Claus Vium
3a9f4a3c6d
Merge pull request #9775 from crobibero/readonlyspan
Fix readonlyspan usage
2023-05-15 23:13:21 +02:00
Bill Thornton
155f3856c0 Use default files to remove index.html from url 2023-05-15 15:28:33 -04:00
Cody Robibero
c809c36b30 Fix readonlyspan usage 2023-05-15 06:55:28 -06:00
Shadowghost
eb52af4e6a
Fix playlists library and migration (#9770) 2023-05-15 06:45:33 -06:00
TelepathicWalrus
603fce59df
Audio normalization (#9222)
Co-authored-by: Joe Rogers <1337joe@users.noreply.github.com>
Co-authored-by: Bond-009 <bond.009@outlook.com>
2023-05-15 13:12:24 +02:00
herby2212
ace89e4597 fix formatting and update summary 2023-05-14 15:05:03 +02:00
Shadowghost
a8cdf4434b
Fix access to playlists not created by a user (#9746) 2023-05-12 07:11:59 -06:00
Gustavs
fdda721394 Translated using Weblate (Latvian)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/lv/
2023-05-11 18:27:22 -04:00
Shadowghost
c042f20224 Merge branch 'master' into network-rewrite 2023-05-11 15:41:39 +02:00
Bond-009
756ee38d01
Remove ExtendedFileSystemInfo (#9749) 2023-05-10 17:39:57 -06:00
garikaib
f0bf5c4998 Translated using Weblate (Shona)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/sn/
2023-05-10 14:20:53 -04:00
garikaib
b3b75d5bc2 Added translation using Weblate (Shona) 2023-05-10 01:01:16 -04:00
SuperDumbTM
b42a6119f5 Translated using Weblate (Chinese (Traditional, Hong Kong))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant_HK/
2023-05-09 09:48:54 -04:00
Shadowghost
6cc1203c1b Merge branch 'master' into network-rewrite 2023-05-09 15:25:41 +02:00
無情天
92a0d26f31 Translated using Weblate (Chinese (Simplified))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hans/
2023-05-08 15:39:57 -04:00
Subham Jena
bceca0ae45 Translated using Weblate (Odia)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/or/
2023-05-07 14:39:43 -04:00
Brett Healey
898a04c9e3 Translated using Weblate (Welsh)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/cy/
2023-05-07 14:39:43 -04:00
TheSharingBrother
9ce152ecf6 Translated using Weblate (Hindi)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/hi/
2023-05-07 14:39:43 -04:00
Subham Jena
fa0a48b54e Added translation using Weblate (Odia) 2023-05-06 01:42:35 -04:00
Alan Azar
f2a41fe79f Translated using Weblate (Urdu (Pakistan))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ur_PK/
2023-05-05 20:39:01 -04:00
Cody Robibero
aaddc5a33e
Merge pull request #9643 from Bond-009/sqlconnectionpool 2023-05-04 12:33:46 -06:00
Bond_009
8e1f0d53c1 nameof instead of GetType().Name 2023-05-04 14:42:39 +02:00
Meyu-Sys
5e2a1fb447 Translated using Weblate (Marathi)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/mr/
2023-05-03 18:39:42 -04:00
RJS
7b10957223 Translated using Weblate (Latvian)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/lv/
2023-05-03 18:39:42 -04:00
JPVenson
8b6fca59a1
Update Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionPathsTask.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2023-05-02 14:26:55 +02:00
herby2212
e1190d15d6 option to disable and configure inactive session threshold 2023-05-01 20:11:22 +02:00
herby2212
8bb44b85d7 close inactive sessions after 10 minutes 2023-05-01 16:24:15 +02:00
Oskari Lavinto
2c4f7ec52c Translated using Weblate (Finnish)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fi/
2023-05-01 04:39:41 -04:00
Mark Lopez
29889159e8
Increased the max journal_size_limit to reduce the number of truncation operations. 2023-04-24 06:19:37 -05:00
Bond_009
0d67901e37 Dispose BlockingCollection 2023-04-24 13:08:46 +02:00
Bond_009
13152bf09d Change number of read connections based on # of threads and add comments 2023-04-21 14:05:27 +02:00
Bond_009
8dba3a44fd Get write connection for vacuum 2023-04-21 14:04:37 +02:00
Bond_009
33f97045f9 Use BlockingCollection 2023-04-21 14:04:37 +02:00
Bond_009
858dadcdd1 POC sql connection pool 2023-04-21 14:04:37 +02:00
SuperDumbTM
4b2b46c8f3 Translated using Weblate (Chinese (Traditional, Hong Kong))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant_HK/
2023-04-17 22:39:36 -04:00
Juan B
9c88752f22 Translated using Weblate (Spanish)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/es/
2023-04-17 22:39:36 -04:00
AmbulantRex
c717425549 Remove unnecessary type extension and handle feedback. 2023-04-16 18:47:57 -06:00
Brad Beattie
ba5e51700e
Fix null parental rating comparison (#9618) 2023-04-16 11:09:54 -06:00
AmbulantRex
92f50054b2 Add explicit mapping instead of reflection to manifest reconciliation. 2023-04-16 07:46:12 -06:00
同福客栈跑堂蘸糖
922e04dbf3 Translated using Weblate (Chinese (Literary))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/lzh/
2023-04-15 19:04:49 -04:00
同福客栈跑堂蘸糖
5c370ff323 Added translation using Weblate (Chinese (Literary)) 2023-04-15 11:15:21 -04:00
SuperDumbTM
648240dad0 Translated using Weblate (Chinese (Traditional, Hong Kong))
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant_HK/
2023-04-15 09:39:35 -04:00
AmbulantRex
4a0b135b7a
Merge branch 'jellyfin:master' into whitelist-dlls 2023-04-15 07:11:33 -06:00