Merge branch 'master' into patch-11

This commit is contained in:
Squidly271
2025-10-22 17:19:09 -04:00
committed by GitHub
4 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -542,7 +542,7 @@ The share name can be up to 40 characters, and is case-sensitive with these rest
* must start with a letter
* subsequent characters can be a letter, digit, period, underscore, or dash, except the last character may not be a period
* cannot be one of the reserved names: flash, cache, cache2, .., disk1, disk2, ..
* cannot be one of the reserved names: homes, global, printers, flash, boot, user, user0, dev, remotes, RecycleBin, rootshare, addons, mirror, raidz*, draid, spare, log, disk*, parity*
:end
:share_edit_comments_help:
@@ -2597,7 +2597,7 @@ $(function() {
}
$("#gpubootvga"+myindex).removeClass();
if (mylabel == "_(None)_") $("#gpubootvga"+myindex).addClass('hidden');
if (myvalue != "_(virtual)_" && myvalue != "" && myvalue != "_(nogpu)_") {
if (myvalue != "virtual" && myvalue != "" && myvalue != "nogpu") {
if (ValidGPUs[myvalue].bootvga != "1") $("#gpubootvga"+myindex).addClass('hidden');
} else {
$("#gpubootvga"+myindex).addClass('hidden');
@@ -68,6 +68,7 @@ switch ($data['id']) {
foreach ($map as $name => $cpuset) {
/* set full path of template file */
$file = $DockerTemplates->getUserTemplate($name);
if ( ! is_file($file) ) continue;
$xml = simplexml_load_file($file);
if ($xml->CPUset) {
/* update node */
@@ -40,7 +40,7 @@
--small-shadow: 0 0 3px var(--gray-700);
--hr-color: var(--gray-800);
--checkbox-color: var(--gray-800);
--checkbox-color: var(--gray-500);
--checkbox-hover-color: var(--gray-600);
--brand-orange: var(--orange-500);