usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,801 Commits 367 Branches 1,047 Tags 328 MiB
Commit Graph

1164 Commits

Author SHA1 Message Date
mattyatea 399f7c451b 色々 2024-02-11 20:23:39 +09:00
mattyatea dfd491ff85 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/pages/settings/theme.vue
 2024-02-09 10:14:24 +09:00
おさむのひと 614c9a0fc6
fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加 (#13210) 
* fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加

* Serviceでチェックするように変更
 2024-02-09 10:07:18 +09:00
mattyatea a34e972301 ui:fix 2024-02-05 14:31:30 +09:00
mattyatea dad9dfef9e ui:fix 2024-02-05 14:10:40 +09:00
mattyatea 2ab6bb52c2 ui:fix 2024-02-05 01:28:12 +09:00
mattyatea 942b7f1b3c Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkDrive.vue
#	packages/frontend/src/components/MkEmojiPicker.section.vue
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkFoldableSection.vue
#	packages/frontend/src/components/MkInput.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/components/MkSwitch.button.vue
#	packages/frontend/src/components/MkTab.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/components/MkUserSelectDialog.vue
#	packages/frontend/src/components/global/MkCustomEmoji.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/os.ts
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/ui/universal.vue
 2024-01-31 19:51:51 +09:00
かっこかり 4535f9b41b
fix(i18n): ストック情報とフロー情報の文言をわかりやすく変更 (#13085) 
* fix(i18n): ストック情報とフロー情報をわかりやすく書き直す

* Update ja-JP.yml

* Update ja-JP.yml
 2024-01-29 21:33:42 +09:00
mattyatea 7a3eb26c4d Merge remote-tracking branch 'misskey-mattyatea/report' into develop 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	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
 2024-01-28 08:01:21 +09:00
mattyatea 852c5d4035 いろいろかえた 2024-01-28 07:56:32 +09:00
mattyatea 79d2b6fe9e Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
 2024-01-24 16:40:37 +09:00
syuilo 5719a929ad enhance(reversi): 変則なしマッチングを可能に 2024-01-24 16:37:06 +09:00
syuilo a3ba315dc6 enhance(reversi): improve game setting flow 2024-01-24 13:17:34 +09:00
syuilo 645f5e8633 enhance(reversi): 開始時に対局をシェアできるように 2024-01-24 10:36:02 +09:00
mattyatea 78a34d3de3 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/pages/timeline.vue
 2024-01-23 12:38:56 +09:00
かっこかり 3784b39a5f
enhance(frontend): 季節に応じた画面の演出を南半球に対応させる (#12838) 
* (enhance) 季節に応じた画面の演出を南半球に対応させる

* Update Changelog

* (add) 半球の簡易自動判定

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-21 19:08:07 +09:00
かっこかり 0580ba1fb5
enhance(frontend): タイムラインフィルターの設定を保持＋センシティブなノートを隠せるように (#12848) 
* (enhance) タイムラインフィルターの状態を記憶するように

* fix

* (enhance) センシティブな投稿をミュート形式で表示する(TLのみ)

* fix

* Update Changelog

* Fix changelog

* Lintエラーを潰す

* Update locales/ja-JP.yml

* hideSensitive -> withSensitive

* Update CHANGELOG.md

* Update ja-JP.yml

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-21 18:29:17 +09:00
mattyatea 6390977653 Merge remote-tracking branch 'misskey-original/develop' into develop 2024-01-21 13:44:29 +09:00
syuilo 6039f27bd5 enhance(reversi): tweak reversi 2024-01-21 12:05:51 +09:00
かっこかり 4de77784c9
enhance(sw): オフライン表示のデザインを改善 (#13052) 
* enhance(sw): オフライン表示のデザインを改善

* Update Changelog

* fix

* fix

* fix

* 言語が取得できなかった場合のフォールバックを追加

* (change) translation key
 2024-01-21 11:50:05 +09:00
syuilo a17251d913 enhance(reversi): tweak reversi 2024-01-21 10:07:43 +09:00
かっこかり 576484835e
enhance(frontend): ノート作成画面の添付メニューから直接ファイルを消せるように (#12858) 
* (enhance) 添付画面から直接ファイルを消せるように

* Update Changelog

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-21 05:26:13 +09:00
mattyatea f6d3fde92d Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/models/RepositoryModule.ts
#	packages/backend/src/models/_.ts
#	packages/frontend/src/components/MkDrive.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/components/MkUserSelectDialog.vue
#	packages/frontend/src/components/index.ts
#	packages/frontend/src/os.ts
#	packages/frontend/src/pages/avatar-decorations.vue
#	packages/frontend/src/pages/settings/mute-block.word-mute.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/misskey-bubble-game/src/monos.ts
 2024-01-20 14:54:06 +09:00
syuilo a637b4e282 feat: reversi 
Resolve #12962
 2024-01-19 20:51:49 +09:00
mattyatea 9a4b52a1bb wakariyasuku 2024-01-18 22:55:46 +09:00
mattyatea 959374bb78 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
 2024-01-18 22:04:13 +09:00
かっこかり c1019a006b
feat(frontend): 横スワイプでタブを切り替える機能 (#13011) 
* (add) 横スワイプでタブを切り替える機能

* Change Changelog

* y方向の移動が一定量を超えたらスワイプを中断するように

* Update swipe distance thresholds

* Remove console.log

* adjust threshold

* rename, use v-model

* fix

* Update MkHorizontalSwipe.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* use css module

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-18 18:21:33 +09:00
mattyatea 8205e30311 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/backend/src/core/QueryService.ts
#	packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
#	packages/backend/src/server/api/endpoints/hashtags/users.ts
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/pages/emojis.emoji.vue
 2024-01-15 23:20:00 +09:00
かっこかり 8b0fdfcd69
enhance: 動画・音声周りのUIと動作改良 (#12925) 
* wip

* (fix) `/files` をバイトレンジリクエストに対応させる

* video

* audio

* fix

* fix

* spdx

* fix (rangeRequest)

* fix

* Update CHANGELOG.md

* (add) ボリュームを保存できるように

* (fix) ミュート復帰時に音量が固定される

* named export

* tweak design

* Add sensitive class for audio component

* Refactor seekbar styles

* Refactor hms

* Revert "(add) ボリュームを保存できるように"

This reverts commit 6271f9493b.

* Revert "(fix) ミュート復帰時に音量が固定される"

This reverts commit a65002b56e.

* revert revert changes

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-15 18:17:01 +09:00
mattyatea 6fa319afc6 Feat: emoji picker profile 2024-01-14 13:54:37 +09:00
mattyatea 1dce38dfed Merge remote-tracking branch 'misskey-original/develop' into develop 2024-01-13 10:51:27 +09:00
syuilo 0aefebf02a enhance(drop-and-fusion): some tweaks 2024-01-12 20:38:04 +09:00
syuilo d2063df78d enhance(drop-and-fusion): add new mode, some tweaks 2024-01-12 14:48:44 +09:00
mattyatea 33507e24ff Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/backend/src/models/RepositoryModule.ts
#	packages/backend/src/models/_.ts
#	packages/backend/src/postgres.ts
#	packages/frontend/src/components/MkDrive.file.vue
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/router.ts
#	packages/frontend/src/ui/universal.vue
 2024-01-11 21:46:28 +09:00
syuilo cf54c2ba47 feat: ranking system of bubble game 
Resolve #12961
 2024-01-11 18:13:39 +09:00
syuilo 5c786cace8 enhance(drop-and-fusion): add game description 2024-01-10 17:31:59 +09:00
Camilla Ett 358dc6289b
Enhance(frontend): 管理者の場合はAPI tokenの発行画面で管理機能に関する権限を付与できるように (#12944) 
* Enhance(frontend): 管理者の場合はAPI tokenの発行画面で管理機能に関する権限を付与できるように

* update CHANGELOG.md

* tweak style

* (refactor) remove unnecessary imports

* fix lint

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: kakkokari-gtyih <daisho7308+f@gmail.com>
 2024-01-09 21:18:09 +09:00
syuilo 1063d39de8 enhnace(frontend): tweak game 2024-01-09 21:15:56 +09:00
かっこかり 0d7f9308cc
enhance(frontend): バブルゲームの諸々を修正・改良2 (#12948) 
* (fix) ゲームが正常に終了するように

* (enhance) 効果音の音量を設定可能に

* (add) store

* (add) スクショにロゴの透かしを入れる

* Update packages/frontend/src/pages/drop-and-fusion.vue

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

* tweak

* tweak

* tweak

* tweak

* Update drop-and-fusion.vue

* tweak

* tweak

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-01-09 13:25:33 +09:00
かっこかり 6a02dfdd3b
enhance(frontend): バブルゲームの諸々を修正・改良 (#12938) 
* enhance(frontend): バブルゲームのテクスチャをゲーム開始時にキャッシュするように

* (fix) カーソルが枠線内を動くように

* (add) 最大コンボ数を表示するように

* (add) 実績を追加

* Update ja-JP.yml

* tweak

* tweak flavor

* perf tweak

* refactor

* perf tweak

* lint

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-08 11:02:05 +09:00
mattyatea 801697ccdd Merge remote-tracking branch 'misskey-original/develop' into develop 2024-01-08 00:40:16 +09:00
syuilo 00e195f50b tweak game 2024-01-07 13:19:10 +09:00
Kagami Sascha Rosylight 2a9db983fc
feat: export clips (#12931) 
* feat: export clips

* Update CHANGELOG.md
 2024-01-07 10:35:58 +09:00
mattyatea eb1ce55304 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/frontend/src/components/MkSignupDialog.form.vue
 2024-01-06 23:47:45 +09:00
Chocolate Pie 072f67d6e7
feat: Add support for mCaptcha (#12905) 
* feat: Add support for mCaptcha

* fix: Fix docker compose configuration

* chore(frontend/docs): update changelog & fix eslint errors

* `@mcaptcha/vanilla-glue`をダイナミックインポートするように

* chore: Add missing prefix to CHANGELOG

* refactor(backend): 適当につけた変数の名前を変更
 2024-01-06 20:14:33 +09:00
mattyatea 6c83f01ef4 Merge remote-tracking branch 'misskey-original/develop' into develop 2024-01-04 14:19:28 +09:00
Camilla Ett 58469c0a69
enhance(frontend): カスタム絵文字追加画面の「タグ」の説明を追加 (#12888) 2024-01-03 08:07:04 +09:00
mattyatea 74e45b13eb
Feat: GDPRモードを追加した 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-12-31 18:19:59 +09:00
mattyatea d19a4ab8a3 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/stream/ChannelsService.ts
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/mute-block.vue
 2023-12-28 04:42:28 +09:00
mattyatea cb1586658e
Merge remote-tracking branch 'mi-dev/master' into report 2023-12-28 04:16:03 +09:00