Merge remote-tracking branch 'upstream/io' into oscar

2024-12-31 18:17:43 +09:00 · 2024-12-31 18:17:43 +09:00 · 836df3bf0c
commit 836df3bf0c
parent b2688bb33e b5a796ffd1
10 changed files with 12 additions and 12 deletions
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@ -506,7 +506,7 @@ async function assignRole() {
 	const { canceled: canceled3, result: memo } = await os.inputText({
 		title: i18n.ts.addMemo,
 		type: 'textarea',
-		placeholder: i18n.ts.memo,
+		default: '',
 	});
 	if (canceled3) return;

--- a/packages/frontend/src/pages/admin/roles.role.vue
+++ b/packages/frontend/src/pages/admin/roles.role.vue
@ -146,7 +146,7 @@ async function assign() {
 	const { canceled: canceled3, result: memo } = await os.inputText({
 		title: i18n.ts.addMemo,
 		type: 'textarea',
-		placeholder: i18n.ts.memo,
+		default: '',
 	});
 	if (canceled3) return;

--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@ -454,7 +454,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	defaultWithReplies: {
 		where: 'account',
-		default: false,
+		default: true,
 	},
 	disableStreamingTimeline: {
 		where: 'device',