merge: upstream

This commit is contained in:
Marie 2024-01-09 02:57:57 +01:00
commit 7552cea69a
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
413 changed files with 5517 additions and 2309 deletions

View file

@ -80,9 +80,11 @@ import MkSwitch from '@/components/MkSwitch.vue';
import FormSection from '@/components/form/section.vue';
import MkFolder from '@/components/MkFolder.vue';
import * as os from '@/os.js';
import { $i } from '@/account.js';
import { signinRequired } from '@/account.js';
import { i18n } from '@/i18n.js';
const $i = signinRequired();
// : meUpdatedrefreshAccount
withDefaults(defineProps<{
@ -91,7 +93,7 @@ withDefaults(defineProps<{
first: false,
});
const usePasswordLessLogin = computed(() => $i?.usePasswordLessLogin ?? false);
const usePasswordLessLogin = computed(() => $i.usePasswordLessLogin ?? false);
async function registerTOTP(): Promise<void> {
const auth = await os.authenticateDialog();