mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-29 14:08:20 +09:00
Code
25,993 Commits 30 Branches 126 Tags 136 MiB
86468255bc
Commit Graph

25993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yupix
7cc555fd28
Merge branch 'misskey-dev:develop' into feat/client-dev-mode 2023-05-14 10:56:40 +09:00
syuilo
238d0fa667 refactor 2023-05-14 10:50:21 +09:00
yupix
30ff4592cc
Merge branch 'misskey-dev:develop' into feat/client-dev-mode 2023-05-14 10:38:52 +09:00
syuilo
a979fb9207 change(frontend): 動的ページのコンポーネントを削除 2023-05-14 10:31:48 +09:00
yupix
f15f60d5b9
feat: 開発者モードを追加 2023-05-14 01:30:46 +00:00
syuilo
8c97c54cfa refactor(frontend): use css modules 2023-05-14 10:21:56 +09:00
syuilo
89a3195dfd 🎨 2023-05-14 09:54:35 +09:00
syuilo
1eaf287b9c 🎨 2023-05-14 09:44:57 +09:00
syuilo
9166a58c5f 🎨 2023-05-13 20:50:21 +09:00
syuilo
eef368abd0 Update about-misskey.vue 2023-05-13 20:50:16 +09:00
NoriDev
fc8573a9e7 fix websocket stream error 2023-05-13 20:01:34 +09:00
NoriDev
c11aa0f336 Merge remote-branch 'misskey/master' 2023-05-13 19:50:38 +09:00
NoriDev
32ad9a16c1 updated 1682754135458-preservedUsernames.js 2023-05-12 20:32:44 +09:00
NoriDev
a3ea3bba41 Merge remote-branch 'ltlapy/develop-v13' 2023-05-12 20:25:08 +09:00
syuilo
de6348e8a0
Merge pull request #10833 from misskey-dev/develop 
* refactor(frontend): use css modules

* feat: 投稿したコンテンツのAIによる学習を軽減するオプションを追加

Resolve #10819

* enhance(backend): publicReactionsをデフォルトtrueに

* 念のためnoimageaiもつける

* add X-Robots-Tag: noai

* Update ja-JP.yml

* fix(frontend): ブラーエフェクトを有効にしている状態で高負荷になる問題を修正

* enhance(backend): graceful shutdown for job queue and refactor

* fix(backend): テスト時は一部のサービスを停止

* fix test

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

* refactor

* bump

* refactor(frontend): use css module

* refactor(frontend): use css module

* delete unused component

* センシティブワードを正規表現、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>

* Update CHANGELOG.md

* New Crowdin updates (#10823)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* ci: fix typo

* fix(frontend): より明確な説明にしたのとtypo修正

* fix typo

* fix(frontend): カラーバーがリプライには表示されないのを修正

* fix(frontend): チャンネル内の検索ボックスが挙動不審な問題を修正

Fix #10793

* enhance(backend): ノートのハッシュタグもMeilisearchに突っ込むように

今後ハッシュタグ検索とか実装するときのため

* feat(frontend): ユーザー指定ノート検索

* fix(frontend): fix retention chart rendering

* Update about-misskey.vue

* meta: Remove @rinsuki from reviewer-lottery (#10830)

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

* enhance(frontend): アカウント初期設定ウィザードにプライバシー設定を追加

* Update CHANGELOG.md

* fix(backend): ひとつのMeilisearchサーバーを複数のMisskeyサーバーで使えない問題を修正

* fix MkUserSetupDialog.Privacy.vue

* ci: skip non-Japanese locale on TurboSnap

* ci: notify on changes for push events

* ci: fix missing branch

* Update basic.cy.js

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

* 🎨

* 🎨

* enhance(frontend): add retention line chart

* update deps

* refactor

* fix(frontend): Pageにおいて画像ブロックに画像を設定できない問題を修正

Fix #10837

---------

Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
 2023-05-12 12:41:53 +09:00
syuilo
f983e44d9e fix(frontend): fix retention rate heatmap rendering 2023-05-12 12:15:54 +09:00
syuilo
5be6438bbc update deps 2023-05-12 12:10:56 +09:00
syuilo
d2e6b17a26 fix(frontend): Pageにおいて画像ブロックに画像を設定できない問題を修正 
Fix #10837
 2023-05-12 11:47:12 +09:00
syuilo
d1c2e4aaa0 refactor 2023-05-12 11:46:13 +09:00
syuilo
6f1994c665 update deps 2023-05-12 11:41:53 +09:00
syuilo
055dc6bb66 enhance(frontend): add retention line chart 2023-05-12 10:29:27 +09:00
syuilo
f06339b970 🎨 2023-05-12 08:26:06 +09:00
syuilo
3370419b0a 🎨 2023-05-12 08:20:36 +09:00
syuilo
9bd4ad0fc1 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-05-12 08:02:25 +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
syuilo
bb3c85d3a1 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-05-12 08:01:31 +09:00
syuilo
8328a66104 Update basic.cy.js 2023-05-12 08:01:29 +09:00
Acid Chicken (硫酸鶏)
909ec8c38d
ci: fix missing branch 2023-05-11 22:21:48 +09:00
Acid Chicken (硫酸鶏)
b01a1b3c17
ci: notify on changes for push events 2023-05-11 22:20:26 +09:00
Acid Chicken (硫酸鶏)
cbb779f60c
ci: skip non-Japanese locale on TurboSnap 2023-05-11 22:06:13 +09:00
NoriDev
b1e1928135 Revert "drop messaging (#9919)" 
This reverts commit 8f2049bc
 2023-05-11 21:39:03 +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
syuilo
8ddae83c40
fix MkUserSetupDialog.Privacy.vue 2023-05-11 21:24:27 +09:00
syuilo
1cc106b8de fix(backend): ひとつのMeilisearchサーバーを複数のMisskeyサーバーで使えない問題を修正 2023-05-11 21:09:29 +09:00
syuilo
16eedb86a5 Update CHANGELOG.md 2023-05-11 20:57:34 +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
a65fa684ce Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-05-11 20:17:48 +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
rinsuki
3c0dccc8b9
meta: Remove @rinsuki from reviewer-lottery (#10830) 2023-05-11 19:28:17 +09:00
syuilo
e18feb4183 Update about-misskey.vue 2023-05-11 18:22:38 +09:00
syuilo
9e464eaa63 fix(frontend): fix retention chart rendering 2023-05-11 18:20:48 +09:00
syuilo
8b352e4e56 feat(frontend): ユーザー指定ノート検索 2023-05-11 18:10:34 +09:00
syuilo
26d85c8bed enhance(backend): ノートのハッシュタグもMeilisearchに突っ込むように 
今後ハッシュタグ検索とか実装するときのため
 2023-05-11 16:33:39 +09:00
syuilo
df924d18f1 fix(frontend): チャンネル内の検索ボックスが挙動不審な問題を修正 
Fix #10793
 2023-05-11 16:29:34 +09:00
syuilo
177359689e fix(frontend): カラーバーがリプライには表示されないのを修正 2023-05-11 16:26:35 +09:00
syuilo
b380dc53e1 fix typo 2023-05-11 16:22:46 +09:00
syuilo
8c30ca50a8 fix(frontend): より明確な説明にしたのとtypo修正 2023-05-11 16:20:03 +09:00
Acid Chicken (硫酸鶏)
69afd0480e
ci: fix typo 2023-05-10 10:33:49 +00:00