merge: branch develop

This commit is contained in:
Mar0xy 2023-10-18 19:56:42 +02:00
commit cf6e720139
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
97 changed files with 1565 additions and 853 deletions

View file

@ -18,8 +18,15 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_panel" style="padding: 16px;">
<MkSwitch v-model="enableAchievements">
<template #label>Enable Achievements</template>
<template #caption>Turning this off will disable the achievement system</template>
<template #label>{{ i18n.ts.enableAchievements }}</template>
<template #caption>{{ i18n.ts.turnOffAchievements}}</template>
</MkSwitch>
</div>
<div class="_panel" style="padding: 16px;">
<MkSwitch v-model="enableBotTrending">
<template #label>{{ i18n.ts.enableBotTrending }}</template>
<template #caption>{{ i18n.ts.turnOffBotTrending }}</template>
</MkSwitch>
</div>
@ -61,6 +68,7 @@ import MkSwitch from '@/components/MkSwitch.vue';
let enableServerMachineStats: boolean = $ref(false);
let enableAchievements: boolean = $ref(false);
let enableBotTrending: boolean = $ref(false);
let enableIdenticonGeneration: boolean = $ref(false);
let enableChartsForRemoteUser: boolean = $ref(false);
let enableChartsForFederatedInstances: boolean = $ref(false);
@ -69,6 +77,7 @@ async function init() {
const meta = await os.api('admin/meta');
enableServerMachineStats = meta.enableServerMachineStats;
enableAchievements = meta.enableAchievements;
enableBotTrending = meta.enableBotTrending;
enableIdenticonGeneration = meta.enableIdenticonGeneration;
enableChartsForRemoteUser = meta.enableChartsForRemoteUser;
enableChartsForFederatedInstances = meta.enableChartsForFederatedInstances;
@ -78,6 +87,7 @@ function save() {
os.apiWithDialog('admin/update-meta', {
enableServerMachineStats,
enableAchievements,
enableBotTrending,
enableIdenticonGeneration,
enableChartsForRemoteUser,
enableChartsForFederatedInstances,