HidemaruOwO/puyoskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
28217 commits 2 branches 1 tag 333 MiB
Commit graph

1415 commits

Author SHA1 Message Date
かっこかり
bf403aa656
fix(frontend): ベースロールを編集してもUI上では変更が反映されない問題を修正 (#13995) 
* fix(frontend): ベースロールを変更してもUI上では変更が反映されない問題を修正

* Update CHANGELOG.md
 2024-06-22 15:35:54 +09:00
ぬるきゃっと
ef205fb60e
enhance(frontend): WidgetInstanceInfo.vue と WidgetProfile.vue のスタイル調整 (#14028) 
* 🎨 WidgetInstanceInfo.vue and WidgetProfile.vue

* 🎨 WidgetInstanceInfo.vue and WidgetProfile.vue

* 🎨 WidgetInstanceInfo.vue and WidgetProfile.vue

* 🎨 WidgetInstanceInfo.vue and WidgetProfile.vue

* 🎨 home.vue
 2024-06-22 12:46:30 +09:00
かっこかり
7e21497edc
fix(frontend): リバーシ開始時の自動投稿のURLが正しくない場合があるのを修正 (#14045) 
* fix(frontend): リバーシ開始時の自動投稿のURLが正しくない場合があるのを修正

* ✌️
 2024-06-22 12:45:37 +09:00
woxtu
4d2eddec2e
Replace with vue/no-setup-props-reactivity-loss rule (#14062) 2024-06-22 12:40:00 +09:00
dakkar
385ecc30a3 don't await in <setup> 
`defineAsyncComponent` exists for exactly this purpose…
 2024-06-21 11:41:08 +01:00
dakkar
513a8e5de4 select note component in <setup> 
this makes our templates much more similar to upstream's, making
merges simpler

changing note design is already marked as needing a reload, so having
non-reactive code that selects the note component is not a problem
 2024-06-21 11:17:11 +01:00
KevinWh0
da63519854 add .js to import in general.vue 2024-06-18 15:45:00 +01:00
KevinWh0
72c8391208 change notificationDotNotWorkingAdvice wording 2024-06-18 15:45:00 +01:00
KevinWh0
a3ff0510fb added docs for how to enable it 2024-06-18 15:45:00 +01:00
KevinWh0
88eb1a0c53 fixes & add button to see if notification dot works 2024-06-18 15:44:58 +01:00
woxtu
f37d684fab
Add missing styles (#14031) 2024-06-18 19:46:20 +09:00
dakkar
b525c5887f add copyright text to all our files 2024-06-15 11:36:55 +01:00
dakkar
d27965d8b3 remove duplicate switches 
I got confused in the last merge from `develop`
 2024-06-14 11:40:22 +01:00
dakkar
fdd9df8ae9 Merge branch 'develop' into future-2024-05-31 2024-06-14 11:19:13 +01:00
dakkar
a22450d4f3 merge: feat: add an option to collapse replies (!545) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/545

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-06-14 10:13:59 +00:00
dakkar
b2cbd507fe Merge branch 'develop' into future-2024-05-31 2024-06-13 09:06:24 +01:00
dakkar
fef64e9c69 merge: Choosing search engines for search mfm (!547) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/547

Approved-by: Luna <her@mint.lgbt>
Approved-by: Marie <marie@kaifa.ch>
 2024-06-13 07:58:06 +00:00
KevinWh0
62f54713bc fixing some things 2024-06-12 14:46:20 +02:00
KevinWh0
c87ed51311 made it so you can pick a search engine 2024-06-12 13:35:37 +02:00
Kisaragi
ff3a38a7f5
fix(frontend): 追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968) 
* fix(frontend): 追加情報のラベルを投稿者のサーバーの絵文字で表示する

* docs: update changelog
 2024-06-12 10:52:22 +09:00
dakkar
fe0d95b277 remove duplicate settings switch 2024-06-11 15:48:25 +01:00
Sugar
c808147292 replace reply with inReplyTo in in-reply-to collapse code 2024-06-11 16:28:09 +02:00
Sugar
c9d0b81555 feat: add an option to collapse replies 2024-06-11 15:25:43 +02:00
dakkar
6060fdcae7 merge: celebrate our testers - fixes #552 (!543) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/543

Closes #552

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
 2024-06-09 15:23:32 +00:00
Tess K
df333d1855 merge: Add tess to contributor list (!542) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/542

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-06-09 12:55:42 +00:00
dakkar
2768245bc7 fix link to "all contributors" graphs 2024-06-09 10:11:54 +01:00
dakkar
450b2abdae add section for testers in about page 2024-06-09 10:11:40 +01:00
tess
5bbdd07c95 Add tess to contributor list 2024-06-09 03:46:08 +02:00
dakkar
e7fcdd47e5 another semicolon 2024-06-08 17:34:48 +01:00
dakkar
5dc8c2827c Merge branch 'develop' into future-2024-05-31 2024-06-08 16:45:53 +01:00
おさむのひと
61fae45390
feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする (#13758) 
* feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする

* モデログに対応＆エンドポイントを単一オブジェクトでのサポートに変更（API経由で大量に作るシチュエーションもないと思うので）

* fix spdx

* fix migration

* fix migration

* fix models

* add e2e webhook

* tweak

* fix modlog

* fix bugs

* add tests and fix bugs

* add tests and fix bugs

* add tests

* fix path

* regenerate locale

* 混入除去

* 混入除去

* add abuseReportResolved

* fix pnpm-lock.yaml

* add abuseReportResolved test

* fix bugs

* fix ui

* add tests

* fix CHANGELOG.md

* add tests

* add RoleService.getModeratorIds tests

* WebhookServiceをUserとSystemに分割

* fix CHANGELOG.md

* fix test

* insertOneを使う用に

* fix

* regenerate locales

* revert version

* separate webhook job queue

* fix

* 🎨

* Update QueueProcessorService.ts

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-06-08 15:34:19 +09:00
dakkar
43c0ffe7f8 better block display for <bdi> elements 
We use MfM in all sorts of places, and only some of them are actual
blocks. We can now tell the `Mfm` component to make the top-level
`<bdi>` a block when we need to (mostly note bodies, user
descriptions, announcements) and leave it inline in all other places.

This should still rendener inline rtl content embedded in ltr text in
a sensible way, while providing right-alignment for fully rtl blocks.
 2024-06-07 11:18:25 +01:00
かっこかり
43cccaaee9
fix 2024-06-04 13:15:35 +09:00
かっこかり
27ac3d795e
Update about-misskey.vue 2024-06-04 13:14:37 +09:00
Amelia Yukii
9520a14cb9 merge: avoid await at top-level in setup - fixes frontend tests (!534) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/534

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-06-03 16:28:25 +00:00
dakkar
92cd771e0f avoid await at top-level in setup - fixes frontend tests 2024-06-03 16:28:25 +00:00
Marie
81ed739380 fix: button saying Misskey instead of Sharkey 2024-05-31 21:18:35 +00:00
dakkar
e818c56faa merge: Feature/favicon notification dot (!474) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/474

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-31 19:03:32 +00:00
Marie
886948769e merge: fix custom emoji pagination when searching - fixes #490 (!489) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/489

Closes #490

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-31 18:39:01 +00:00
dakkar
3f76cfe9a6 Merge tag '2024.5.0' into future-2024-05-31 2024-05-31 19:34:56 +01:00
dakkar
8c301de790 lint frontend 2024-05-31 13:24:00 +01:00
dakkar
43bd8ace96 replace icons 2024-05-31 12:41:41 +01:00
dakkar
3372e0ffe1 Merge remote-tracking branch 'misskey/release/2024.5.0' into future 2024-05-31 12:26:07 +01:00
dakkar
7b630b48b5 Merge branch 'develop' into future 2024-05-31 11:43:09 +01:00
dakkar
0a9697b405 merge: correcty load/save withBots - fixes #528 (!522) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/522

Closes #528

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-05-31 10:38:27 +00:00
syuilo
030082f756 🎨 2024-05-31 19:35:27 +09:00
dakkar
4ddee7b01e Merge branch 'develop' into future 2024-05-31 11:24:00 +01:00
syuilo
be11fd7508 enhance: サーバーのお問い合わせ先URLを設定できるように 2024-05-31 10:12:23 +09:00
Amelia Yukii
55fc2879f3 merge: set the correct "marked an NSFW" when loading admin-user (!483) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/483

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-05-30 14:22:00 +00:00
dakkar
3050dcbef7 set the correct "marked an NSFW" when loading admin-user 2024-05-30 14:22:00 +00:00