mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-13 22:28:58 +09:00
Code
24,716 Commits 30 Branches 126 Tags 136 MiB
8383d9c9dc
Commit Graph

6066 Commits

Author SHA1 Message Date
Chocolate Pie
0329b7acab Revert "Merge remote-tracking branch 'upstream/develop' into flash-request-token" 
This reverts commit e045aa2661.
 2023-06-11 15:53:13 +09:00
Chocolate Pie
e045aa2661 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-11 15:50:38 +09:00
syuilo
f1b0c54f6e
New Crowdin updates (#10971) 
* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

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

* New translations ja-JP.yml (Turkish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)
 2023-06-11 10:01:30 +09:00
NoriDev
4320dc27f2 MFMヘルプにルビの説明を追加 2023-06-10 22:36:33 +09:00
NoriDev
08e438210d Update index.d.ts 2023-06-10 20:50:49 +09:00
Nyamori
f45745af5a メディアタイムライン追加 2023-06-10 20:23:45 +09:00
NoriDev
25029ac671 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-10 19:19:36 +09:00
syuilo
46222d0258 tweak of f3a16bcd6 2023-06-10 17:41:52 +09:00
nenohi
f3a16bcd6d
ロールのユーザーリストを非公開にできるように (#10987) 
* ロールのユーザーリストを非公開にできるように

* Changelog update
 2023-06-10 17:26:48 +09:00
Chocolate Pie
5ae91f5f23 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-10 10:38:43 +09:00
NoriDev
635765eacc Merge remote-branch 'misskey/develop' 2023-06-09 20:06:13 +09:00
syuilo
dd733ec1d0 enhance(frontend): サーバーのテーマ設定を別ページに分離 2023-06-09 15:53:40 +09:00
NoriDev
3f9c07cba4 Merge remote-branch 'misskey/master' 2023-06-06 14:45:05 +09:00
ssmucny
825a4be1cc - add i18n 
- upate UI storybook
 2023-06-05 22:43:49 -04:00
Chocolate Pie
de7ec82222
Merge branch 'develop' into flash-request-token 2023-06-06 09:10:48 +09:00
syuilo
f4943bc5bb
New translations ja-JP.yml (Japanese, Kansai) (#10954) 2023-06-06 09:09:46 +09:00
Chocolate Pie
81eb257cf1 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-06 08:39:23 +09:00
Chocolate Pie
08b6a2008a Fix translate 2023-06-06 07:54:27 +09:00
NoriDev
f167691a7c docs: MFMヘルプドキュメントの更新 2023-06-06 01:30:22 +09:00
NoriDev
f690477229 feat(client): mfm-cheat-sheetの復元 2023-06-06 01:12:20 +09:00
NoriDev
21da7746be Merge remote-branch 'misskey/develop' 2023-06-05 20:51:42 +09:00
NoriDev
25a6b3f86e Update index.js 2023-06-05 20:47:57 +09:00
NoriDev
d56b50a5f1 feat(client): ページの更新が必要なときに静かに通知する機能を追加 2023-06-05 20:47:49 +09:00
syuilo
6b0685a25c
[ci skip] New Crowdin updates (#10947) 
* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Chinese Traditional)
 2023-06-05 18:05:20 +09:00
NoriDev
7fb5df149f localeの整列を変更 2023-06-05 17:18:06 +09:00
NoriDev
206ca5c90d fix typo: newNoteRecivedNotification -> newNoteReceivedNotification 2023-06-05 17:16:00 +09:00
ssmucny
fbe451f083 Fixes to event editor 2023-06-04 23:21:34 -04:00
Sam Smucny
95e9cd86bb
Merge branch 'develop' into ssmucny-events 2023-06-04 22:18:25 -04:00
Chocolate Pie
ba3ee6dfe0 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-05 08:16:33 +09:00
Chocolate Pie
99446d440e Api Tokenを要求できる関数を追加 (misskey-dev/misskey#10911) 2023-06-05 08:10:15 +09:00
NoriDev
287e1867a3 Merge remote-branch 'misskey/develop' 2023-06-04 15:45:23 +09:00
NoriDev
a83ae95a9f Update ko-KR.yml 2023-06-04 15:32:24 +09:00
syuilo
db623dda22
New Crowdin updates (#10943) 
* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)
 2023-06-04 14:31:03 +09:00
NoriDev
fee4b042ca enhance(client): 特定のMFM構文を含むノートを省略化するかどうかを選択できる 2023-06-04 04:25:14 +09:00
NoriDev
5d2b521f42 enhance(client/friendly): ヘッダーに通知領域有効化ボタンを追加 2023-06-04 04:02:53 +09:00
NoriDev
5e86d02694 enhance(client): Friendly UIで通知領域をオン/オフできるように 2023-06-02 23:31:22 +09:00
NoriDev
dd061ecd33 Merge remote-branch 'misskey/develop' 2023-06-02 18:49:57 +09:00
syuilo
3857cd589f
New Crowdin updates (#10935) 
* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Chinese Simplified)
 2023-06-02 09:13:51 +09:00
NoriDev
fa4e422deb Merge remote-branch 'misskey/develop' 2023-06-01 17:51:18 +09:00
syuilo
f6830885d7 tweak of cd8274888 2023-06-01 17:34:56 +09:00
syuilo
146e89edd0 Update index.d.ts 2023-06-01 17:19:11 +09:00
syuilo
cd82748889 enhance(frontend): 追加の絵文字用辞書をダウンロードできるように 
Resolve #10921
 2023-06-01 17:10:53 +09:00
NoriDev
1457268f2f Merge remote-branch 'misskey/develop' 2023-06-01 13:31:21 +09:00
syuilo
31a8129cb9
New translations ja-JP.yml (Korean) (#10933) 2023-06-01 13:20:43 +09:00
NoriDev
2e104443b2 CherryPick🍒 2023-06-01 10:52:09 +09:00
NoriDev
0a50864724 Update index.js 2023-06-01 10:51:10 +09:00
NoriDev
1d98bbe495 Merge remote-branch 'misskey/develop' 2023-06-01 10:16:23 +09:00
syuilo
8cc6c2c864
New Crowdin updates (#10929) 
* New translations ja-JP.yml (Korean)

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

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

* New translations ja-JP.yml (Norwegian)
 2023-06-01 09:29:29 +09:00
NoriDev
7c264d0777 Merge remote-branch 'misskey/develop' 2023-05-31 17:49:22 +09:00
syuilo
8e5d31eb5c
New Crowdin updates (#10918) 
* New translations ja-JP.yml (Korean)

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

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

* New translations ja-JP.yml (Norwegian)

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

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Norwegian)
 2023-05-31 09:06:29 +09:00
NoriDev
fcd369e7b4 Merge remote-branch 'misskey/develop' 2023-05-29 21:19:36 +09:00
NoriDev
a4b681a9c0 Merge remote-branch 'misskey/develop' 2023-05-29 21:15:21 +09:00
syuilo
c6ea7f754c
New Crowdin updates (#10917) 
* New translations ja-JP.yml (German)

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

* New translations ja-JP.yml (English)
 2023-05-29 20:08:31 +09:00
NoriDev
1f6e4ae48f Update ko-KR.yml 2023-05-29 20:05:39 +09:00
syuilo
f469f555e8
New Crowdin updates (#10916) 
* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Russian)

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

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

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Japanese, Kansai)
 2023-05-29 17:53:05 +09:00
NoriDev
be3b84882f feat(client): アカウント初期設定ウィザードにフォントサイズ設定を追加 2023-05-27 17:43:04 +09:00
NoriDev
6e151973c0 Update ko-KR.yml 2023-05-27 16:38:28 +09:00
NoriDev
94213f80d8 feat(client): 文字を太くするオプションを追加 2023-05-27 13:45:24 +09:00
NoriDev
013aab992a feat(client): フォントサイズをより簡単に変更できるよう 2023-05-27 13:20:03 +09:00
NoriDev
b1e6247f2b Update ko-KR.yml 2023-05-27 11:38:07 +09:00
NoriDev
b74f921b93
Update ko-KR.yml 2023-05-26 23:47:53 +09:00
NoriDev
199783e3fb Update index.d.ts 2023-05-26 15:47:12 +09:00
NoriDev
e955061730 Update ko-KR.yml 2023-05-26 15:47:05 +09:00
NoriDev
2090eb77cf localeの並び替えを修正 2023-05-26 15:39:24 +09:00
NoriDev
506d66fd42 Merge remote-branch 'misskey/develop' 2023-05-26 15:16:44 +09:00
NoriDev
9a17964c2f enhance(frontend): アカウント初期設定ウィザードにぼかし効果設定を追加 2023-05-26 15:12:11 +09:00
Chocolate Pie
98aef974df
enhance: ハッシュタグのノート一覧ページから、そのハッシュタグで投稿するボタンを追加、お知らせの画像URLを空にできない問題を修正 (#10878) 
* fix: お知らせの画像URLを空にできない問題を修正 (misskey-dev/misskey#10657)

* ハッシュタグのノート一覧ページからノートできるように(misskey-dev/misskey#10854)

* fix: 色々直した

* location.reloadを使わないように

* CHANGELOGを編集

* tweak

* Update tag.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-05-26 14:47:31 +09:00
NoriDev
cf46816687
feat: アカウント初期設定ウィザードに戻るボタンと、後で進むボタンを追加 (#10893) 
* enhance(frontend): アカウント初期設定ウィザードに戻るボタンを追加

* enhance(frontend): アカウント初期設定ウィザードにあとでボタンを追加

* tweak

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-05-26 14:40:44 +09:00
tamaina
eee1e74174 shareページに"Misskeyへ"ボタンを設置 
Resolve #10898
 2023-05-26 05:18:01 +00:00
NoriDev
3b3620616a feat: Add MFM and Animated Images Settings to Account Initialization Wizard 2023-05-25 17:33:30 +09:00
NoriDev
725d758797 enhance(frontend): アカウント初期設定ウィザードにあとでボタンを追加 2023-05-25 14:26:09 +09:00
NoriDev
ffa5cd0626 Update ko-KR.yml 2023-05-25 13:21:29 +09:00
NoriDev
a852d0daf9 locale index 2023-05-25 10:00:15 +09:00
NoriDev
1dbd343e83 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-05-25 09:30:02 +09:00
Acid Chicken (硫酸鶏)
62fe3bfb54
refactor(#7598): add i18n dynamic typings (#10882) 
* refactor: add i18n dynamic typings

* chore: tweak
 2023-05-24 17:12:38 +09:00
NoriDev
a467f1d72c Merge remote-branch 'misskey/develop' 2023-05-23 17:27:08 +09:00
syuilo
3804c6e7ad feat: センシティブなカスタム絵文字のリアクションを受け入れない設定を追加 2023-05-19 09:43:38 +09:00
syuilo
527a13b77d enhance(frontend): リアクションの取り消し/変更時に確認ダイアログを出すように 2023-05-19 09:15:24 +09:00
Acid Chicken (硫酸鶏)
c4b31525b3
chore: tweak MkEvent 2023-05-18 23:47:17 +09:00
syuilo
231506772a tweak of 7ce569424 2023-05-18 20:17:32 +09:00
syuilo
7ce569424a feat: カスタム絵文字ごとにそれをリアクションとして使えるロールを設定できるように 2023-05-18 18:45:49 +09:00
tamaina
dd60f1a533 fix(frontend/MkUrlPreview): summalyがエラーになった際の挙動を修正 2023-05-17 20:00:28 +00:00
NoriDev
1ab09e6464 about-misskey improvements 2023-05-17 17:33:27 +09:00
NoriDev
c249405448 Update ko-KR.yml 2023-05-16 16:40:56 +09:00
NoriDev
c966ab0ed7 about-misskey improvements 2023-05-14 17:57:52 +09:00
NoriDev
54bc45adee Update ko-KR.yml 2023-05-14 16:10:56 +09:00
yupix
f15f60d5b9
feat: 開発者モードを追加 2023-05-14 01:30:46 +00:00
NoriDev
a3ea3bba41 Merge remote-branch 'ltlapy/develop-v13' 2023-05-12 20:25:08 +09:00
syuilo
3370419b0a 🎨 2023-05-12 08:20:36 +09:00
syuilo
23994d8f4e
[ci skip] New Crowdin updates (#10834) 
* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (German)

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

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

* New translations ja-JP.yml (Arabic)
 2023-05-12 08:02:15 +09:00
NoriDev
8373e6642d Revert "drop group (#9942)" 
This reverts commit 8caf288ac1.
 2023-05-11 21:38:13 +09:00
NoriDev
520b072c09 Merge remote-branch 'upstream/develop' 2023-05-11 21:34:09 +09:00
NoriDev
97c4782014 Merge remote-branch 'upstream/develop' 2023-05-11 20:55:13 +09:00
syuilo
2b26a2f5e4 enhance(frontend): アカウント初期設定ウィザードにプライバシー設定を追加 2023-05-11 20:54:47 +09:00
syuilo
0758c56c53
New Crowdin updates (#10824) 
* New translations ja-JP.yml (English)

* 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 Traditional)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

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

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

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

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

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Russian)

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

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Thai)
 2023-05-11 20:17:15 +09:00
syuilo
8b352e4e56 feat(frontend): ユーザー指定ノート検索 2023-05-11 18:10:34 +09:00
syuilo
8c30ca50a8 fix(frontend): より明確な説明にしたのとtypo修正 2023-05-11 16:20:03 +09:00
syuilo
6d4d9f417b
New Crowdin updates (#10823) 
* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)
 2023-05-10 18:26:02 +09:00
nenohi
c15b75e477
センシティブワードを正規表現、CWにも適用するように (#10688) 
* cwにセンシティブが効いてない

* CWが無いときにTextを見るように

* 比較演算子間違えた

* とりあえずチェック

* 正規表現対応

* /test/giにも対応

* matchでしなくてもいいのでは感

* レビュー修正

* Update packages/backend/src/core/NoteCreateService.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* Update packages/backend/src/core/NoteCreateService.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* 修正

* wipかも

* wordsでスペース区切りのものできたかも

* なんか動いたかも

* test作成

* 文言の修正

* 修正

* note参照

---------

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2023-05-10 18:02:41 +09:00
syuilo
d75a7fd421
New Crowdin updates (#10815) 
* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

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

* New translations ja-JP.yml (Chinese Traditional)
 2023-05-10 16:36:22 +09:00