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
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
YS
d92aaf81c4
refactor: noteテーブルのインデックス整理と配列カラムへのクエリでインデックスを使うように ( #12993 )
...
* Optimize note model index
* enhance(backend): ANY()をやめる (MisskeyIO#239)
* add small e2e test drive endpoint
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-01-15 08:19:27 +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
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
085a93b9fc
AvatarDecoration federation
...
and more fix
2024-01-04 14:16:28 +09:00
mattyatea
09b1bac3ad
bug fix
2024-01-03 01:33:20 +09:00
mattyatea
6a06ec1347
2023.12.2-PrisMisskey.2
...
bug fix
2024-01-03 01:32:22 +09:00
mattyatea
b7102f67af
アイコンデコレーションのカテゴリ
2024-01-03 01:26:44 +09:00
mattyatea
8cb7ba0c16
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkPostForm.vue
2023-12-30 09:11:09 +09:00
MomentQYC
7948018e6a
feat: Add support for TrueMail ( #12850 )
...
Co-authored-by: MarryDream <2190758465@qq.com>
2023-12-29 18:23:29 +09:00
mattyatea
8d058b0529
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/mute-block.vue
# packages/frontend/src/pages/settings/theme.vue
# packages/frontend/src/ui/_common_/navbar-for-mobile.vue
2023-12-26 23:38:43 +09:00
おさむのひと
36701f8a7c
fix(backend): 1702718871541-ffVisibility.jsのdownが壊れている ( #12767 )
2023-12-24 15:24:26 +09:00
mattyatea
09fbfee252
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/EmailService.ts
# packages/frontend/src/components/MkSignupDialog.form.vue
2023-12-23 23:16:48 +09:00
GrapeApple0
5b5a537f56
feat: 登録を拒否するメールアドレスのドメインを手動で設定できるように ( #12740 )
...
* feat: 使い捨てアドレスのドメインを手動で設定できるように
* Update CHANGELOG.md
* disposableEmailDomains -> bannedEmailDomains
* isBlockedHostを使うように
2023-12-23 12:06:22 +09:00
mattyatea
a03814feae
多分動くと思うからリリースしようぜ
2023-12-23 10:52:18 +09:00
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
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
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
かっこかり
1a54663956
Merge branch 'develop' into schedule-note
2023-11-27 21:21:25 +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
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
かっこかり
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
Nafu Satsuki
0a73973a7c
メールアドレスの認証にverifymail.ioを使えるようにする。
2023-11-18 21:01:53 +09:00
かっこかり
3413b394e9
Merge branch 'develop' into schedule-note
2023-11-18 00:21:56 +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
mattyatea
271c872c97
expiresAt to scheduledAt
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-11-14 17:27:52 +09:00
mattyatea
540f531b6d
予約投稿の一覧表示、削除をできるようにした
...
dbに投稿内容を保存するようにした
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-11-09 16:09:51 +09:00
mattyatea
387faf55cf
dbに保存するようにした
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-11-08 15:33:46 +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
c2ddb649f8
enhance: 非通知なお知らせを作成できるように
2023-11-05 09:04:38 +09:00
mattyatea
4d9db395eb
migrate push
2023-11-04 01:33:23 +09:00
mattyatea
cb1005811d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/en-US.yml
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/components/MkDrive.file.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteHeader.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkReactionsViewer.reaction.vue
# packages/frontend/src/components/MkUserSetupDialog.vue
# packages/frontend/src/pages/timeline.tutorial.vue
# packages/frontend/src/pages/timeline.vue
# packages/misskey-js/etc/misskey-js.api.md
2023-11-04 01:24:44 +09:00
おさむのひと
39a3f4ae98
feat: チャンネル内→チャンネル外へのリノート制限機能追加 ( #12230 )
...
* チャンネル内→チャンネル外へのリノート制限機能追加
* fix CHANGELOG.md
* コメント対応(canRenoteSwitch→allowRenoteToExternal)
* コメント対応(別チャンネルへのリノート対策)
* コメント対応(canRenote->allowRenoteToExternal)
* fix comment
* Update misskey-js.api.md
* ✌️
---------
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-11-03 17:34:23 +09:00
mattyatea
fa2447e71b
migration file
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-24 20:46:08 +09:00
mattyatea
cc5037cb85
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/frontend/package.json
2023-10-23 19:29:34 +09:00
syuilo
e6c54de814
enhance(backend): RedisへのTLのキャッシュをオフにできるように
2023-10-23 15:17:25 +09:00
mattyatea
ec5bb48d6b
Merge remote-tracking branch 'misskey-original/develop' into develop
2023-10-22 13:15:38 +09:00
syuilo
4eaa02d25f
enhance: improve avatar decoration
2023-10-22 13:02:24 +09:00
mattyatea
366ea80a06
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/package.json
# packages/frontend/src/components/MkMention.vue
# packages/frontend/src/components/global/MkAvatar.vue
# packages/frontend/src/pages/settings/general.vue
2023-10-21 20:47:50 +09:00
syuilo
2c0a139da6
feat: Avatar decoration ( #12096 )
...
* wip
* Update ja-JP.yml
* Update profile.vue
* .js
* Update home.test.ts
2023-10-21 18:38:07 +09:00