Commit Graph

24 Commits

Author SHA1 Message Date
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
かっこかり 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
mattyatea 7313e13397 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/timeline.vue
2023-12-14 21:08:18 +09:00
YAVIIGI daea5a39ad
fix(frontend): ノート中の絵文字をタップして「リアクションする」を押したときにリアクションサウンドが鳴るようにする (#12624)
* Add sound.play() in copy reaction

* Update CHANGELOG.md

* fix lint error
2023-12-13 08:15:25 +09:00
mattyatea 8c4a08c383 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/channels/timeline.ts
#	packages/backend/src/server/api/endpoints/notes/featured.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkClickerGame.vue
#	packages/frontend/src/components/MkDialog.vue
#	packages/frontend/src/components/MkDrive.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkEmojiPicker.section.vue
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/components/MkInstanceTicker.vue
#	packages/frontend/src/components/MkLaunchPad.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteSimple.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkRadio.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/components/MkSwitch.vue
#	packages/frontend/src/custom-emojis.ts
#	packages/frontend/src/pages/about.emojis.vue
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/admin/other-settings.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/pages/user/index.files.vue
#	packages/frontend/src/scripts/get-note-menu.ts
#	packages/frontend/src/store.ts
#	packages/frontend/src/ui/_common_/stream-indicator.vue
#	packages/frontend/src/ui/classic.sidebar.vue
#	packages/frontend/src/ui/universal.vue
#	packages/frontend/src/ui/universal.widgets.vue
#	packages/frontend/vite.config.ts
#	packages/misskey-js/etc/misskey-js.api.md
#	packages/misskey-js/src/api.types.ts
#	packages/misskey-js/src/entities.ts
#	packages/misskey-js/src/streaming.types.ts
2023-12-13 07:08:57 +09:00
zyoshoka 406b4bdbe7
refactor(frontend): 非推奨となったReactivity Transformを使わないように (#12539)
* refactor(frontend): 非推奨となったReactivity Transformを使わないように

* refactor: 不要な括弧を除去

* fix: 不要なアノテーションを除去

* fix: Refの配列をrefしている部分の対応

* refactor: 不要な括弧を除去

* fix: lint

* refactor: Ref、ShallowRef、ComputedRefの変数の宣言をletからconstに置換

* fix: type error

* chore: drop reactivity transform from eslint configuration

* refactor: remove unnecessary import

* fix: 対応漏れ
2023-12-07 14:42:09 +09:00
mattyatea da40b4df17 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkNoteDetailed.vue
#	packages/frontend/src/components/global/MkCustomEmoji.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/scripts/nyaize.ts
2023-11-05 21:25:11 +09:00
syuilo 5e9f6a90df enhance(frontend): ノート内のカスタム絵文字をクリックすることで、コピーおよびリアクションができるように 2023-11-04 18:27:22 +09:00
mattyatea c7c70c1c30 Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/core/UserFollowingService.ts
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
2023-10-18 22:37:42 +09:00
mattyatea 57331536f2 lint fix 2023-10-14 17:00:14 +09:00
tar_bin 51313e7ec2 fix: ドラフトの絵文字は該当するキーを入力されても表示しないように修正
(cherry picked from commit f332fbc47eabc373e292076078ad673d72e6a5c9)
2023-10-14 12:38:40 +09:00
mattyatea 6fef96e657 絵文字、見やすく。 2023-09-25 18:10:01 +09:00
mattyatea d9db4449b4 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
# Conflicts:
#	CHANGELOG.md
#	package.json
#	packages/frontend/src/components/MkInstanceTicker.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/settings/theme.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/_common_/navbar-for-mobile.vue
#	packages/frontend/src/ui/_common_/navbar.vue
#	packages/frontend/src/ui/universal.vue
#	packages/frontend/src/widgets/WidgetInstanceInfo.vue
2023-09-21 00:20:12 +09:00
syuilo b0f6c44f36 refactor(frontend): use ESM 2023-09-19 16:37:43 +09:00
mattyatea 62b70f85f0 なんかもう色々変えた 2023-09-18 21:47:39 +09:00
mattyatea c9b97d5e0d feat: データセーバー強化 2023-09-18 09:26:25 +09:00
Shun Sakai c2370a1be6
chore: 著作権とライセンスについての情報を各ファイルに追加する (#11348)
* chore: Add the SPDX information to each file

Add copyright and licensing information as defined in version 3.0 of
the REUSE Specification.

* tweak format

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-07-27 14:31:52 +09:00
okayurisotto c0dbc3b53f
refactor: `substr` -> `substring` (#11273) 2023-07-14 07:59:54 +09:00
syuilo 821bb1c476 perf(frontend): サーバーにカスタム絵文字の種類が多い場合のパフォーマンスの改善
Resolve #10925
2023-05-31 12:42:24 +09:00
tamaina 81d2c5a4a7
enhance: カスタム絵文字関連の変更 (#9794)
* PackedNoteなどのemojisはプロキシしていないURLを返すように

* MFMでx3/x4もしくはscale.x/yが2.5以上に指定されていた場合にはオリジナル品質の絵文字を使用する

* update CHANGELOG.md

* fix changelog

* ??

* wip

* fix

* merge

* Update packages/frontend/src/scripts/media-proxy.ts

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

* merge

* calc scale

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-04-12 10:58:56 +09:00
syuilo c174f23389 chore(client): tweak custom emoji size 2023-02-23 15:42:57 +09:00
syuilo 0fb9c372dd lint 2023-02-22 15:28:17 +09:00
tamaina d78e15cc1a fix(client): カスタム絵文字にアニメーション画像を再生しない設定が適用されていない問題を修正 2023-02-03 20:37:15 +00:00
syuilo 452bd6db25 tweak custom emoji handling
Close #9721
2023-01-26 15:48:12 +09:00