1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-18 00:29:04 +09:00
Commit Graph

27072 Commits

Author SHA1 Message Date
syuilo
90a5511a54 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-09-22 16:47:45 +09:00
syuilo
032b6c6afb update deps 2023-09-22 16:47:42 +09:00
syuilo
ee83b9542e
New Crowdin updates (#11856)
* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (German)

* 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 (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Chinese Simplified)

* 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)
2023-09-22 16:46:08 +09:00
typeling1578
3bbc2e55b1
fix(backend): mostr.pub, Mitraのユーザーをフォローできない問題を修正 (#11791)
* fix(backend): mostr.pub, Mitraのユーザーをフォローできない問題を修正

* Revert "fix(backend): mostr.pub, Mitraのユーザーをフォローできない問題を修正"

This reverts commit 9685715e6470caffc2b0c7b991d55c5edf7fa0f1.

* fix ApResolverService

* Update CHANGELOG.md

* fix test

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-09-22 16:43:01 +09:00
NoriDev
900f3c08c9 fix(frontend/friendly): 特定の条件でページを更新すると、以前のページが表示される問題 2023-09-22 16:37:10 +09:00
NoriDev
4ecf779771 lint 2023-09-22 16:29:40 +09:00
NoriDev
0c9c509d2f fix locale 2023-09-22 16:21:46 +09:00
かっこかり
7dc9fe4e24
feat(frontend): センシティブなメディアを目立たせる設定を追加 (#11851)
* (add) highlight sensitive image

* Update Changelog

* (change) 設定の位置

* (add) apply mediaHighlight to video

* (change) image -> media

* Update CHANGELOG

* やっぱもうちょっと太い方がいい

* (fix) style

* Update ja-JP.yml

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-09-22 16:03:10 +09:00
NoriDev
7e20164a5e feat: リノートと引用ボタンの表示方法を選択できる 2023-09-22 14:57:05 +09:00
NoriDev
887a6d59aa feat: 通知で返信があるノートの親ノートを表示しないようにする設定を追加 2023-09-22 14:22:19 +09:00
NoriDev
333939164f Update CHANGELOG_CHERRYPICK.md 2023-09-22 14:20:10 +09:00
syuilo
c836157edb
enhance: 二要素認証設定時のセキュリティを強化 (#11863)
* enhance: 二要素認証設定時のセキュリティを強化

パスワード入力が必要な操作を行う際、二要素認証が有効であれば確認コードの入力も必要にする

* Update CoreModule.ts

* Update 2fa.ts

* wip

* wip

* Update 2fa.ts

* tweak
2023-09-22 14:12:33 +09:00
NoriDev
2bce7ff23a tweak fb75a2dd 2023-09-22 14:08:37 +09:00
NoriDev
12ac9ecb61 lint 2023-09-22 13:46:06 +09:00
NoriDev
5c784a2f38 fix lang 2023-09-22 13:45:03 +09:00
NoriDev
bb21c38e33 revert 2023-09-22 13:18:19 +09:00
NoriDev
076805e914 Merge remote-branch 'misskey/develop' 2023-09-22 13:18:12 +09:00
NoriDev
01b156bfe9 Update CHANGELOG_CHERRYPICK.md 2023-09-22 11:56:03 +09:00
NoriDev
fe2f5dad58 Merge pull request #11851 from misskey-dev/misskey 2023-09-22 11:55:07 +09:00
NoriDev
59ad05a702 Merge branch 'develop' of https://github.com/kokonect-link/cherrypick into develop 2023-09-22 11:42:10 +09:00
Caipira
d450f27078
Merge pull request #370
* enhance(frontend): Include fonts in vite build
2023-09-22 11:35:04 +09:00
Caipira
1959194cd6
Merge pull request #371
* feat(backend): Override the file URL rendering in AP
2023-09-22 11:34:50 +09:00
NoriDev
8e6546d42f Merge remote-branch 'misskey/develop' 2023-09-22 11:31:08 +09:00
NoriDev
c5cf27643e Update CHANGELOG_CHERRYPICK.md 2023-09-22 10:15:14 +09:00
まっちゃとーにゅ
6875920648 キューに予期しないデータが入っている場合、エンドポイントURLのパースもエラーログの作成も失敗する問題を修正 (MisskeyIO#168) 2023-09-22 10:12:07 +09:00
syuilo
eca8c7a52f tweak ui 2023-09-22 10:01:34 +09:00
かっこかり
2e97314121
Merge branch 'develop' into sensitive-dsv 2023-09-21 23:13:32 +09:00
syuilo
03b5acf17f fix test 2023-09-21 19:39:42 +09:00
syuilo
e3f151e230 feat: 指定したユーザーの投稿通知
Resolve #11499
2023-09-21 18:48:15 +09:00
NoriDev
176af77635 Merge remote-branch 'misskey/develop' 2023-09-21 16:53:15 +09:00
かっこかり
5fd6091982
Merge branch 'develop' into sensitive-dsv 2023-09-21 15:59:41 +09:00
syuilo
f195fa4ab9 2023.9.0-beta.10 2023-09-21 15:24:50 +09:00
syuilo
51c3ef5561 update deps 2023-09-21 15:24:47 +09:00
syuilo
b654446f93 enhance(frontend): tweak ui 2023-09-21 15:14:08 +09:00
syuilo
e41619775f feat: プロフィールでのリンク検証
Resolve #11099
2023-09-21 11:58:51 +09:00
かっこかり
839be0fdf9
Merge branch 'develop' into sensitive-dsv 2023-09-21 11:00:18 +09:00
syuilo
1250309a69 🎨 2023-09-21 10:29:40 +09:00
syuilo
6459eadcf1 update deps 2023-09-21 10:25:44 +09:00
かっこかり
e7cdd7babf
Merge branch 'develop' into sensitive-dsv 2023-09-20 16:45:20 +09:00
syuilo
1dddc68709 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-09-20 16:44:53 +09:00
syuilo
f9916d216a 2023.9.0-beta.9 2023-09-20 16:44:44 +09:00
syuilo
9abda93811
New Crowdin updates (#11840)
* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Thai)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Vietnamese)
2023-09-20 16:44:26 +09:00
syuilo
8e2d47b2e8 refactor 2023-09-20 16:44:12 +09:00
syuilo
b9c6992aac
update deps (#11849)
* update deps

* wip

* wip
2023-09-20 16:43:45 +09:00
kakkokari-gtyih
fa82a427e1 (fix) style 2023-09-20 15:03:04 +09:00
かっこかり
a7ea7a019a
Merge branch 'develop' into sensitive-dsv 2023-09-20 13:35:21 +09:00
typeling1578
cb026a7512
Update Dockerfile (#11848) 2023-09-20 13:28:42 +09:00
かっこかり
6557641cd8
Merge branch 'develop' into sensitive-dsv 2023-09-20 13:08:05 +09:00
syuilo
fa13b815ef fix: provide NoSuchNoteError error 2023-09-20 11:43:33 +09:00
syuilo
5d65e34078 fix import 2023-09-20 11:40:17 +09:00