1
0
forked from mirror/misskey
Commit Graph

744 Commits

Author SHA1 Message Date
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
mattyatea
7dbbfb657c Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
# Conflicts:
#	CHANGELOG.md
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/deck/tl-column.vue
#	pnpm-lock.yaml
2023-09-29 23:08:01 +09:00
syuilo
e5c339b86a enhance(frontend): タイムラインでファイルが添付されたノートのみ表示するオプションを追加 2023-09-29 16:56:17 +09:00
mattyatea
afc6b5b655 いいかんじ 2023-09-29 13:33:22 +09:00
syuilo
b9da1415a5 feat: 通知の受信設定を強化 2023-09-29 11:29:54 +09:00
syuilo
2438c047a7 enhance: 編集されたノートかどうか分かるように 2023-09-28 21:06:14 +09:00
mattyatea
b2df78ffcd Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
# Conflicts:
#	packages/frontend/src/components/MkPostForm.vue
2023-09-28 18:13:48 +09:00
syuilo
c106db89e1 feat: note edit 2023-09-28 17:21:16 +09:00
mattyatea
9f1a497206 いいかんじ 2023-09-28 16:48:02 +09:00
mattyatea
81f56f08b7 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
# Conflicts:
#	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/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/deck/deck-store.ts
2023-09-28 16:11:39 +09:00
taichan
63c6a9bb80
Feat: register_post_form_actionでcwを変更可能にする (#11911)
* 投稿フォームのアクション追加するプラグインでCWを変更可能にする

* Update CHANGELOG
2023-09-28 15:35:00 +09:00
syuilo
eb740e2c72 enhance: タイムラインからRenoteを除外するオプションを追加 2023-09-28 11:41:41 +09:00
syuilo
d854942a1f .js 2023-09-28 11:04:14 +09:00
mattyatea
2b72034847 mfmのやつ 2023-09-27 16:40:32 +09:00
Tassoman
9d0c077311
fix: leverage join misskey multilingual behaviour (#11908)
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
2023-09-27 13:48:21 +09:00
mattyatea
39b66a2638 色がおかしいのを修正 2023-09-26 10:56:03 +09:00
mattyatea
dd7b6f92df 公開範囲に色付け(localonly) 2023-09-26 10:54:46 +09:00
mattyatea
bc12bba97d 絵文字の追加周り 2023-09-26 10:54:01 +09:00
mattyatea
b8c4c09e59 公開範囲、見やすく。 2023-09-25 21:12:22 +09:00
mattyatea
6fef96e657 絵文字、見やすく。 2023-09-25 18:10:01 +09:00
mattyatea
9fe170a488 gaming lighting speed change 2023-09-25 02:02:33 +09:00
mattyatea
0071cb09a9 2023.9.0-prismisskey.1 2023-09-24 18:49:11 +09:00
mattyatea
ee54a5ab2a 2023.9.0-prismisskey.1 2023-09-24 18:44:08 +09:00
mattyatea
2fa2242255 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
# Conflicts:
#	package.json
2023-09-24 16:41:37 +09:00
mattyatea
4b64870ee8 fix 2023-09-24 16:39:47 +09:00
syuilo
d05563c448 tweak ui 2023-09-24 11:21:03 +09:00
mattyatea
4e9aa25394 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
# Conflicts:
#	package.json
2023-09-24 11:15:32 +09:00
syuilo
72075314a8 🎨 2023-09-24 11:08:51 +09:00
syuilo
eb7c65ccb3 fix(frontend): アクセストークン発行の画面の権限が表示されない
Fix #11880
2023-09-24 11:04:08 +09:00
taichan
ed53b5f9bc
fix: ノート通知で絵文字が使われている名前が絵文字で表示されない #11877 (#11878) 2023-09-24 07:54:58 +09:00
mattyatea
6c699f14bc fix 2023-09-24 00:33:52 +09:00
mattyatea
d56d84c664 Merge remote-tracking branch 'misskey-dev/develop' into rainbow
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/admin/emoji/add.ts
#	packages/frontend/src/components/MkMenu.vue
2023-09-23 21:00:15 +09:00
syuilo
76c4fedb7f fix(frontend): 子メニューの表示位置がおかしい 2023-09-23 20:35:05 +09:00
syuilo
c3ccec723f .js 2023-09-23 20:34:45 +09:00
mattyatea
473355a5d9 fix 2023-09-23 19:10:51 +09:00
mattyatea
6e4b8d88fd bugfix 2023-09-23 17:15:53 +09:00
mattyatea
aec6bccbdf Merge remote-tracking branch 'misskey-dev/develop' into rainbow
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkMenu.vue
2023-09-23 15:48:34 +09:00
syuilo
d8a023063d fix behavior of MkMenu.vue 2023-09-23 12:43:32 +09:00
syuilo
063d24ad4f 🎨 2023-09-23 12:24:33 +09:00
syuilo
ad8ddbf12f 🎨 2023-09-23 09:59:50 +09:00