mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-06-25 17:10:43 +00:00
Merge branch 'develop' into room
This commit is contained in:
commit
92bc50cb90
6 changed files with 16 additions and 4 deletions
|
|
@ -10,6 +10,12 @@
|
|||
-
|
||||
|
||||
|
||||
## 2026.5.3
|
||||
|
||||
### General
|
||||
- Fix: Dockerで起動に失敗する問題を修正
|
||||
|
||||
|
||||
## 2026.5.2
|
||||
|
||||
### Note
|
||||
|
|
|
|||
|
|
@ -74,6 +74,8 @@ FROM --platform=$TARGETPLATFORM node:${NODE_VERSION}-slim AS runner
|
|||
ARG UID="991"
|
||||
ARG GID="991"
|
||||
|
||||
ENV PNPM_CONFIG_VERIFY_DEPS_BEFORE_RUN=false
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
ffmpeg tini curl libjemalloc-dev libjemalloc2 \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "misskey",
|
||||
"version": "2026.5.2",
|
||||
"version": "2026.5.3",
|
||||
"codename": "nasubi",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ export class LocaleInliner {
|
|||
|
||||
collectsModifications() {
|
||||
for (const chunk of this.chunks) {
|
||||
if (!chunk.sourceCode) {
|
||||
if (chunk.sourceCode == null) {
|
||||
throw new Error(`Source code for ${chunk.fileName} is not loaded.`);
|
||||
}
|
||||
const fileLogger = this.logger.prefixed(`${chunk.fileName} (${chunk.chunkName}): `);
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
<script lang="ts" setup>
|
||||
import { nextTick, onBeforeUnmount, ref, useTemplateRef, computed } from 'vue';
|
||||
import { host, version } from '@@/js/config.js';
|
||||
import { DEFAULT_EMOJIS } from '@@/js/const.js';
|
||||
import FormLink from '@/components/form/link.vue';
|
||||
import FormSection from '@/components/form/section.vue';
|
||||
import MkButton from '@/components/MkButton.vue';
|
||||
|
|
@ -150,7 +151,6 @@ import { definePage } from '@/page.js';
|
|||
import { claimAchievement, claimedAchievements } from '@/utility/achievements.js';
|
||||
import { $i } from '@/i.js';
|
||||
import { prefer } from '@/preferences.js';
|
||||
import { DEFAULT_EMOJIS } from '@@/js/const.js';
|
||||
|
||||
const patronsWithIcon = [{
|
||||
name: 'カイヤン',
|
||||
|
|
@ -299,6 +299,9 @@ const patronsWithIcon = [{
|
|||
}, {
|
||||
name: '大賀愛一郎',
|
||||
icon: 'https://assets.misskey-hub.net/patrons/c701a797d1df4125970f25d3052250ac.jpg',
|
||||
}, {
|
||||
name: '西野マチ',
|
||||
icon: 'https://assets.misskey-hub.net/patrons/962ff1d2f3d040ed8973b62bbff84391.jpg',
|
||||
}];
|
||||
|
||||
const patrons = [
|
||||
|
|
@ -414,6 +417,7 @@ const patrons = [
|
|||
'ほとラズ',
|
||||
'スズカケン',
|
||||
'蒼井よみこ',
|
||||
'忍猫',
|
||||
];
|
||||
|
||||
const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"type": "module",
|
||||
"name": "misskey-js",
|
||||
"version": "2026.5.2",
|
||||
"version": "2026.5.3",
|
||||
"description": "Misskey SDK for JavaScript",
|
||||
"license": "MIT",
|
||||
"main": "./built/index.js",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue