moris/mi.moris.day
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity
25,371 Commits 49 Branches 1,053 Tags 318 MiB
d19a4ab8a3
Commit Graph

104 Commits

Author SHA1 Message Date
mattyatea
d19a4ab8a3 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/stream/ChannelsService.ts
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/mute-block.vue
 2023-12-28 04:42:28 +09:00
Chocolate Pie
c96bc36fed
Merge pull request from GHSA-7pxq-6xx9-xpgm 
* fix: fix improper authorization when accessing with third-party application

* refactor: refactor type definitions

* fix: get rid of unnecessary access limitation

* enhance: サードパーティアプリケーションがWebsocket APIを使えるように

* fix: add missing parentheses

* Revert "fix(backend): add missing kind definition for admin endpoints to improve security"

This reverts commit 5150053275.

* frontend: 翻訳の抜けを訂正, read:adminとwrite:adminはアクセス発行トークンのデフォルトでは非表示にする

* enhance(test): misskey-ghsa-7pxq-6xx9-xpgmに関するテストを追加

* enhance(test): Websocket APIに対するテストも追加

* enhance(refactor): `@/misc/api-permissions.ts`を`misskey-js/permissions`に統合

* fix(frontend): アクセストークン発行UIで全ての権限を有効にした際、管理者用APIへのアクセスも許可してしまう問題を修正

* enhance(backend): Websocketの接続に最低限必要な権限を変更

* fix(backend): `/api/admin/meta`をサードパーティアプリケーションからはアクセスできないように

* fix(backend): エンドポイントにアクセスするために必要な権限を変更

* fix(frontend/locale): Add missing type declaration

* chore: update `misskey-js/src/autogen`

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2023-12-27 15:08:59 +09:00
mattyatea
68b48bc16f Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop 
# Conflicts:
#	CHANGELOG.md
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/core/CustomEmojiService.ts
#	packages/backend/src/models/RepositoryModule.ts
#	packages/backend/src/server/api/EndpointsModule.ts
#	packages/backend/src/server/api/endpoints.ts
#	packages/backend/src/server/api/endpoints/admin/emoji/update.ts
#	packages/frontend/src/components/MkCustomEmojiEditLocal.vue
#	packages/frontend/src/components/MkCustomEmojiEditRemote.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/pages/about.emojis.vue
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/emojis.emoji.vue
 2023-12-23 09:30:48 +09:00
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
かっこかり
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
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
かっこかり
cb00b236d2
Merge branch 'develop' into schedule-note 2023-11-14 22:18:00 +09:00
syuilo
2d2eefe3d4 feat: メールアドレスを使用してユーザー名を割り出す機能 
Resolve #10158
 2023-11-14 07:58:18 +09:00
kakkokari-gtyih
22766fc7a2 notes/schedule/create を削除 2023-11-09 23:31:57 +09:00
kakkokari-gtyih
4406af58f1 /api/notes/ -> /api/notes/schedule/ 2023-11-09 19:12:49 +09:00
mattyatea
540f531b6d
予約投稿の一覧表示、削除をできるようにした 
dbに投稿内容を保存するようにした

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-11-09 16:09:51 +09:00
mattyatea
e133a6b6a4
いちおう動くようにはなった 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-11-06 18:15:29 +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
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
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
8fd5eb7010
draftからrequestに 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-24 16:55:22 +09:00
mattyatea
53d250dddf
draft-update から update-draft に 
admin/emoji/list-draft を追加

Update MkPagination.vue

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-24 15:37:43 +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
mattyatea
27a7d0bbf7
Merge remote-tracking branch 'mi-dev/develop' into emoji 
# Conflicts:
#	packages/backend/src/models/RepositoryModule.ts
#	packages/misskey-js/etc/misskey-js.api.md
 2023-10-21 19:56:27 +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
anatawa12
722584bf72
すべてのフォロー中の人のwithRepliesを変える機能 (#12049) 
* feat: endpoint to update all following

* feat(frontend): change show replies for all

* docs(changelog): すでにフォローしたすべての人の返信をTLに追加できるように

* fix: cancel not working
 2023-10-21 18:39:19 +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
fe938bf8e6
Feat: 絵文字申請中のやつのテーブルを分けた 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-21 16:29:53 +09:00
tar_bin
08311ece41
Feat:絵文字申請機能の追加 2023-10-19 22:18:30 +09:00
mattyatea
80d652746d remove hybrid-all-timeline and update 2023-10-18 22:40:40 +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
tar_bin
ffa81260ac 絵文字の登録リクエスト機能の追加 
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
 2023-10-14 12:38:20 +09:00
mattyatea
592c6e60a9 色々fix 2023-10-12 15:25:41 +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
syuilo
a5b6e807bb feat: per user featured notes 2023-10-06 18:30:08 +09:00
syuilo
b40329887f revert: note editing 2023-10-04 12:05:01 +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
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
bc12bba97d 絵文字の追加周り 2023-09-26 10:54:01 +09:00
mattyatea
6e0b64bebe Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-21 19:08:33 +09:00
syuilo
e3f151e230 feat: 指定したユーザーの投稿通知 
Resolve #11499
 2023-09-21 18:48:15 +09:00
mattyatea
94a7eca882 Merge remote-tracking branch 'misskey-dev/develop' into develop 
# Conflicts:
#	package.json
 2023-09-11 18:57:08 +09:00
かっこかり
cd6428715e
feat: テスト通知を送信できるようにする (#11810) 
* (add) Notification test

* Update Changelog

* (add) backend, frontend impl

* globalEventの名前を明確にする

* Run API Extractor
 2023-09-11 14:31:50 +09:00
mattyatea
e1b22165db feat: 管理者権限を持ってる人はローカルの非公開投稿(ホーム)も見れるようなTLを追加 2023-09-03 19:42:42 +09:00
GrapeApple0
70a7800927
プロフィールにその人が作ったPlayの一覧出せるように (#11445) 
* プロフィールにその人が作ったPlayの一覧出せるように

* Update CHANGELOG.md

* playの公開範囲を設定できるように

* 間違えて変更してしまったのを修正

* Update packages/frontend/src/pages/flash/flash-edit.vue

* Update packages/frontend/src/pages/flash/flash-edit.vue

* tweak

* Update packages/backend/migration/1690796169261-play-visibility.js

* Update packages/backend/src/models/entities/Flash.ts

* Update packages/backend/src/models/entities/Flash.ts

* Update Flash.ts

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-08-21 20:23:09 +09:00
woxtu
dd1783f984
chore(backend): Resolve import/no-default-export rule violations (#11732) 
* Disable `import/no-default-export` properly

* Disable `import/no-default-export`
 2023-08-17 21:20:58 +09:00
Shun Sakai
c2370a1be6
chore: 著作権とライセンスについての情報を各ファイルに追加する (#11348) 
* chore: Add the SPDX information to each file

Add copyright and licensing information as defined in version 3.0 of
the REUSE Specification.

* tweak format

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-07-27 14:31:52 +09:00