Skip to content

Commit eea66ab

Browse files
committed
Merge remote-tracking branch 'misskey-dev/develop' into develop
# Conflicts: # package.json # packages/frontend/package.json # packages/frontend/src/pages/about.emojis.vue # packages/frontend/src/pages/admin/roles.editor.vue
2 parents 1af4784 + 8a85ee1 commit eea66ab

238 files changed

Lines changed: 8043 additions & 8470 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"editorconfig.editorconfig",
2020
"dbaeumer.vscode-eslint",
2121
"Vue.volar",
22-
"Orta.vscode-jest",
2322
"dbaeumer.vscode-eslint",
2423
"mrmlnc.vscode-json5"
2524
]

.github/dependabot.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ updates:
3434
patterns:
3535
- "storybook*"
3636
- "@storybook/*"
37-
swc-core:
38-
patterns:
39-
- "@swc/core*"
4037
typescript-eslint:
4138
patterns:
4239
- "@typescript-eslint/*"

.github/workflows/on-release-created.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
cache: 'pnpm'
2929
# see https://docs.github.com/actions/use-cases-and-examples/publishing-packages/publishing-nodejs-packages#publishing-packages-to-the-npm-registry
3030
registry-url: 'https://registry.npmjs.org'
31+
# Ensure npm 11.5.1 or later is installed
32+
- name: Update npm
33+
run: npm install -g npm@latest
3134
- name: Publish package
3235
run: |
3336
pnpm i --frozen-lockfile

CHANGELOG.md

Lines changed: 109 additions & 81 deletions
Large diffs are not rendered by default.

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/
102102
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
103103
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
104104
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
105-
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/src-js ./packages/backend/src-js
106105
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/i18n/built ./packages/i18n/built
107106
COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
108107
COPY --chown=misskey:misskey . ./

cypress/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
3-
"lib": ["dom", "es5"],
4-
"target": "es5",
3+
"lib": ["dom"],
4+
"target": "esnext",
55
"types": ["cypress", "node"]
66
},
77
"include": ["./**/*.ts"]

locales/ca-ES.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,8 +1073,8 @@ thisPostMayBeAnnoying: "Aquesta nota pot ser molesta per algú."
10731073
thisPostMayBeAnnoyingHome: "Publicar a la línia de temps d'Inici"
10741074
thisPostMayBeAnnoyingCancel: "Cancel·lar "
10751075
thisPostMayBeAnnoyingIgnore: "Publicar de totes maneres"
1076-
collapseRenotes: "Col·lapsar les renotes que ja has vist"
1077-
collapseRenotesDescription: "Col·lapse les notes a les quals ja has reaccionat o que ja has renotat"
1076+
collapseRenotes: "Col·lapsar els impulsos que ja has vist"
1077+
collapseRenotesDescription: "Col·lapse les notes a les quals ja has reaccionat o que ja has impulsat."
10781078
internalServerError: "Error intern del servidor"
10791079
internalServerErrorDescription: "El servidor ha fallat de manera inexplicable."
10801080
copyErrorInfo: "Copiar la informació de l'error "
@@ -1408,6 +1408,7 @@ frame: "Marc"
14081408
presets: "Predefinit"
14091409
zeroPadding: "Sense omplir"
14101410
nothingToConfigure: "No hi ha res a configurar"
1411+
viewRenotedChannel: "Mirar el canal d'impulsos "
14111412
_imageEditing:
14121413
_vars:
14131414
caption: "Títol de l'arxiu"
@@ -1687,7 +1688,7 @@ _initialTutorial:
16871688
description: "Pots limitar qui pot veure les teves notes."
16881689
public: "La teva nota serà visible per a tots els usuaris."
16891690
home: "Publicar només a línia de temps d'Inici. La gent que visiti el teu perfil o mitjançant les remotes també la podran veure."
1690-
followers: "Només visible per a seguidors. Només els teus seguidors la podran veure i ningú més. Ningú més podrà fer renotes."
1691+
followers: "Només visible per a seguidors. Només els teus seguidors la podran veure i ningú més. Ningú més podrà fer impulsos."
16911692
direct: "Només visible per a alguns seguidors, el destinatari rebre una notificació. Es pot fer servir com una alternativa als missatges directes."
16921693
doNotSendConfidencialOnDirect1: "Tingues cura quan enviïs informació sensible."
16931694
doNotSendConfidencialOnDirect2: "Els administradors del servidor poden veure tot el que escrius. Ves compte quan enviïs informació sensible en enviar notes directes a altres usuaris en servidors de poca confiança."

