From edb522c13424ba26c9e22e2ad990bb3dc8c52d97 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 7 May 2020 07:51:47 +0200
Subject: [PATCH 1/4] Added 'beta' version to previous OS display

---
 plugins/dynamix.plugin.manager/Update.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix.plugin.manager/Update.page b/plugins/dynamix.plugin.manager/Update.page
index 2fc478963..314a3c83c 100644
--- a/plugins/dynamix.plugin.manager/Update.page
+++ b/plugins/dynamix.plugin.manager/Update.page
@@ -30,7 +30,7 @@ if (file_exists('/boot/previous/changes.txt')) {
       break;
     }
   }
-  $branch = strpos($version,'rc')===false ? 'Stable' : 'Next';
+  $branch = strpos($version,'rc')!==false ? 'Next' : (strpos($version,'beta')!==false ? 'Beta' : 'Stable');
 }
 ?>
 <style>

From 58d0ce7683bf2d7dc1398f2493d43cb7c341bb33 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 7 May 2020 09:03:01 +0200
Subject: [PATCH 2/4] Network settings: updated text

---
 plugins/dynamix/EthX.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/EthX.page b/plugins/dynamix/EthX.page
index 0192bbfae..e8d5395b0 100644
--- a/plugins/dynamix/EthX.page
+++ b/plugins/dynamix/EthX.page
@@ -308,7 +308,7 @@ _(IPv6 address)_:
 
 _(IPv6 default gateway)_:
 : <input type="text" name="GATEWAY6:0" maxlength="39" value="<?=$ethX["GATEWAY6:0"]?>" pattern="<?=$validIP6?>" title="_(IPv6 address nnnn:xxxx::yyyy)_">
-  <input type="text" name="METRIC6:0" min="0" max="9999" value="<?=$ethX["METRIC6:0"]?>" class="slim"><i class="fa fa-sort-numeric-asc"></i> *_(optional metric (lowest is preferred))_*
+  <input type="text" name="METRIC6:0" min="0" max="9999" value="<?=$ethX["METRIC6:0"]?>" class="slim"><i class="fa fa-sort-numeric-asc"></i> *_(optional metric (lowest is preferred, 0 is no default gateway))_*
 
 :help137
 > Greyed out when using automatic IP assignment. Otherwise specify here the IPv6 address of your router.

From 58474fcb54a1f7bde056c2ac750edda46bebdd20 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 7 May 2020 15:33:23 +0200
Subject: [PATCH 3/4] Revert "Docker: fixed basic/advanced switch when adding a
 new container"

This reverts commit 7386cad1a2bd2c1d6aa37d4a9c368c8fed0655e8.
---
 plugins/dynamix.docker.manager/include/CreateDocker.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index 92f8b40e8..67d5f8db4 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -668,6 +668,7 @@ $(function() {
     var status = $(this).is(':checked');
     toggleRows('advanced', status, 'basic');
     load_contOverview();
+    $("#catSelect").dropdownchecklist("destroy");
     $("#catSelect").dropdownchecklist({emptyText:'_(Select categories)_...', maxDropHeight:200, width:300, explicitClose:'..._(close)_'});
   });
 });
@@ -760,7 +761,7 @@ _(Repository)_:
 <div markdown="1" class="<?=$authoring?>">
 _(Categories)_:
 : <input type="hidden" name="contCategory">
-  <select id="catSelect" multiple="multiple" style="display:none" onchange="prepareCategory();">
+  <select id="catSelect" size="1" multiple="multiple" style="display:none" onchange="prepareCategory();">
   <optgroup label="_(Categories)_">
   <option value="Backup:">_(Backup)_</option>
   <option value="Cloud:">_(Cloud)_</option>

From a904ca9feb947e74397bf50c4d1733b1a2589387 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 8 May 2020 10:28:55 +0200
Subject: [PATCH 4/4] Multi-language support

---
 plugins/dynamix/include/LanguageReset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/LanguageReset.php b/plugins/dynamix/include/LanguageReset.php
index 4984d2261..06b8284db 100644
--- a/plugins/dynamix/include/LanguageReset.php
+++ b/plugins/dynamix/include/LanguageReset.php
@@ -12,5 +12,5 @@
 ?>
 <?
 $lang = $_POST['lang'] ?? '';
-exec("sed -ri 's/^(locale=\")[^\"]*/\\1$lang/' /boot/config/plugins/dynamix/dynamix.cfg");
+exec("sed -ri 's/^(locale=\")[^\"]*/\\1$lang/' /boot/config/plugins/dynamix/dynamix.cfg 2>/dev/null");
 ?>