Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts:
#	package.json
#	packages/frontend/src/components/MkFoldableSection.vue
#	packages/frontend/src/components/MkPostForm.vue
This commit is contained in:
mattyatea 2024-02-03 21:13:22 +09:00
commit 7579df2da0
48 changed files with 607 additions and 292 deletions

View file

@ -45,7 +45,7 @@ async function init() {
}
function chooseProxyAccount() {
os.selectUser().then(user => {
os.selectUser({ localOnly: true }).then(user => {
proxyAccount.value = user;
proxyAccountId.value = user.id;
save();

View file

@ -116,9 +116,7 @@ async function del() {
}
async function assign() {
const user = await os.selectUser({
includeSelf: true,
});
const user = await os.selectUser({ includeSelf: true });
const { canceled: canceled2, result: period } = await os.select({
title: i18n.ts.period,

View file

@ -90,7 +90,7 @@ const pagination = {
};
function searchUser() {
os.selectUser().then(user => {
os.selectUser({ includeSelf: true }).then(user => {
show(user);
});
}