locales/es-ES.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3312,7 +3312,7 @@ _clientPerformanceIssueTip:
33123312
_clip:
33133313
tip: "Clip es una función que permite organizar varias notas."
33143314
_userLists:
3315-
tip: "Las listas pueden contener cualquier usuario que especifiques al crearlas, la lista creada puede mostrarse entonces como una línea de tiempo mostrando solo los usuarios especificados."
3315+
tip: "Puedes crear listas que incluyan a cualquier usuario. Las listas creadas se pueden visualizar en forma de cronología."
33163316
watermark: "Marca de Agua"
33173317
defaultPreset: "Por defecto"
33183318
_watermarkEditor:

locales/it-IT.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
_lang_: "Italiano"
33
headlineMisskey: "Rete collegata tramite Note"
4-
introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \n\n📡 Puoi pubblicare «Note» per condividere ciò che sta succedendo o per dire a tutti qualcosa su di te. \n\n👍 Puoi reagire inviando emoji rapidi alle «Note» provenienti da altri profili nel Fediverso.\n\n🚀 Esplora un nuovo mondo insieme a noi!"
4+
introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \n📡 Puoi pubblicare «Note» per condividere ciò che sta succedendo o per dire a tutti qualcosa su di te. \n👍 Puoi reagire inviando emoji rapidi alle «Note» provenienti da altri profili nel Fediverso.\n🚀 Esplora un nuovo mondo insieme a noi!"
55
poweredByMisskeyDescription: "{name} è uno dei servizi (chiamati istanze) che utilizzano la piattaforma open source <b>Misskey</b>."
66
monthAndDay: "{day}/{month}"
77
search: "Cerca"
@@ -1408,6 +1408,7 @@ frame: "Cornice"
14081408
presets: "Preimpostato"
14091409
zeroPadding: "Al vivo"
14101410
nothingToConfigure: "Niente da configurare"
1411+
viewRenotedChannel: "Visualizza il canale del Rinota"
14111412
_imageEditing:
14121413
_vars:
14131414
caption: "Didascalia dell'immagine"
@@ -3338,7 +3339,7 @@ _watermarkEditor:
33383339
stripeWidth: "Larghezza della linea"
33393340
stripeFrequency: "Il numero di linee"
33403341
polkadot: "A pallini"
3341-
checker: "revisore"
3342+
checker: "Scacchiera"
33423343
polkadotMainDotOpacity: "Opacità del punto principale"
33433344
polkadotMainDotRadius: "Dimensione del punto principale"
33443345
polkadotSubDotOpacity: "Opacità del punto secondario"
@@ -3367,7 +3368,7 @@ _imageEffector:
33673368
zoomLines: "Linea di saturazione"
33683369
stripe: "Strisce"
33693370
polkadot: "A pallini"
3370-
checker: "revisore"
3371+
checker: "Scacchiera"
33713372
blockNoise: "Attenua rumore"
33723373
tearing: "Strappa immagine"
33733374
fill: "Riempimento"

locales/ja-JP.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1457,6 +1457,7 @@ frame: "フレーム"
14571457
presets: "プリセット"
14581458
zeroPadding: "ゼロ埋め"
14591459
nothingToConfigure: "設定項目はありません"
1460+
viewRenotedChannel: "リノート先のチャンネルを見る"
14601461

14611462
_imageEditing:
14621463
_vars:

0 commit comments

Comments
 (0)