mattyatea
|
833031ee60
|
Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
# packages/backend/src/core/QueueModule.ts
# packages/backend/src/core/QueueService.ts
# packages/backend/src/core/chart/charts/federation.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/backend/src/queue/types.ts
# packages/backend/src/server/api/EndpointsModule.ts
# packages/backend/src/server/api/endpoints.ts
# packages/backend/src/server/api/endpoints/admin/queue/stats.ts
# packages/backend/src/server/api/endpoints/users/report-abuse.ts
# packages/backend/src/server/web/ClientServerService.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkChannelFollowButton.vue
# packages/frontend/src/components/MkClickerGame.vue
# packages/frontend/src/components/MkSwitch.vue
|
2024-06-12 14:14:45 +09:00 |
おさむのひと
|
61fae45390
|
feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする (#13758)
* feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする
* モデログに対応&エンドポイントを単一オブジェクトでのサポートに変更(API経由で大量に作るシチュエーションもないと思うので)
* fix spdx
* fix migration
* fix migration
* fix models
* add e2e webhook
* tweak
* fix modlog
* fix bugs
* add tests and fix bugs
* add tests and fix bugs
* add tests
* fix path
* regenerate locale
* 混入除去
* 混入除去
* add abuseReportResolved
* fix pnpm-lock.yaml
* add abuseReportResolved test
* fix bugs
* fix ui
* add tests
* fix CHANGELOG.md
* add tests
* add RoleService.getModeratorIds tests
* WebhookServiceをUserとSystemに分割
* fix CHANGELOG.md
* fix test
* insertOneを使う用に
* fix
* regenerate locales
* revert version
* separate webhook job queue
* fix
* 🎨
* Update QueueProcessorService.ts
---------
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
|
2024-06-08 15:34:19 +09:00 |
mattyatea
|
e86e8f6aa6
|
Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
# README.md
# packages/backend/src/core/entities/AbuseUserReportEntityService.ts
# packages/frontend/src/pages/admin/moderation.vue
|
2024-05-31 21:18:45 +09:00 |
syuilo
|
030082f756
|
🎨
|
2024-05-31 19:35:27 +09:00 |
syuilo
|
0082747237
|
New Crowdin updates (#13892)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
|
2024-05-31 13:19:37 +09:00 |
syuilo
|
be11fd7508
|
enhance: サーバーのお問い合わせ先URLを設定できるように
|
2024-05-31 10:12:23 +09:00 |
mattyatea
|
07b4338eff
|
Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
# packages/frontend/src/cache.ts
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
|
2024-05-29 01:21:44 +09:00 |
anatawa12
|
4579be0f54
|
新着ノートをサウンドで通知する機能をdeck UIに追加 (#13867)
* feat(deck-ui): implement note notification
* chore: remove notify in antenna
* docs(changelog): 新着ノートをサウンドで通知する機能をdeck UIに追加
* fix: type error in test
* lint: key order
* fix: remove notify column
* test: remove test for notify
* chore: make sound selectable
* fix: add license header
* fix: add license header again
* Unnecessary await
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
* ファイルを選択してください -> ファイルが選択されていません
* fix: i18n忘れ
* fix: i18n忘れ
* pleaseSelectFile > fileNotSelected
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
|
2024-05-27 20:54:53 +09:00 |
syuilo
|
d7982e471c
|
New Crowdin updates (#13860)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Norwegian)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Danish)
* New translations ja-jp.yml (Chinese Simplified)
|
2024-05-27 20:24:15 +09:00 |
かっこかり
|
1b81ca4563
|
enhance(frontend): 「見たことのあるリノートを省略して表示」の名称を変更 (#13883)
* enhance(frontend): 「見たことのあるリノートを省略して表示」の名称を変更
* ひとつだけcaptionが入ってるやつが真ん中にいると不格好だったので場所変更
|
2024-05-27 17:16:47 +09:00 |
mattyatea
|
6445591350
|
Merge remote-tracking branch 'refs/remotes/github-prismisskey/develop' into develop
# Conflicts:
# locales/index.d.ts
# packages/frontend/src/components/MkPostForm.vue
# pnpm-lock.yaml
|
2024-05-25 01:18:55 +09:00 |
かっこかり
|
e0b47999fa
|
fix(backend): `read:admin:show-user` と `read:admin:show-users` を統合 (#13798)
* fix(frontend): 同じdisplayNameの権限があるのを修正
* read:admin:show-user と read:admin:show-users を統合
* Update Changelog
|
2024-05-23 17:29:59 +09:00 |
anatawa12
|
83a9aa4533
|
feat: suspend instance improvements (#13861)
* feat(backend): dead instance detection
* feat(backend): suspend type detection
* feat(frontend): show suspend reason on frontend
* feat(backend): resume federation automatically if the server is automatically suspended
* docs(changelog): 配信停止まわりの改善
* lint: fix lint errors
* Update packages/frontend/src/pages/instance-info.vue
* lint: fix lint error
* chore: suspendedState => suspensionState
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
|
2024-05-23 15:55:47 +09:00 |
anatawa12
|
aafa669cf5
|
feat(frontend): 長いテキストをペーストした際にテキストファイルとして添付するかどうかを選択できるように (#13862)
* feat(frontend): ask if attach as file if clipboard text is very long
* docs(changelog): 長いテキストをペーストした際にテキストファイルとして添付するかどうかを選択できるように
|
2024-05-23 13:15:22 +09:00 |
syuilo
|
ed432d06d7
|
New Crowdin updates (#13850)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Simplified)
|
2024-05-22 06:40:05 +09:00 |
Sayamame-beans
|
c69de6b48c
|
fix(l10n): fix wrong description of server silence (#13857)
|
2024-05-21 20:43:00 +09:00 |
かっこかり
|
6a637db36b
|
enhance(frontend): 通常のノートでも、お気に入りに登録したチャンネルにリノートできるように (#13855)
* enhance(frontend): チャンネルにリノートできるように
* Update Changelog
|
2024-05-21 17:23:20 +09:00 |
syuilo
|
3fba7686f8
|
New Crowdin updates (#13500)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Danish)
* New translations ja-jp.yml (Greek)
* New translations ja-jp.yml (Hungarian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Norwegian)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Croatian)
* New translations ja-jp.yml (Uyghur)
* New translations ja-jp.yml (Lojban)
* New translations ja-jp.yml (Sinhala)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Kannada)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Haitian Creole)
* New translations ja-jp.yml (Kabyle)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Sinhala)
* New translations ja-jp.yml (Sinhala)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Vietnamese)
|
2024-05-21 10:14:58 +09:00 |
Acid Chicken (硫酸鶏)
|
1d4e6393f3
|
ci: verify locale data (#13849)
* ci: verify locale data
* ci: separate workflows
* ci: missing installation
|
2024-05-21 10:10:59 +09:00 |
mattyatea
|
782ff23e9c
|
update
|
2024-05-18 01:14:00 +09:00 |
mattyatea
|
3f04b5bf8f
|
update
|
2024-05-17 23:34:14 +09:00 |
mattyatea
|
be31cedd98
|
update
|
2024-05-17 23:14:11 +09:00 |
yukineko
|
9ee4c3d0a8
|
add: 翻訳を追加
|
2024-05-17 22:14:23 +09:00 |
mattyatea
|
509181a6d0
|
update
|
2024-05-16 01:08:01 +09:00 |
mattyatea
|
07070305c0
|
Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkPostFormDialog.vue
# pnpm-lock.yaml
|
2024-05-04 23:23:16 +09:00 |
syuilo
|
ef630df443
|
enhance(frontend): add contact page
|
2024-05-01 14:12:36 +09:00 |
mattyatea
|
41e735906a
|
Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
# packages/frontend/src/components/MkFollowButton.vue
|
2024-04-24 03:50:09 +09:00 |
おさむのひと
|
cd7f7271ca
|
enhance: 新しいコンディショナルロール条件の実装 (#13732)
* enhance: 新しいコンディショナルロールの実装
* fix: CHANGELOG.md
|
2024-04-19 15:22:23 +09:00 |
かっこかり
|
977e2d2c09
|
enhance(frontend): フォローするかどうかの確認ダイアログを出せるように (#13723)
* feat(frontend): フォローするかどうかの確認ダイアログを出せるように
* Update Changelog
|
2024-04-17 10:53:16 +09:00 |
mattyatea
|
88122a3d9d
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# packages/frontend/src/components/MkPostForm.vue
|
2024-04-14 21:54:44 +09:00 |
かっこかり
|
bba3097765
|
enhance: クリップのノート数を表示するように (#13686)
* enhance: クリップのノート数を表示できるように
* Update Changelog
|
2024-04-14 21:30:24 +09:00 |
かっこかり
|
f5100cc81f
|
feat(frontend): アップロードするファイルの名前をランダム文字列にできるように (#13688)
* feat(frontend): アップロードするファイルの名前をランダム文字列にできるように
* Update Changelog
* refactor
* 設定項目を移動
* fix
* 「オリジナルのファイル名を保持」に変更
* 拡張子を付加するように
|
2024-04-13 12:51:37 +09:00 |
syuilo
|
eb1ef1484a
|
enhance(frontend): add link of 2fa guide
|
2024-04-09 20:52:29 +09:00 |
mattyatea
|
04fae906c9
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# packages/backend/src/models/Meta.ts
# packages/backend/src/server/api/endpoints/admin/meta.ts
# packages/backend/src/server/api/endpoints/admin/update-meta.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteDetailed.vue
# packages/frontend/src/components/MkSwitch.button.vue
# packages/frontend/src/pages/settings/general.vue
|
2024-04-01 15:32:52 +09:00 |
かっこかり
|
61978cb4ca
|
fix(frontend): ページデザインの修正 (#13642)
|
2024-03-31 14:16:42 +09:00 |
かっこかり
|
b96d9c6973
|
fix/enhance(frontend): 映像・音声周りの改修 (#13206)
* enhance(frontend): 映像・音声周りの改修
* fix
* fix design
* fix lint
* キーボードショートカットを整備
* Update Changelog
* fix
* feat: ループ再生
* ネイティブの動作と同期されるように
* Update Changelog
* key指定を消す
|
2024-03-30 16:02:03 +09:00 |
かっこかり
|
50da7d2a27
|
enhance(frontend): 2要素認証セットアップウィザードにアプリを起動するボタンを新設 (#13636)
* enhance(frontend): 2要素認証セットアップウィザードにアプリを起動するボタンを新設
* add comment
* use css module
|
2024-03-30 15:34:05 +09:00 |
かっこかり
|
c9c6424205
|
enhance(frontend): TOTPの入力ダイアログを改良 (#13607)
* enhance(frontend): TOTPの入力ダイアログを改良
* Update Changelog
|
2024-03-22 15:03:21 +09:00 |
おさむのひと
|
831c74a25b
|
fix: URLプレビューの動作改善+動作設定を可能にする (#13579)
* wip
* support new version
* URLプレビュー無効化時、フロント側も非表示にしてリクエストをしないようにする
* fix lint
* fix lint
* tweak preview request error handles
* fix: CHANGELOG.md
* fix
* fix
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
|
2024-03-21 18:46:42 +09:00 |
かっこかり
|
f4838e50b4
|
enhance(antenna): Botの投稿を除外できるように (#13603)
* enhance(antenna): Botの投稿を除外できるように (MisskeyIO#545)
(cherry picked from commit a95ce067c6 )
* Update Changelog
* remove translations
* spdx
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
|
2024-03-21 07:51:01 +09:00 |
mattyatea
|
d3016a4d6a
|
are
|
2024-03-18 19:02:54 +09:00 |
mattyatea
|
d2a02da432
|
Merge remote-tracking branch 'misskey-original/develop' into develop
|
2024-03-18 15:10:24 +09:00 |
zyoshoka
|
4b1ca9ef61
|
fix(general): `flash/create`でPlayの公開範囲を指定できない問題の修正と編集画面の調整 (#13574)
* fix(backend): param `visibility` wasn't included in `flash/create`
* fix(frontend): tweak flash editor ui
* Update CHANGELOG.md
|
2024-03-15 22:02:57 +09:00 |
tamaina
|
71d0538647
|
fix(frontend): update locales/index.d.ts
|
2024-03-14 18:18:32 +09:00 |
FineArchs
|
88d47ab024
|
プラグインの簡易的なログを表示する機能 (#13564)
* add plugin logging
* change variable name
* Update plugin.ts
* Update CHANGELOG.md
|
2024-03-13 22:38:26 +09:00 |
mattyatea
|
c2aba3886a
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# packages/frontend/src/components/MkNote.vue
|
2024-03-09 20:49:56 +09:00 |
かっこかり
|
27f823e882
|
enhance(frontend): リアクションの総数を表示するか設定で選べるように (#13539)
* enhance(frontend): リプライ・リノート・リアクションの総数を表示するか設定で選べるように (MisskeyIO#512)
(cherry picked from commit 3c8475e5ac )
* fix: いいねのみの場合は強制的にカウント表示
* make `showReactionsCount` default false
* リアクションだけ
* けしわすれ
* けしわすれ2
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
|
2024-03-08 18:13:09 +09:00 |
かっこかり
|
7ead98cbe5
|
enhance(frontend): リアクションの総数を表示するように (#13532)
* enhance(frontend): リアクションの総数を表示するように
* Update Changelog
* リアクション選択済の色をaccentに
|
2024-03-06 21:08:42 +09:00 |
mattyatea
|
b40ecc6159
|
a
|
2024-03-06 11:46:54 +09:00 |
mattyatea
|
1947a53af6
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# README.md
# locales/en-US.yml
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/CustomEmojiService.ts
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/RoleService.ts
# packages/backend/src/core/activitypub/models/ApNoteService.ts
# packages/backend/src/core/activitypub/models/ApPersonService.ts
# packages/backend/src/server/api/endpoints/admin/emoji/update.ts
# packages/frontend/src/components/MkDialog.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/global/MkCustomEmoji.vue
# packages/frontend/src/const.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/admin/roles.vue
# packages/frontend/src/pages/admin/security.vue
# pnpm-lock.yaml
|
2024-03-05 16:38:19 +09:00 |