Merge branch 'develop' into enh-15738
This commit is contained in:
commit
7b72e2d6d3
|
@ -11,14 +11,15 @@ on:
|
|||
# Storybook CI is checked on the "push" event of "develop" branch so it would cause a duplicate build.
|
||||
# This is a waste of chromatic build quota, so we don't run storybook CI on pull requests targets master.
|
||||
- master
|
||||
# Neither Dependabot nor Renovate will change the actual behavior for components.
|
||||
- 'dependabot/**'
|
||||
- 'renovate/**'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
# chromatic is not likely to be available for fork repositories, so we disable for fork repositories.
|
||||
if: github.repository == 'misskey-dev/misskey'
|
||||
# Chromatic is not likely to be available for fork repositories, so we disable for fork repositories.
|
||||
# Neither Dependabot nor Renovate will change the actual behavior for components.
|
||||
if: >-
|
||||
github.repository == 'misskey-dev/misskey' &&
|
||||
startsWith(github.ref, 'refs/heads/dependabot/') != true &&
|
||||
startsWith(github.ref, 'refs/heads/renovate/') != true
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
env:
|
||||
|
|
|
@ -5382,6 +5382,10 @@ export interface Locale extends ILocale {
|
|||
* 埋め込み
|
||||
*/
|
||||
"embed": string;
|
||||
/**
|
||||
* 設定を移行しています。しばらくお待ちください... (後ほど、設定→その他→旧設定情報を移行 で手動で移行することもできます)
|
||||
*/
|
||||
"settingsMigrating": string;
|
||||
/**
|
||||
* 読み取り専用
|
||||
*/
|
||||
|
|
|
@ -1341,6 +1341,7 @@ right: "右"
|
|||
bottom: "下"
|
||||
top: "上"
|
||||
embed: "埋め込み"
|
||||
settingsMigrating: "設定を移行しています。しばらくお待ちください... (後ほど、設定→その他→旧設定情報を移行 で手動で移行することもできます)"
|
||||
readonly: "読み取り専用"
|
||||
|
||||
_chat:
|
||||
|
|
|
@ -28,6 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
[$style.t_exportCompleted]: notification.type === 'exportCompleted',
|
||||
[$style.t_login]: notification.type === 'login',
|
||||
[$style.t_createToken]: notification.type === 'createToken',
|
||||
[$style.t_chatRoomInvitationReceived]: notification.type === 'chatRoomInvitationReceived',
|
||||
[$style.t_roleAssigned]: notification.type === 'roleAssigned' && notification.role.iconUrl == null,
|
||||
}]"
|
||||
>
|
||||
|
@ -374,6 +375,12 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
|
|||
pointer-events: none;
|
||||
}
|
||||
|
||||
.t_chatRoomInvitationReceived {
|
||||
padding: 3px;
|
||||
background: var(--eventOther);
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.tail {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
|
|
|
@ -22,7 +22,7 @@ const modal = useTemplateRef('modal');
|
|||
const props = defineProps<{
|
||||
success: boolean;
|
||||
showing: boolean;
|
||||
text?: string;
|
||||
text?: string | null;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
|
|
|
@ -547,12 +547,13 @@ export function success(): Promise<void> {
|
|||
});
|
||||
}
|
||||
|
||||
export function waiting(): Promise<void> {
|
||||
export function waiting(text?: string | null): Promise<void> {
|
||||
return new Promise(resolve => {
|
||||
const showing = ref(true);
|
||||
const { dispose } = popup(MkWaitingDialog, {
|
||||
success: false,
|
||||
showing: showing,
|
||||
text,
|
||||
}, {
|
||||
done: () => resolve(),
|
||||
closed: () => dispose(),
|
||||
|
|
|
@ -185,7 +185,6 @@ async function deleteAccount() {
|
|||
}
|
||||
|
||||
function migrate() {
|
||||
os.waiting();
|
||||
migrateOldSettings();
|
||||
}
|
||||
|
||||
|
|
|
@ -10,14 +10,19 @@ import { prefer } from '@/preferences.js';
|
|||
import { misskeyApi } from '@/utility/misskey-api.js';
|
||||
import { deckStore } from '@/ui/deck/deck-store.js';
|
||||
import { unisonReload } from '@/utility/unison-reload.js';
|
||||
import * as os from '@/os.js';
|
||||
import { i18n } from '@/i18n.js';
|
||||
|
||||
// TODO: そのうち消す
|
||||
export function migrateOldSettings() {
|
||||
os.waiting(i18n.ts.settingsMigrating);
|
||||
|
||||
store.loaded.then(async () => {
|
||||
const themes = await misskeyApi('i/registry/get', { scope: ['client'], key: 'themes' }).catch(() => []);
|
||||
if (themes.length > 0) {
|
||||
prefer.commit('themes', themes);
|
||||
}
|
||||
misskeyApi('i/registry/get', { scope: ['client'], key: 'themes' }).catch(() => []).then((themes: any) => {
|
||||
if (themes.length > 0) {
|
||||
prefer.commit('themes', themes);
|
||||
}
|
||||
});
|
||||
|
||||
const plugins = ColdDeviceStorage.get('plugins');
|
||||
prefer.commit('plugins', plugins.map(p => ({
|
||||
|
@ -136,6 +141,6 @@ export function migrateOldSettings() {
|
|||
|
||||
window.setTimeout(() => {
|
||||
unisonReload();
|
||||
}, 5000);
|
||||
}, 10000);
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue