かっこかり
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
30dc6e691d
lint fix
2023-11-18 21:04:00 +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
9e9c76fa57
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
2023-11-17 18:33:39 +09:00
syuilo
4b3f9bd9a6
enhance(backend): MFMのunixtimeをISO形式で連合するように
2023-11-17 15:44:36 +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
かっこかり
49e0681f80
Merge branch 'develop' into schedule-note
2023-11-16 02:51:53 +09:00
syuilo
be6778ac61
chore(backend): improve performance
2023-11-15 16:10:05 +09:00
mattyatea
36292549c5
Merge remote-tracking branch 'mi-dev/develop' into emoji-req
2023-11-15 14:24:41 +09:00
mattyatea
d439dd66f9
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkNotifications.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/ui/_common_/navbar.vue
# packages/frontend/src/ui/_common_/stream-indicator.vue
2023-11-15 13:32:09 +09:00
kakkokari-gtyih
7694d17b2e
(add) ロール制御
2023-11-11 18:53:25 +09:00
かっこかり
ca5bb20cc1
Merge branch 'develop' into schedule-note
2023-11-11 16:45:58 +09:00
atsuchan
50430e310a
Fix: latestRequestReceivedAt ( #12270 )
2023-11-11 14:51:29 +09:00
かっこかり
0a29c8de90
Merge branch 'develop' into schedule-note
2023-11-09 23:43:40 +09:00
GrapeApple0
28e394eddc
fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないように ( #12263 )
...
* fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないように
* Update CHANGELOG.md
2023-11-09 21:35:07 +09:00
kakkokari-gtyih
3439a29c14
(refactor) better types
2023-11-09 21:20:33 +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
Marie
2cce28533f
fix(backend): isBot not being set on Application type ( #12248 )
...
* fix: bot not being set on all relays
* updatePerson missing the change
* chore: replace wrong word with correct word
2023-11-05 10:22:10 +09:00
syuilo
c2ddb649f8
enhance: 非通知なお知らせを作成できるように
2023-11-05 09:04:38 +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
かっこかり
24e629ca5c
enhance: 初期設定とチュートリアルを統合 ( #12141 )
...
* better onboarding experience
* enhance: iroiro
* (add) title
* (enhance) 戻る・次へボタンを全ページでstickyに
* fix merging
* (add) iroiro
* remove unnecessary file
* Update CHANGELOG.md
* tweak texts
* (fix) reactionViewer mock
* change strings
* Update MkTutorialDialog.Note.vue
* Update ja-JP.yml
* (fix) reactionViewer error
* (fix) path
* refactor
* fix
* Update MkPostForm.vue
* Update ja-JP.yml
* Update ja-JP.yml
* tweak text
* Update ja-JP.yml
* Update ja-JP.yml
* Update ja-JP.yml
* (add) achivement
* (add) もう一度見れますよメッセージを追加
* Revert "feat: レジストリAPIをサードパーティから利用可能に (#12229 )"
This reverts commit 79346272f86123b35215#12229 )""
This reverts commit bae684e484
2023-11-03 15:35:07 +09:00
syuilo
79346272f8
feat: レジストリAPIをサードパーティから利用可能に ( #12229 )
...
* wip
* wip
* Update remove.ts
* refactor
2023-11-03 13:23:03 +09:00
mattyatea
ed261d3b99
Merge remote-tracking branch 'mi-dev/develop' into emoji-req
...
# Conflicts:
# packages/misskey-js/etc/misskey-js.api.md
2023-11-03 03:15:23 +09:00
mattyatea
5335e68bde
Feat:ゴリラモード
2023-11-02 16:51:03 +09:00
mattyatea
10d38335f2
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/EndpointsModule.ts
# packages/frontend/src/pages/settings/general.vue
2023-11-02 16:07:27 +09:00
syuilo
f62ad3ed3e
feat: notification grouping
...
Resolve #12211
2023-11-02 15:57:55 +09:00
mattyatea
b1b6966b6b
?
2023-11-02 10:16:01 +09:00
mattyatea
d720501c82
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkLaunchPad.vue
# packages/frontend/src/ui/_common_/navbar-for-mobile.vue
# packages/frontend/src/ui/_common_/navbar.vue
# packages/frontend/src/ui/universal.vue
2023-11-02 06:47:13 +09:00
syuilo
9b073e5fe6
fix
2023-11-01 15:32:35 +09:00
syuilo
7ed2a5fc1b
perf(backend): remove needless query
...
#12206
2023-11-01 13:55:19 +09:00
かっこかり
5fb6847419
Feat: 未読通知数を表示できるように ( #11982 )
...
* 未読通知数を表示できるように
* Update Changelog
* オプトインにする
* Fix lint
* (add) テスト通知のプッシュ通知を追加
* add test
* フロントエンドの表示上限を99に変更
* Make it default on
* 共通スタイルをくくりだす
* Update Changelog
* tweak
* Update UserEntityService.ts
* rename
* Update navbar-for-mobile.vue
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-11-01 13:34:05 +09:00
mattyatea
7703b2e5f8
fix
2023-11-01 05:24:45 +09:00
mattyatea
56ea04cb0b
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/ui/_common_/common.ts
2023-11-01 05:23:55 +09:00
syuilo
a35fe29ef4
fix(backend): アクセストークンを削除すると、通知が取得できなくなる場合がある問題を修正
2023-10-31 11:45:03 +09:00
mattyatea
9199a493f1
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/RoleService.ts
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/const.ts
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/store.ts
# packages/frontend/src/ui/_common_/stream-indicator.vue
# packages/frontend/src/ui/universal.vue
2023-10-30 18:33:03 +09:00
syuilo
28dd05216f
lint fixes
2023-10-30 17:34:54 +09:00
syuilo
6a8375b045
Merge branch 'develop' into pr/12085
2023-10-30 16:24:24 +09:00
GrapeApple0
4f180ad45c
feat: アイコンデコレーションの管理をロールで設定できるように ( #12173 )
...
* アイコンデコレーションの管理をロールで設定できるように
* インポートミス
* Update packages/frontend/src/ui/_common_/common.ts
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* Update packages/frontend/src/ui/_common_/common.ts
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-10-30 15:33:15 +09:00
anatawa12
7015cc937b
fix(backend): We can renote pure renote ( #12171 )
...
* chore: make pure renote detection an function
* fix: we can renote pure renote
* docs(changelog): リノートをリノートできるのを修正
* fix: remaining debug log
* chore: move isPureRenote to misc
* chore: make isPureRenote type guard
* chore: use isPureRenote in other places
* fix CHANGELOG
* style: fix lint
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-10-30 13:48:22 +09:00
かっこかり
117db08880
fix(backend): プロフィールの自己紹介欄のMFMを連合するように（実装漏れ） ( #12185 )
...
* (refactor) eliminate nested ternary operation
* fix lint
* Jissou more
2023-10-30 08:20:32 +09:00
mattyatea
78d1e9eabd
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
2023-10-29 19:39:54 +09:00
かっこかり
59cc101752
fix(backend): プロフィールの自己紹介欄のMFMを連合するように ( #12184 )
...
* (fix) federate user description mfm
* fix
* Update Changelog
2023-10-29 19:33:35 +09:00
mattyatea
04c3420420
update CustomEmojiService.ts
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-28 17:17:16 +09:00
mattyatea
1ed0e7e8a3
update CustomEmojiService.ts
...
update add-request.ts
update delete.ts
update DriveFileEntityService.ts
update update-request.ts
update update.ts
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-28 16:58:36 +09:00
mattyatea
1a6f0026e6
Merge remote-tracking branch 'mi-dev/develop' into emoji
...
# Conflicts:
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
2023-10-28 16:49:06 +09:00
mattyatea
7e155917e7
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
2023-10-28 16:06:07 +09:00
