mattyatea
6cc503dfc9
fix
2023-10-18 23:14:25 +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
syuilo
52a82ac193
Update about-misskey.vue
2023-10-18 10:07:21 +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
c59a31375e
Merge remote-tracking branch 'mi-dev/develop' into emoji-request
2023-10-16 21:01:02 +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
syuilo
3ebed5aa3e
feat: local-only antenna
...
Resolve #11869
2023-10-16 15:06:00 +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
da0c22ece6
fix
2023-10-14 13:37:50 +09:00
mattyatea
f9efc37eb1
絵文字申請
2023-10-14 12:39:11 +09:00
tar_bin
ad27562269
絵文字の登録リクエスト機能の追加
...
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
2023-10-14 12:39:11 +09:00
tar_bin
40979b0aa5
絵文字の登録リクエスト機能の追加
...
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
2023-10-14 12:39:11 +09:00
tar_bin
4c7cd47fb6
fix: 絵文字管理画面の表示不具合の修正
...
(cherry picked from commit 5300ff763bb008699b35dc6e219b50ac1c4fd7af)
2023-10-14 12:38:52 +09:00
tar_bin
21bee2ffde
カスタム絵文字のリクエスト承認用画面の追加
...
(cherry picked from commit 94451c380458b459791fc2bb6864a3255aca03c4)
2023-10-14 12:38:40 +09:00
tar_bin
bf9089209d
カスタム絵文字一覧を一覧、新着、申請中に分離
...
(cherry picked from commit 5c464cd1bc177f0276397a686160c5c77e774d10)
2023-10-14 12:38:40 +09:00
tar_bin
b138752ccb
fix: 絵文字を追加した後に画像のリンクがエラーになる不具合の集背
...
(cherry picked from commit d23cc54a11ef1a1fe1d06bda4cc1b15e29638ed7)
2023-10-14 12:38:40 +09:00
tar_bin
d607f34380
絵文字ダイアログの不具合の修正
...
(cherry picked from commit c9d6c17353a663bf68cdea9bcef100f5de5edb68)
2023-10-14 12:38:37 +09:00
tar_bin
ffa81260ac
絵文字の登録リクエスト機能の追加
...
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
2023-10-14 12:38:20 +09:00
syuilo
096fa16c4c
enhance(frontend): TLの返信表示オプションを記憶するように
...
Resolve #12016
2023-10-13 16:49:56 +09:00
syuilo
04908bc90c
.js
2023-10-13 16:42:57 +09:00
mattyatea
120efff6c1
difk
2023-10-13 07:26:27 +09:00
mattyatea
40469aa0ce
逆張りモードの実装
2023-10-12 18:02:55 +09:00
mattyatea
592c6e60a9
色々fix
2023-10-12 15:25:41 +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
7a8d5e5840
enhance: ローカルタイムライン、ソーシャルタイムラインで返信を含むかどうか設定可能に
...
Resolve #12001
2023-10-11 10:15:44 +09:00
mattyatea
2e7c034b99
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# CHANGELOG.md
# packages/backend/src/server/api/endpoints/channels/timeline.ts
2023-10-11 06:22:57 +09:00
syuilo
51b6a012a5
fix(frontend): ユーザープロフィールページでセンシティブなメディアが隠されない問題を修正
2023-10-10 19:49:25 +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
9dd0f8c39b
clean up
2023-10-10 16:25:06 +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
19a507633e
lint fixes
2023-10-09 15:37:58 +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
ca022cbbdf
Update about-misskey.vue
2023-10-08 18:04:56 +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
271d3483b2
bug fix
2023-10-08 00:25:33 +09:00
mattyatea
d4785c6420
isSensitive
2023-10-07 20:19:42 +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
mattyatea
a1094a3efc
isSensitive
2023-10-07 20:14:29 +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
abb79a0b36
ユーザーのページでノートを表示するかハイライトを表示するか決められるようにした
2023-10-07 10:40:08 +09:00
mattyatea
c3ced9b75f
Revert "revert: note editing"
...
This reverts commit b4032988
2023-10-07 07:42:27 +09:00
mattyatea
89550c5bef
fix
2023-10-07 07:17:56 +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
syuilo
a5b6e807bb
feat: per user featured notes
2023-10-06 18:30:08 +09:00
mattyatea
696417140f
リモートユーザーの情報更新簡単にした
2023-10-06 08:35:41 +09:00
