Skip to content

Commit

Permalink
Merge tag '2023.9.1' into merge-upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
riku6460 committed Sep 26, 2023
2 parents 1e31473 + e57b536 commit 3a57fb2
Show file tree
Hide file tree
Showing 39 changed files with 326 additions and 107 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api-misskey-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.0

- run: corepack enable

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_copyright_year.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
check_copyright_year:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
- run: |
if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
echo "Please change copyright year!"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: github.repository == 'misskey-dev/misskey'
steps:
- name: Check out the repo
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
env:
DOCKER_CONTENT_TRUST: 1
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
- run: |
curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb"
sudo dpkg -i dockle.deb
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
pnpm_install:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
with:
fetch-depth: 0
submodules: true
Expand All @@ -38,7 +38,7 @@ jobs:
- sw
- misskey-js
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
with:
fetch-depth: 0
submodules: true
Expand All @@ -64,7 +64,7 @@ jobs:
- backend
- misskey-js
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
with:
fetch-depth: 0
submodules: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-preview-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
# Check out merge commit
- name: Fork based /deploy checkout
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.0
with:
ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- 56312:6379

steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
with:
submodules: true
- name: Install pnpm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
node-version: [18.x]

steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
with:
submodules: true
- name: Install pnpm
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
- 56312:6379

steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
with:
submodules: true
# https://github.com/cypress-io/cypress-docker-images/issues/150
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-misskey-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.0

- run: corepack enable

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
node-version: [18.x]

steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
with:
submodules: true
- name: Install pnpm
Expand Down
16 changes: 14 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,19 @@
-->

## 2023.9.0 (unreleased)
## 2023.9.1

### General
- Enhance: モデレーションログ機能の強化

### Client
- Fix: ノートのメニューにある「詳細」ボタンの表示がログイン/ログアウト状態で統一されていない問題を修正

### Server
- Fix: お知らせのページネーションが機能しない
- Fix: 「ユーザーの新規投稿」の通知設定を切り替えるとサーバー内部エラーが出る

## 2023.9.0

### Note
- meilisearchを使用する場合、v1.2以上が必要です
Expand Down Expand Up @@ -98,6 +110,7 @@
- Enhance: 自分へのメンション一覧を取得する際のパフォーマンスを向上
- Enhance: Docker環境でjemallocを使用することでメモリ使用量を削減
- Enhance: ID生成方式としてaidxを追加、かつデフォルトに
- Enhance: Add address bind config option (outgoingAddress)
- Fix: MK_ONLY_SERVERオプションを指定した際にクラッシュする問題を修正
- Fix: notes/reactionsのページネーションが機能しない問題を修正
- Fix: ノート検索 `notes/search` にてhostを指定した際に検索結果に反映されるように
Expand All @@ -120,7 +133,6 @@
### Server
- Fix: APIのオフセットが壊れていたせいで「もっと見る」でもっと見れない問題を修正
- Fix: 外部サーバーの投稿がタイムラインに表示されないことがある問題を修正
- Enhance: Add address bind config option (outgoingAddress)

## 13.14.1

