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
mattyatea
81182b8612
Feat:emoji folder
2023-10-18 20:51:43 +09:00
mattyatea
a3743a0622
Feat:emoji folder
2023-10-18 17:42:06 +09:00
anatawa12
5a3c6575dd
新規にフォローした人のwithRepliesをtrueにする機能を追加 ( #12048 )
...
* feat: add defaultWithReplies to MiUser
* feat: use defaultWithReplies when creating MiFollowing
* feat: update defaultWithReplies from API
* feat: return defaultWithReplies as a part of $i
* feat(frontend): configure defaultWithReplies
* docs(changelog): 新規にフォローした人のをデフォルトでTL二追加できるように
* fix: typo
* style: fix lint failure
* chore: improve UI text
* chore: make optional params of UserFollowingService.follow() object
* chore: UserFollowingService.follow() accept withReplies
* chore: add withReplies to MiFollowRequest
* chore: process withReplies for follow request
* feat: accept withReplies on 'following/create' endpoint
* feat: store defaultWithReplies in client store
* Revert "feat: return defaultWithReplies as a part of $i"
This reverts commit f2cc4fe695e3cee69f5ab14d70
2023-10-17 20:56:17 +09:00
まっちゃてぃー
198f7748ce
Merge branch 'develop' into emoji-request
2023-10-16 21:50:42 +09:00
mattyatea
81ee7d9938
fix
2023-10-16 21:46:52 +09:00
まっちゃてぃー
5efd01ba70
feat: サーバーサイレンス機能を追加 ( #12031 )
...
* feat : サーバーサイレンスを追加
* Update CHANGELOG.md
* Update CHANGELOG.md
* Update locale
* Update instance-info.vue
* update misskey-js.api.md
* lint fix
* migration fix
* 既存のものを使うように
* fix
* 色々直した
* Update packages/frontend/src/pages/admin/instance-block.vue
* Update packages/frontend/src/pages/admin/instance-block.vue
* Update packages/frontend/src/components/MkInstanceCardMini.vue
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/UserFollowingService.ts
* Update packages/backend/src/core/UserFollowingService.ts
* fix: サイレンスされてるサーバーからの投稿は全部ホームにする
* fix: undefinedでfalseを返すようにした
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-10-16 20:11:27 +09:00
mattyatea
c0c6b87c94
lint fix
2023-10-14 17:33:42 +09:00
mattyatea
57331536f2
lint fix
2023-10-14 17:00:14 +09:00
mattyatea
4abecb2bc1
rename
2023-10-14 16:38:38 +09:00
mattyatea
f9efc37eb1
絵文字申請
2023-10-14 12:39:11 +09:00
mattyatea
e13dc2fec9
.
2023-10-14 12:39:11 +09:00
tar_bin
624e5e82cd
feature: ナビメニューからプロフィールを削除してカスタム絵文字を追加
...
(cherry picked from commit 94b8cea7bb6fea37f3a5c20fb97eadc5828e1272)
2023-10-14 12:39:09 +09:00
tar_bin
4c7cd47fb6
fix: 絵文字管理画面の表示不具合の修正
...
(cherry picked from commit 5300ff763bb008699b35dc6e219b50ac1c4fd7af)
2023-10-14 12:38:52 +09:00
tar_bin
51313e7ec2
fix: ドラフトの絵文字は該当するキーを入力されても表示しないように修正
...
(cherry picked from commit f332fbc47eabc373e292076078ad673d72e6a5c9)
2023-10-14 12:38:40 +09:00
tar_bin
ffa81260ac
絵文字の登録リクエスト機能の追加
...
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
2023-10-14 12:38:20 +09:00
mattyatea
120efff6c1
difk
2023-10-13 07:26:27 +09:00
mattyatea
592c6e60a9
色々fix
2023-10-12 15:25:41 +09:00
mattyatea
bffe140ab0
ruby
2023-10-12 12:54:09 +09:00
mattyatea
2d6d1250be
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/backend/src/server/api/stream/channels/local-timeline.ts
# packages/frontend/src/pages/timeline.vue
2023-10-11 18:53:37 +09:00
syuilo
7132958948
fix(frontend): 絵文字ピッカーで横に長いカスタム絵文字が見切れる問題を修正
2023-10-11 17:58:40 +09:00
syuilo
7a8d5e5840
enhance: ローカルタイムライン、ソーシャルタイムラインで返信を含むかどうか設定可能に
...
Resolve #12001
2023-10-11 10:15:44 +09:00
mattyatea
6ad8fd3d4f
bugfix
2023-10-11 06:19:14 +09:00
mattyatea
d691a130e2
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkDrive.file.vue
# packages/frontend/src/components/MkNote.vue
2023-10-10 18:32:52 +09:00
syuilo
f5e72f7d3e
🎨 CWボタンを大きく
2023-10-10 18:08:54 +09:00
かっこかり
af1087aed4
Feat:「ファイルの詳細」ページを追加 ( #11995 )
...
* (add) ファイルビューア
* Update Changelog
* 既存のAPIを利用
* run api extratctor
* Change i18n
* (add) ページに関する説明を追加
* Update CHANGELOG
* (fix) design, classes
2023-10-10 10:43:43 +09:00
mattyatea
dd4ecf845c
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# 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
2023-10-09 19:46:43 +09:00
syuilo
6ff98846e6
fix(backend): 「ファイル付きのみ」のTLでファイル無しの新着ノートが表示される
...
Fix #11939
2023-10-09 17:48:09 +09:00
mattyatea
cba5f494ff
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/misskey-js/etc/misskey-js.api.md
2023-10-08 21:57:02 +09:00
syuilo
274c21e2cc
chore(backend): tweak MkInput
2023-10-08 17:57:48 +09:00
かっこかり
4bbfc98883
Feat: タイムライン更新中に広告を挿入 ( #11989 )
...
* Feat: タイムライン更新中に広告を挿入
* 翻訳を変更
* Run api extractor
* fix api extractor
* Update locales/ja-JP.yml
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* confirm -> mkinfo
* MkInputにmin, maxを指定できるように
* 負の値が指定されたら何もしない
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-10-08 17:56:44 +09:00
mattyatea
38b9bc3a4d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints/users/notes.ts
2023-10-08 15:44:52 +09:00
syuilo
774bf6a55e
enhance(frontend): make default volume of video 30%
2023-10-08 14:01:40 +09:00
mattyatea
b09bfd5ad2
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints/notes/global-timeline.ts
# packages/backend/src/server/api/endpoints/notes/local-timeline.ts
# packages/backend/src/server/api/endpoints/notes/timeline.ts
# packages/misskey-js/etc/misskey-js.api.md
2023-10-07 20:19:36 +09:00
かっこかり
5e8c0deab3
プライバシーポリシー・運営者情報のリンクを追加 ( #11925 )
...
* 運営者情報・プライバシーポリシーリンクを追加
* Update Changelog
* Run api extractor
* プライバシーポリシー・利用規約の同意をまとめる
* Update Changelog
* fix lint
* fix
* api extractor
* improve design
* nodeinfoにプライバシーポリシー・運営者情報を追加
2023-10-07 13:13:13 +09:00
mattyatea
4357c75a44
ミュート周り
2023-10-07 09:50:02 +09:00
mattyatea
8fb73c63d3
2023.10.0-beta.5-prismisskey.2
2023-10-07 09:40:58 +09:00
mattyatea
c3ced9b75f
Revert "revert: note editing"
...
This reverts commit b4032988
2023-10-07 07:42:27 +09:00
mattyatea
560482315b
Merge remote-tracking branch 'misskey-original/develop' into timeline-toka
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/server/api/endpoints/admin/emoji/add.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/MkNote.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/pages/timeline.vue
# pnpm-lock.yaml
2023-10-07 04:15:59 +09:00
mattyatea
696417140f
リモートユーザーの情報更新簡単にした
2023-10-06 08:35:41 +09:00
mattyatea
449c87262b
console.log消しわさ売れ
2023-10-06 08:17:19 +09:00
mattyatea
ef3dac4b1e
Merge branch 'drive' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# packages/frontend/src/components/MkDrive.folder.vue
# packages/frontend/src/components/MkDrive.navFolder.vue
# packages/frontend/src/components/MkDrive.vue
2023-10-06 08:09:04 +09:00
mattyatea
12d56d69bb
test
2023-10-06 08:08:01 +09:00
mattyatea
c345383374
ドライブで複数選択できるようにした
2023-10-06 08:01:42 +09:00
anatawa12
ee483f2dee
Disallow renote of direct note ( #11970 )
...
* chore: renoteに関するチェックをまとめる
* fix: ダイレクト投稿をrenoteできる
* fix(frontend): 自分のダイレクト投稿をrenoteできる
* docs(changelog): ダイレクト投稿をリノートできてしまう
* fix lint
* chore(backend): visibilityに関するエラーをApi Errorとして返す
2023-10-05 17:03:50 +09:00
syuilo
b40329887f
revert: note editing
2023-10-04 12:05:01 +09:00
mattyatea
a0927c5353
ドライブ複数選択できるようになった可能性がある
2023-10-04 01:00:59 +09:00
syuilo
6277a5545c
feat: improve tl performance ( #11946 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* Update NoteCreateService.ts
* wip
* wip
* wip
* wip
* Update NoteCreateService.ts
* wip
* Update NoteCreateService.ts
* wip
* Update user-notes.ts
* wip
* wip
* wip
* Update NoteCreateService.ts
* wip
* Update timeline.ts
* Update timeline.ts
* Update timeline.ts
* Update timeline.ts
* Update timeline.ts
* wip
* Update timelines.ts
* Update timelines.ts
* Update timelines.ts
* wip
* wip
* wip
* Update timelines.ts
* Update misskey-js.api.md
* Update timelines.ts
* Update timelines.ts
* wip
* wip
* wip
* Update timelines.ts
* wip
* Update timelines.ts
* wip
* test
* Update activitypub.ts
* refactor: UserListJoining -> UserListMembership
* Update NoteCreateService.ts
* wip
2023-10-03 20:26:11 +09:00
mattyatea
582a6948e5
いいかんじ
2023-09-29 23:18:18 +09:00
