Merge pull request #24 from NethServer/sdl-7080

Update SOGo version to 5.11.2 NethServer/dev#7080
NethServer · Oct 29, 2024 · 991afbb · 991afbb
2 parents 5d33291 + 318b705
commit 991afbb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/build-images.sh b/build-images.sh
@@ -15,7 +15,7 @@ images=()
 repobase="${REPOBASE:-ghcr.io/nethserver}"
 # Configure the image name
 reponame="sogo"
-sogo_version="5.11.0"
+sogo_version="5.11.2"
 
 # Create a new empty container image
 container=$(buildah from scratch)

diff --git a/ui/package.json b/ui/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@carbon/icons-vue": "^10.37.0",
     "@carbon/vue": "^2.40.0",
-    "@nethserver/ns8-ui-lib": "^0.1.27",
+    "@nethserver/ns8-ui-lib": "^1.1.4",
     "await-to-js": "^3.0.0",
     "axios": "^0.21.2",
     "carbon-components": "^10.41.0",

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -120,9 +120,7 @@
                     class="mg-bottom"
                   >
                     <template slot="tooltip">
-                      <span
-                        v-html="$t('settings.auxiliary_account_tips')"
-                      ></span>
+                      <span>{{ $t("settings.auxiliary_account_tips") }}</span>
                     </template>
                     <template slot="text-left">{{
                       $t("settings.disabled")
@@ -142,7 +140,7 @@
                     class="mg-bottom"
                   >
                     <template slot="tooltip">
-                      <span v-html="$t('settings.dav_tips')"></span>
+                      <span>{{ $t("settings.dav_tips") }}</span>
                     </template>
                     <template slot="text-left">{{
                       $t("settings.disabled")
@@ -162,7 +160,7 @@
                     class="mg-bottom"
                   >
                     <template slot="tooltip">
-                      <span v-html="$t('settings.activesync_tips')"></span>
+                      <span>{{ $t("settings.activesync_tips") }}</span>
                     </template>
                     <template slot="text-left">{{
                       $t("settings.disabled")
@@ -188,7 +186,7 @@
                     tooltipDirection="right"
                   >
                     <template slot="tooltip">
-                      <div v-html="$t('settings.workers_count_tips')"></div>
+                      <div>{{ $t("settings.workers_count_tips") }}</div>
                     </template>
                   </NsTextInput>
                 </template>
@@ -466,7 +464,11 @@ export default {
             dav: this.isDavEnabled,
             mail_server: mail_server_tmp,
             mail_domain: mail_domain_tmp,
-            admin_users: this.admin_users.split("\n").join(",").toLowerCase().trim(),
+            admin_users: this.admin_users
+              .split("\n")
+              .join(",")
+              .toLowerCase()
+              .trim(),
             workers_count: this.workers_count.toString(),
             auxiliary_account: this.isAuxiliaryAccountEnabled,
           },

diff --git a/ui/yarn.lock b/ui/yarn.lock
@@ -1012,10 +1012,10 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nethserver/ns8-ui-lib@^0.1.27":
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/@nethserver/ns8-ui-lib/-/ns8-ui-lib-0.1.27.tgz#3f699eff00588bd85cdf06af211def1bbea14601"
-  integrity sha512-tehnvePx10EezXe20u+UpOKjBnUmGwAIk5sXJ+vXg+b7L1knpnvOEadyyPRgpYGkGWeT/a1on5qzKRKDyBvRtw==
+"@nethserver/ns8-ui-lib@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.npmmirror.com/@nethserver/ns8-ui-lib/-/ns8-ui-lib-1.1.4.tgz#6e8a47356c43773527c2d410e907c3dbe41326e2"
+  integrity sha512-z5lpixFPFlhBejMIYOFG6+YS74wcoppg1bat3WM1HTVo5gmpE3GVMOOIz+A2ThO9S/4ecWs6LG/GT/syQI2k5A==
   dependencies:
     "@rollup/plugin-json" "^4.1.0"
     core-js "^3.15.2"