Expand Down
2 changes: 1 addition & 1 deletion locales/de-DE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2101,9 +2101,9 @@ _webhookSettings:
reaction: "Wenn du eine Reaktion erhältst"
mention: "Wenn du erwähnt wirst"
_moderationLogTypes:
updateRole: "Rolle aktualisiert"
assignRole: "Zu Rolle zugewiesen"
unassignRole: "Aus Rolle entfernt"
updateRole: "Rolle aktualisiert"
suspend: "Gesperrt"
unsuspend: "Entsperrt"
addCustomEmoji: "Benutzerdefiniertes Emoji hinzugefügt"
Expand Down
2 changes: 1 addition & 1 deletion locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2107,9 +2107,9 @@ _webhookSettings:
reaction: "When receiving a reaction"
mention: "When being mentioned"
_moderationLogTypes:
updateRole: "Role updated"
assignRole: "Assigned to role"
unassignRole: "Removed from role"
updateRole: "Role updated"
suspend: "Suspended"
unsuspend: "Unsuspended"
addCustomEmoji: "Custom emoji added"
Expand Down
6 changes: 5 additions & 1 deletion locales/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,7 @@ export interface Locale {
"unnotifyNotes": string;
"authentication": string;
"authenticationRequiredToContinue": string;
"dateAndTime": string;
"_announcement": {
"forExistingUsers": string;
"forExistingUsersDescription": string;
Expand Down Expand Up @@ -2276,9 +2277,11 @@ export interface Locale {
"resolver": string;
};
"_moderationLogTypes": {
"createRole": string;
"deleteRole": string;
"updateRole": string;
"assignRole": string;
"unassignRole": string;
"updateRole": string;
"suspend": string;
"unsuspend": string;
"addCustomEmoji": string;
Expand All @@ -2299,6 +2302,7 @@ export interface Locale {
"unsuspendRemoteInstance": string;
"markSensitiveDriveFile": string;
"unmarkSensitiveDriveFile": string;
"resolveAbuseReport": string;
};
}
declare const locales: {
Expand Down
38 changes: 23 additions & 15 deletions locales/it-IT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2031,7 +2031,7 @@ _notification:
_types:
all: "Tutto"
note: "Nuove Note"
follow: "Novità follower"
follow: "Nuovi profili follower"
mention: "Menzioni"
reply: "Risposte"
renote: "Rinota"
Expand Down Expand Up @@ -2101,18 +2101,26 @@ _webhookSettings:
reaction: "Quando ricevo una reazione"
mention: "Quando mi menzionano"
_moderationLogTypes:
assignRole: "Assegna un ruolo"
unassignRole: "Disassegna un ruolo"
updateRole: "Aggiorna un ruolo"
updateRole: "Ruolo aggiornato"
assignRole: "Ruolo assegnato"
unassignRole: "Ruolo disassegnato"
suspend: "Sospensione"
unsuspend: "Toglie la sospensione"
addCustomEmoji: "Aggiunge una emoji personalizzata"
updateServerSettings: "Aggiorna le impostazioni del server"
updateUserNote: "Aggiorna il promemoria di moderazione"
deleteDriveFile: "Elimina file da Drive"
deleteNote: "Elimina la Nota"
createGlobalAnnouncement: "Crea un annuncio globale"
createUserAnnouncement: "Crea un annuncio ai profili iscritti"
resetPassword: "Ripristina la password"
suspendRemoteInstance: "Sospendi istanza remota"
unsuspendRemoteInstance: "Riattiva istanza remota"
unsuspend: "Sospensione rimossa"
addCustomEmoji: "Emoji personalizzata aggiunta"
updateCustomEmoji: "Emoji personalizzata aggiornata"
deleteCustomEmoji: "Emoji personalizzata eliminata"
updateServerSettings: "Impostazioni del server aggiornate"
updateUserNote: "Promemoria di moderazione aggiornato"
deleteDriveFile: "File da Drive eliminato"
deleteNote: "Nota eliminata"
createGlobalAnnouncement: "Annuncio globale creato"
createUserAnnouncement: "Annuncio ai profili iscritti creato"
updateGlobalAnnouncement: "Annuncio globale aggiornato"
updateUserAnnouncement: "Annuncio ai profili iscritti aggiornato"
deleteGlobalAnnouncement: "Annuncio globale eliminato"
deleteUserAnnouncement: "Annuncio ai profili iscritti eliminato"
resetPassword: "Password azzerata"
suspendRemoteInstance: "Istanza remota sospesa"
unsuspendRemoteInstance: "Istanza remota riattivata"
markSensitiveDriveFile: "File nel Drive segnato come esplicito"
unmarkSensitiveDriveFile: "File nel Drive segnato come non esplicito"
6 changes: 5 additions & 1 deletion locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1123,6 +1123,7 @@ notifyNotes: "投稿を通知"
unnotifyNotes: "投稿の通知を解除"
authentication: "認証"
authenticationRequiredToContinue: "続けるには認証を行ってください"
dateAndTime: "日時"

_announcement:
forExistingUsers: "既存ユーザーのみ"
Expand Down Expand Up @@ -2188,9 +2189,11 @@ _abuse:
resolver: "リソルバー"

_moderationLogTypes:
createRole: "ロールを作成"
deleteRole: "ロールを削除"
updateRole: "ロールを更新"
assignRole: "ロールへアサイン"
unassignRole: "ロールのアサイン解除"
updateRole: "ロール設定更新"
suspend: "凍結"
unsuspend: "凍結解除"
addCustomEmoji: "カスタム絵文字追加"
Expand All @@ -2211,3 +2214,4 @@ _moderationLogTypes:
unsuspendRemoteInstance: "リモートサーバーを再開"
markSensitiveDriveFile: "ファイルをセンシティブ付与"
unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
resolveAbuseReport: "通報を解決"
2 changes: 1 addition & 1 deletion locales/zh-CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2101,9 +2101,9 @@ _webhookSettings:
reaction: "被回应时"
mention: "被提及时"
_moderationLogTypes:
updateRole: "更新角色"
assignRole: "分配角色"
unassignRole: "取消分配角色"
updateRole: "更新角色"
suspend: "冻结"
unsuspend: "解除冻结"
addCustomEmoji: "添加自定义表情符号"
Expand Down
Loading

0 comments on commit 3a57fb2

Please sign in to comment.