Merge remote-tracking branch 'origin/master' into doubles-ss_master

# Conflicts:
#	server/database.js

src/pages/Details.vue

@@ -2,6 +2,7 @@
     <transition name="slide-fade" appear>
         <div v-if="monitor">
             <h1> {{ monitor.name }}</h1>
+            <p v-if="monitor.description">{{ monitor.description }}</p>
             <div class="tags">
                 <Tag v-for="tag in monitor.tags" :key="tag.id" :item="tag" :size="'sm'" />
             </div>

src/pages/EditMonitor.vue

@@ -414,6 +414,12 @@
                                 </div>
                             </template>
 
+                            <!-- Description -->
+                            <div class="my-3">
+                                <label for="description" class="form-label">{{ $t("Description") }}</label>
+                                <input id="description" v-model="monitor.description" type="text" class="form-control">
+                            </div>
+
                             <div class="my-3">
                                 <tags-manager ref="tagsManager" :pre-selected-tags="monitor.tags"></tags-manager>
                             </div>
@@ -949,7 +955,16 @@ message HealthCheckResponse {
                             this.monitor.includeSensitiveData = undefined;
                             this.monitor.maintenance = undefined;
                             this.monitor.name = this.$t("cloneOf", [ this.monitor.name ]);
-                            this.monitor.tags = undefined; // FIXME: Cloning tags does not work yet
+                            this.$refs.tagsManager.newTags = this.monitor.tags.map((monitorTag) => {
+                                return {
+                                    id: monitorTag.tag_id,
+                                    name: monitorTag.name,
+                                    color: monitorTag.color,
+                                    value: monitorTag.value,
+                                    new: true,
+                                };
+                            });
+                            this.monitor.tags = undefined;
                         }
 
                         // Handling for monitors that are created before 1.7.0

src/pages/Settings.vue

@@ -107,6 +107,9 @@ export default {
                 security: {
                     title: this.$t("Security"),
                 },
+                "api-keys": {
+                    title: this.$t("API Keys")
+                },
                 proxies: {
                     title: this.$t("Proxies"),
                 },