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
かっこかり
1a54663956
Merge branch 'develop' into schedule-note
2023-11-27 21:21:25 +09:00
syuilo
51cf906b25
update deps
2023-11-27 21:05:20 +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
kakkokari-gtyih
c95cbbc9b6
fix api extractor
2023-11-23 17:22:28 +09:00
kakkokari-gtyih
a2ea072deb
fix api extractor
2023-11-23 15:57:10 +09:00
かっこかり
8d28c2f9d7
Merge branch 'develop' into schedule-note
2023-11-23 15:52:52 +09:00
syuilo
77ac51a680
update typescript to 5.3
2023-11-21 11:32:13 +09:00
anatawa12
2ec3227012
update api.md ( #12379 )
...
for API changes in b65fd34981
2023-11-21 10:48:01 +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
0e5686a16b
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
2023-11-17 15:10:22 +09:00
syuilo
4f9922d46c
update deps
2023-11-17 15:10:04 +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
かっこかり
cb00b236d2
Merge branch 'develop' into schedule-note
2023-11-14 22:18:00 +09:00
syuilo
30bb24d18c
update deps
2023-11-14 10:35:48 +09:00
kakkokari-gtyih
22766fc7a2
notes/schedule/create を削除
2023-11-09 23:31:57 +09:00
kakkokari-gtyih
2bc15c09ed
(enhance) notes/create で予約投稿できるように
2023-11-09 23:31:16 +09:00
kakkokari-gtyih
4406af58f1
/api/notes/ -> /api/notes/schedule/
2023-11-09 19:12:49 +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
syuilo
1729307fcf
update deps
2023-11-03 14:41:21 +09:00
syuilo
79346272f8
feat: レジストリAPIをサードパーティから利用可能に ( #12229 )
...
* wip
* wip
* Update remove.ts
* refactor
2023-11-03 13:23:03 +09:00
Tom Anderson
e333e7ced8
docs: Remove forum references and use Github Discussions ( #12158 )
...
* docs: Replace forum with Github Discussions
* Remove outdated forum link from CONTRIBUTING.md
* Remove outdated forum link from misskey-js/CONTRIBUTING.md
* Remove outdated forum link from misskey-js/docs/CONTRIBUTING.en.md
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
2023-11-02 19:57:43 +09:00
mattyatea
5335e68bde
Feat:ゴリラモード
2023-11-02 16:51:03 +09:00
mattyatea
c2208fb1c5
インジケーターとか
2023-11-02 14:32:07 +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
77db652bff
update deps
2023-11-01 14:06:54 +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
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
syuilo
a8dc6d08b1
update deps
2023-10-28 12:31:18 +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
fdeee5dd05
update deps
2023-10-23 09:20:55 +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
かっこかり
f51bca41c5
Feat: 外部サイトからテーマ・プラグインのインストールができるように ( #12034 )
...
* Feat: 外部サイトからテーマ・プラグインのインストールができるように
* Update Changelog
* Change Changelog
* Remove unnecessary imports
* Update fetch-external-resources.ts
* Update CHANGELOG.md
* Update CHANGELOG.md
2023-10-21 18:41:12 +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
mattyatea
d421670b54
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/server/api/stream/channels/home-timeline.ts
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# pnpm-lock.yaml
2023-10-20 09:55:24 +09:00
syuilo
cc256f117e
update deps
2023-10-19 19:51:59 +09:00
A.Yamamoto
9afcdd10ed
UserLite.nameにnullが入りうるのを型で明示 ( #12073 )
...
* UserLite.nameにnullが入りうるのを型で明示
* ドキュメントの追従
2023-10-19 19:33:45 +09:00
mattyatea
87d49b5bbf
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
2023-10-19 16:43:24 +09:00
syuilo
30efd932a5
enhance: nyaizeはクライアントで表示時に行うように
...
Resolve #12030
2023-10-19 11:42:17 +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
eacb74cb44
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/entities/NoteEntityService.ts
# packages/backend/src/models/Note.ts
# packages/backend/src/server/api/endpoints/roles/notes.ts
# packages/backend/src/server/api/stream/channels/global-timeline.ts
# packages/backend/src/server/api/stream/channels/home-timeline.ts
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/backend/src/server/api/stream/channels/local-timeline.ts
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/store.ts
2023-10-18 21:22:51 +09:00
