mattyatea
68b48bc16f
Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop
...
# Conflicts:
# CHANGELOG.md
# locales/index.d.ts
# locales/ja-JP.yml
# packages/backend/src/core/CustomEmojiService.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/server/api/EndpointsModule.ts
# packages/backend/src/server/api/endpoints.ts
# packages/backend/src/server/api/endpoints/admin/emoji/update.ts
# packages/frontend/src/components/MkCustomEmojiEditLocal.vue
# packages/frontend/src/components/MkCustomEmojiEditRemote.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/emojis.emoji.vue
2023-12-23 09:30:48 +09:00
mattyatea
487b3089a0
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# README.md
# 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/MkSignupDialog.form.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/widgets/WidgetInstanceInfo.vue
2023-12-23 09:14:17 +09:00
zyoshoka
d68214bd46
fix(i18n): ロールが付与された際の通知のローカライゼーションが一部欠けているのを修正 ( #12745 )
2023-12-22 15:38:27 +09:00
syuilo
15b0d2aff2
enhance: ロールにアサインされたときの通知 ( #12607 )
...
* wip
* Update misskey-js.api.md
* Update CHANGELOG.md
* Update RoleService.ts
* Update locales/ja-JP.yml
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
* Update UserListService.ts
* Update misskey-js.api.md
* fix (#12724 )
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
2023-12-21 10:39:11 +09:00
zawa-ch
4e2d802967
enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように ( #12702 )
...
* Enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12072 )
* refactor: crowdin 編集部分のコミットを打ち消し
https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158
* refactor: オブジェクトの名前修正
https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158
* fix: 設定項目の説明を削除
名称が具体的になって必要なくなったため
https://github.com/misskey-dev/misskey/pull/12702#discussion_r1429932463
2023-12-18 20:59:20 +09:00
syuilo
776eea736a
enhance(frontend): tweak avatar decoration setting ui
2023-12-16 17:37:50 +09:00
syuilo
742da2f1e9
feat(frontend): 画面に雪を降らせる機能を復活
2023-12-16 13:52:52 +09:00
おさむのひと
d7d9304a49
fix(frontend): 絵文字ピッカー設定ページのボタン文言修正 ( #12676 )
...
* fix(frontend): 絵文字ピッカー設定ページのボタン文言修正
* fix
2023-12-16 13:23:54 +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
syuilo
f7eef546a6
fix(frontend): fix missing localization
2023-12-14 17:05:29 +09:00
おさむのひと
a92795d90f
feat(frontend): 絵文字ピッカーの実装 ( #12617 )
...
* 絵文字デッキの作成
* 細かい不備を修正
* fix lint
* fix
* fix CHANGELOG.md
* fix setTimeout -> nextTick
* fix https://github.com/misskey-dev/misskey/pull/12617#issuecomment-1848952862
* fix bug
* fix CHANGELOG.md
* fix CHANGELOG.md
* wip
* Update CHANGELOG.md
* Update CHANGELOG.md
* wip
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-12-14 14:11:20 +09:00
syuilo
5472f4b934
enhance: アイコンデコレーションを複数設定できるように
2023-12-13 16:56:19 +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
mattyatea
da83bc315a
feat: 絵文字のホーム通知
2023-12-09 19:05:27 +09:00
かっこかり
5bf7813b2d
enhance/feat(frontend): データセーバーの改良・強化 ( #12526 )
...
* enhance(frontend): データセーバーを個別で設定できるように
* Update Changelog
* fix design
* (fix) 設定が当たらない
* fix test(無理やり感)
* (fix) 設定がない状態ですべて有効・向操作が効かない
* fix
* tweak
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-12-03 10:58:42 +09:00
meron
c190b720d3
feat(frontend): 絵文字ピッカーのカテゴリを多階層フォルダで分類できるように ( #12132 )
...
* Update CHANGELOG.md
* Feat:emoji picker folder select
* Fix: lint error
* Fix: lint error 2
* Fix: lint error 3
* カスタム絵文字のカテゴリ表示部分が長かったので短くした
* エフェクトが壊れて出ないのを修正
* padding 18px -> 9px
* Update CHANGELOG.md
* Revert: en-US.yml
* chg: Folder -> folder
* chg: isChildrenExits -> isChildren
* chg: isChildren -> categoryFolderFlag
* カテゴリ末尾が / の場合ピッカーから消失するので「その他」と扱い対応
* 特定のパターンのカテゴリ名でピッカーに出てこないのを修正
「i18n.ts.other」や「/」始まりの場合壊れる
* chg: categoryFolderFlag -> hasChildSection
* code format
* Del: ti-fw
* fix
* 絵文字とフォルダの表示順序入れ替え
* ネストした場合にパネルでどこまでがどのフォルダのものかをわかりやすくした
* fix lint
* カテゴリの名前が長いと表示がおかしくなる問題を修正
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: atsuchan <83960488+atsu1125@users.noreply.github.com>
Co-authored-by: Masaya Suzuki <15100604+massongit@users.noreply.github.com>
Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>
Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
Co-authored-by: xianon <xianon@hotmail.co.jp>
Co-authored-by: kabo2468 <28654659+kabo2468@users.noreply.github.com>
Co-authored-by: YS <47836716+yszkst@users.noreply.github.com>
Co-authored-by: Khsmty <me@khsmty.com>
Co-authored-by: Soni L <EnderMoneyMod@gmail.com>
Co-authored-by: mei23 <m@m544.net>
Co-authored-by: daima3629 <52790780+daima3629@users.noreply.github.com>
Co-authored-by: Windymelt <1113940+windymelt@users.noreply.github.com>
Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
Co-authored-by: FineArchs <133759614+FineArchs@users.noreply.github.com>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2023-12-02 15:26:46 +09:00
かっこかり
b37e8ffa69
(fix) 翻訳のダブりを解消 ( #12519 )
2023-12-02 12:05:03 +09:00
mattyatea
b7f9ad1944
Merge remote-tracking branch 'misskey-mattyatea/schedule-note' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# packages/backend/src/core/RoleService.ts
# packages/frontend/src/components/MkNoteHeader.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/const.ts
# packages/frontend/src/navbar.ts
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/admin/roles.vue
2023-12-02 00:50:04 +09:00
mattyatea
1802c5da5f
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/navbar.ts
2023-12-02 00:47:40 +09:00
かっこかり
b05d71fabf
feat(frontend): 今日誕生日のフォロー中のユーザーを一覧表示できるウィジェットを追加 ( #12450 )
...
* (add) 今日誕生日のフォロイー一覧表示
* Update Changelog
* Update Changelog
* 実装漏れ
* create index
* (fix) index
2023-11-30 14:49:26 +09:00
GrapeApple0
28cb0fc70b
enhance: 設定したタグをトレンドに表示させないようにする項目を管理画面で設定できるように ( #12512 )
...
* enhance: hiddenTagsを管理画面で設定できるように
* Update locales/ja-JP.yml
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-11-30 14:35:56 +09:00
かっこかり
1a54663956
Merge branch 'develop' into schedule-note
2023-11-27 21:21:25 +09:00
かっこかり
2a451ebb57
enhance(frontend): 通知音にドライブのファイルを使用できるように ( #12447 )
...
* (enhance) サウンドにドライブのファイルを使用できるように
* Update Changelog
* fix
* fix design
* fix design
* Update store.ts
* (fix) ファイル名表示
* refactor
* (refactor) better types
* operationTypeとsoundTypeの混同を防止
* (refactor)
* (fix)
* enhance jsdoc
* driveFile -> _driveFile_
2023-11-27 17:33:42 +09:00
mattyatea
072b228568
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkNote.vue
2023-11-26 18:20:21 +09:00
おさむのひと
c9503da8f8
サウンド設定に「サウンドを出力しない」と「Misskeyがアクティブな時のみサウンドを出力する」を追加 ( #12342 )
...
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
2023-11-26 16:12:02 +09:00
かっこかり
5bdae9f6d0
enhance(frontend): リアクション選択時に音を流せるように ( #12441 )
...
* (add) リアクション選択時に音を鳴らせるように
* Update Changelog
* tweak sound
* tweak sound
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-11-26 13:04:44 +09:00
mattyatea
28ee4d47c0
Feat: 予約投稿の削除して編集を実装
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-11-26 05:18:59 +09:00
mattyatea
ff79746100
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/models/json-schema/user.ts
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkReactionsViewer.reaction.vue
# packages/frontend/src/pages/settings/mute-block.word-mute.vue
# packages/misskey-js/etc/misskey-js.api.md
2023-11-24 22:44:42 +09:00
Camilla Ett
30b443de55
feat(frontend): リアクションの横幅を150pxに制限するかどうかユーザーが選べるように ( #12416 )
...
* feat(frontend): リアクションの横幅を150pxに制限するかどうかユーザーが選べるように
* localesの変更をjs-JP.ymlのみに修正し、日本語をより分かりやすく
* クラス名を.icon から .limitWidthに変更
2023-11-24 08:37:27 +09:00
mappi
521db37ca7
feat 12325 ( #12425 )
2023-11-24 08:36:55 +09:00
かっこかり
ed6f866a4f
enhance/fix(AP/frontend): 最近追加されたMFMのもろもろを修正 ( #12420 )
...
* (enhance) MFM rubyが連合されるように
* Update Changelog
* Update Changelog
* (fix) unixtimeのフォールバック (AP)
* (fix) unixtimeのフォールバック (frontend)
* Update Changelog
2023-11-23 19:49:45 +09:00
anatawa12
864827f788
Hard mute ( #12376 )
...
* feat(backend,misskey-js): hard mute storage in backend
* fix(backend,misskey-js): mute word record type
* chore(frontend): generalize XWordMute
* feat(frontend): configure hard mute
* feat(frontend): hard mute notes on the timelines
* lint(backend,frontend): fix lint failure
* chore(misskey-js): update api.md
* fix(backend): test failure
* chore(frontend): check word mute for reply
* chore: limit hard mute count
2023-11-23 18:56:20 +09:00
kakkokari-gtyih
6c3d6ba955
idの混同を修正
2023-11-23 17:20:37 +09:00
かっこかり
b58d266ccd
Merge branch 'develop' into schedule-note
2023-11-20 09:31:54 +09:00
mattyatea
e3d8346e21
Merge remote-tracking branch 'misskey-original/develop' into develop
2023-11-19 17:56:14 +09:00
syuilo
b65fd34981
tweak of 2b6f789a5b
2023-11-19 10:18:57 +09:00
Nafu Satsuki
2b6f789a5b
feat(moderation): モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能を追加 (MisskeyIO#222)
...
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2023-11-18 21:07:47 +09:00
かっこかり
3413b394e9
Merge branch 'develop' into schedule-note
2023-11-18 00:21:56 +09:00
mattyatea
31a9670182
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
2023-11-17 15:06:45 +09:00
syuilo
a9a743dab9
enhance(frontend): MFMでUNIX時間を指定して日時を表示できるように
...
Resolve #12294
2023-11-17 15:05:37 +09:00
mattyatea
7bc183cbb7
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/scripts/mfm-tags.ts
2023-11-17 13:28:42 +09:00
syuilo
9d78a1a8b3
enhance(backend): make ftt db fallback configurable
2023-11-16 10:20:57 +09:00
mattyatea
36292549c5
Merge remote-tracking branch 'mi-dev/develop' into emoji-req
2023-11-15 14:24:41 +09:00
kakkokari-gtyih
7694d17b2e
(add) ロール制御
2023-11-11 18:53:25 +09:00
kakkokari-gtyih
1995400dac
change msg
2023-11-09 22:24:41 +09:00
kakkokari-gtyih
f65e85c319
(enhance) 予約登録完了したことをわかりやすく
2023-11-09 22:22:26 +09:00
kakkokari-gtyih
5fa8735cc4
tweak ui
2023-11-09 21:20:58 +09:00
mattyatea
540f531b6d
予約投稿の一覧表示、削除をできるようにした
...
dbに投稿内容を保存するようにした
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-11-09 16:09:51 +09:00
mattyatea
e133a6b6a4
いちおう動くようにはなった
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-11-06 18:15:29 +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