etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-12-30 11:31:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
28862 commits 54 branches 924 tags 178 MiB
Commit graph

3421 commits

Author SHA1 Message Date
Hazel K
cd9bce3072 prevent login and password reset for system accounts 2024-10-07 14:58:39 -04:00
Hazel K
126a2fcf15 Merge branch 'develop' into hazelnoot/625-protect-system-accounts 2024-10-07 14:10:45 -04:00
Hazel K
6cfadb1f61 add prefix to components 2024-10-07 11:21:37 -04:00
Hazel K
12de9fcb18 fix error display 2024-10-07 11:18:08 -04:00
Hazel K
0da7f9b3f6 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-07 10:45:16 -04:00
Hazel K
adc7b91e3b fix UI hiding on admin-user.vue 2024-10-07 10:41:41 -04:00
PrivateGER
1c3495ef59
Make including followers in response a parameter 2024-10-07 16:23:24 +02:00
Hazel K
a790fef261 prevent deletion or suspension of system accounts 2024-10-07 10:02:55 -04:00
PrivateGER
bfd812720e Move styling to MkA elements 2024-10-07 12:46:28 +02:00
PrivateGER
80cbf00eac Add following and follower relationship view 2024-10-07 12:30:49 +02:00
codingneko
347dc25bb8 Add show bots toggle 2024-10-07 03:12:29 +02:00
PrivateGER
fadae347ff Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui 2024-10-06 23:13:10 +02:00
Marie
28bfd87537 merge: Add option to reject reports from an instance (Resolves #579, #715, #716) (!662) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/662

Closes #579, #715, and #716

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 19:39:38 +00:00
PrivateGER
f028795483 Move text into translation files 2024-10-06 20:31:41 +02:00
Hazelnoot
42dbe999e1 merge: Change the recent external url warning popup to the one from Cherrypick/MisskeyIO (!648) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/648

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
 2024-10-06 17:56:36 +00:00
PrivateGER
941a200f35 Move button into button group 2024-10-06 19:53:10 +02:00
Marie
939f07fa55
upd: fix returns 2024-10-06 19:08:32 +02:00
Hazel K
047563bdde Merge branch 'develop' into hazelnoot/579-reject-reports 
# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
 2024-10-06 12:26:25 -04:00
Hazel K
60d0e3df7b preserve refresh button on mobile UI 2024-10-06 12:20:06 -04:00
Hazel K
01fb606fee fix weird left-alignment 2024-10-06 12:18:15 -04:00
Hazel K
d016ef7675 fix display size reactivity 2024-10-06 12:02:56 -04:00
Marie
6d7c7357ab merge: Warn when a domain is implicitly blocked because a base domain is blocked (resolves #564) (!661) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/661

Closes #564

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 15:54:46 +00:00
Hazelnoot
702bb9e5e0 merge: Set visitor dashboard's menu button z-index to 50 (!656) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/656

Approved-by: Marie <github@yuugi.dev>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 15:44:57 +00:00
Hazel K
4ca27692ac Merge branch 'develop' into hazelnoot/following-timeline 2024-10-06 11:16:43 -04:00
Hazel K
eec4a5082d fix OpenAPI definition for admin/meta.silencedHosts 2024-10-06 11:03:28 -04:00
Hazel K
605c22b55e add lockout for isMediaSilenced 2024-10-06 10:58:27 -04:00
Hazel K
008ac89672 fix translation string 2024-10-06 10:58:06 -04:00
Hazel K
9b11aead5a Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked 2024-10-06 10:48:20 -04:00
Hazel K
2bc9ce93b8 add missing import 2024-10-06 10:47:55 -04:00
Marie
5f7730bd5c merge: Show yes/no options instead of ok/cancel when pasting long text (resolves #584) (!658) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/658

Closes #584

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 10:51:22 +00:00
Marie
88f3f0c7eb merge: Indicate that a user is blocked / muted (resolves #557) (!659) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/659

Closes #557

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 10:48:48 +00:00
Marie
f77eb34225 merge: Check if time-based achievements are unlocked before initializing them in main-boot (!657) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/657

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 10:38:51 +00:00
Hazel K
7dd296017b fix modlog and translations for "Mark as NSFW" 2024-10-05 22:43:34 -04:00
Hazel K
4da0d4be71 add option to reject reports from an instance 2024-10-05 22:01:55 -04:00
Hazel K
b23d650a15 warn when a domain is hard-blocked by a base domain 2024-10-05 20:42:31 -04:00
Hazel K
e622ab7cc7 indicate if a user is blocked / muted by the current user 2024-10-05 19:13:09 -04:00
Hazel K
c635992616 restore primary highlighting 2024-10-05 18:47:50 -04:00
Hazel K
ca98107eee respect following privacy settings 2024-10-05 18:25:13 -04:00
Evan Paterakis
c0702fd92f
Check if time-based achievements are unlocked before initializing them in main-boot 2024-10-05 22:58:43 +03:00
Evan Paterakis
5cd44433a0
Set visitor dashboard's menu button z-index to 50 2024-10-05 21:10:33 +03:00
PrivateGER
b3f925c426 Fix breaking follow relationships + add warning counts to dialogue 2024-10-05 19:06:05 +02:00
PrivateGER
99a0f756ff Expose instance-moderation endpoints in UI 2024-10-05 19:06:05 +02:00
Evan Paterakis
d633fe41bc
Don't depend on launcher.moe for status assets 2024-10-05 14:49:29 +03:00
Hazel K
fb7bc2ff01 preserve scroll positions when navigating 2024-10-04 08:58:32 -04:00
Hazel K
4273640530 fix extra scroll bar on mobile 2024-10-04 08:31:25 -04:00
Marie
4b31004c2b
upd: apply suggestions 2024-10-04 08:41:23 +02:00
Marie
323c075483
fix: add props before url 2024-10-04 02:34:34 +02:00
Marie
67d739cf71
upd: add script and check to MkUrl 2024-10-04 02:34:01 +02:00
Marie
d5b372f7a9
upd&merge: Merge Cherrypick/MisskeyIO's external url popup, delete old popup warning and modify script to handle undefined domains 2024-10-04 02:31:22 +02:00
Marie
ac1e5a0fb5 merge: Feat: Implement "Show Below Avatar" for Avatar Decorations (!645) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/645

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 20:40:34 +00:00
Marie
aedc5fba81 merge: Disabling cat speak on the client (!609) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/609

Closes #604

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 19:51:35 +00:00
Hazel K
bdd8e54be9 add missing copyright header 2024-10-03 15:19:05 -04:00
Hazel K
fddf078b52 improve per-user view on mobile 2024-10-03 15:16:07 -04:00
Hazel K
97a16c2ebc Merge branch 'develop' into hazelnoot/following-timeline 2024-10-03 14:00:06 -04:00
dakkar
ef002e00b6 cover case of author speaking as cat while not being cat 
as @Marie pointed out, if you disable "is cat" without first disabling
"speak as cat", you don't want to speak as a cat!
 2024-10-03 18:51:05 +01:00
Marie
f6e0a04053 merge: maybe fix #510 - try to not edit visibility (!631) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/631

Closes #510

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 17:45:26 +00:00
Marie
0f71dc6a07 merge: fix #332 - classic view navbar now respects "side (icon only)" (!630) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/630

Closes #332

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 17:39:32 +00:00
Marie
66ddf965b5 merge: alert when searching notes from widget, and search is disabled - fixes #275 (!629) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/629

Closes #275

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 17:32:20 +00:00
CenTdemeern1
cb264dae75 Use negative z-index to position decorations behind the avatar 
Co-authored-by: dakkar <dakkar@thenautilus.net>
 2024-10-03 19:12:10 +02:00
Hazel K
d82c0ddba9 fix "fetch user info during animation sync" 2024-10-03 12:03:21 -04:00
dakkar
fa71e54812 backup/restore disableCatSpeak 2024-10-03 16:59:08 +01:00
dakkar
491a499c58 store disableCatSpeak per account 2024-10-03 16:59:08 +01:00
Leah
49eb673c40 fix nyaize line 2024-10-03 16:59:08 +01:00
Leah
d55c86548d You can now disable cat speak in settings (client side) 2024-10-03 16:58:49 +01:00
dakkar
bc8c6592ea merge: make MkAbuseReport more friendly for smaller screen sizes (!646) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/646

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-10-03 15:57:19 +00:00
fEmber
e2beec33f8 merge: Minor issue fixes on the frontend (!625) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/625

Closes #659, #656, #651, #661, #632, and #710

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-10-03 15:52:00 +00:00
dakkar
8b7482f9c0 fix linting 2024-10-03 16:49:20 +01:00
blueb
04c729e504 fix: lint error in MkAbuseReport 2024-10-03 11:43:04 -04:00
Hazel K
21b935aa78 add toggle for "only with files" 2024-10-03 11:33:03 -04:00
Hazel K
2fbb697bf9 fetch user info during animation sync 2024-10-03 11:32:51 -04:00
Hazel K
9b572be0df use standard mute logic 2024-10-03 11:32:23 -04:00
CenTdemeern1
e43c58a955 Simplify the getDecorationZIndex function 2024-10-03 16:55:24 +02:00
blueb
5ef58c90ae replace brs with margin in MkAbuseReport 2024-10-03 09:12:25 -04:00
Hazel K
7ad36d33e9 add comments for mute logic 2024-10-03 00:49:47 -04:00
Hazel K
72d59b459a respect word mutes 2024-10-03 00:45:49 -04:00
Hazel K
fcb1218bbc add missing import 2024-10-03 00:43:45 -04:00
blueb
cbecaad5ae don't make MkAbuseReport harder to see if resolved 2024-10-03 00:06:20 -04:00
blueb
a32a8e0404 improvement: make MkAbuseReport more friendly for smaller screen sizes 2024-10-03 00:02:04 -04:00
Hazel K
64c737036f more lint fixes 2024-10-02 23:35:40 -04:00
Hazel K
40179a5591 lint fixes 2024-10-02 22:00:32 -04:00
Hazel K
5c87ed8488 add missing import 2024-10-02 20:32:54 -04:00
Hazel K
444b02ecdd reload user info when switching tabs 2024-10-02 20:26:22 -04:00
Hazel K
508e76b672 scroll both columns separately 2024-10-02 20:20:51 -04:00
CenTdemeern1
28aa99b273 Implement "Show Below Avatar" for Avatar Decorations 2024-10-02 23:49:30 +02:00
Hazel K
9ddab63a6a hide actions in mobile layout 2024-10-02 17:08:12 -04:00
Marie
007384c536
upd: fix random bg on post button in classic view 
This does basically nothing in classic view besides breaking the custom wallpapers function
 2024-10-02 20:40:58 +02:00
Marie
da7a5add33
upd: use @click.prevent instead of @click 2024-10-02 20:11:41 +02:00
Hazel K
49e00c39cf Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 13:23:04 -04:00
Marie
e2010caaff
Merge branch 'develop' into upd/instancesponsor 2024-10-02 18:57:49 +02:00
Marie
a87ced64ca
chore: lint 2024-10-02 18:51:07 +02:00
Hazel K
f43cb514b0 add menu to toggle user replies / boosts 2024-10-02 12:41:08 -04:00
Marie
cc1017b2af
upd: add sponsors to instance information 2024-10-02 18:25:23 +02:00
Hazel K
705ae79eb1 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 11:45:09 -04:00
Hazel K
ef7cde6bc6 fixes from peer review 2024-10-02 11:38:21 -04:00
Marie
321e7daab5
chore: add comments 2024-10-02 17:26:23 +02:00
dakkar
0bd6d48c7e merge: Customize Sidebar/Visitor/About separately from app icon. (!632) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/632

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-02 14:55:20 +00:00
dakkar
bf85d22a66 merge: Enhance: Add back buttons to Antenna and List Timelines, Tag Search, and Role Detail page. (!637) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/637

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-02 14:43:37 +00:00
dakkar
7bc0d4efff merge: Respect CWs in note previews (resolves #690) (!639) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/639

Closes #690

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-02 14:43:07 +00:00
Hazel K
c0583e5d5c don't leak boost / quote / reply contents when CW is in effect 2024-10-02 00:54:35 -04:00
Hazel K
19204851a0 Revert "respect CWs in note summaries" 
This reverts commit cf49701c2a.
 2024-10-02 00:49:26 -04:00
Hazel K
5a36c91bf1 Revert "avoid TS errors in get-note-summary" 
This reverts commit 6785996960.
 2024-10-02 00:49:25 -04:00
Hazel K
2cad08001a Revert "preserve non-text details in note summaries" 
This reverts commit 23659ab013.
 2024-10-02 00:49:25 -04:00
Hazel K
fa176ab543 Revert "expose prop to force-collapse MkNote / SkNote" 
This reverts commit c5117552ca.
 2024-10-02 00:48:23 -04:00
Hazel K
93a4008d42 disable the per-user feed on mobile 2024-10-02 00:45:41 -04:00
Hazel K
09b0de13bf fix comment typo 2024-10-02 00:44:26 -04:00
Hazel K
e031877a9e rename some CSS and JS names 2024-10-02 00:20:39 -04:00
Hazel K
eb2c2e261b remove extraneous "user preview" from feed entries 2024-10-02 00:15:52 -04:00
Hazel K
21277eab8f auto-select the first user in the following feed 2024-10-02 00:11:57 -04:00
Hazel K
2a11c1ecf6 emit "init" event from MkPagination 2024-10-02 00:09:32 -04:00
Hazel K
8f14fec45b fix error handling for following-feed 2024-10-02 00:09:10 -04:00
Hazel K
ce5c156e42 translate alt text for "no notes found" image 2024-10-02 00:08:52 -04:00
Hazel K
c8abbcaa33 fix link to post 2024-10-01 22:40:19 -04:00
Hazel K
779b5ef257 show two lines of text for feed entries 2024-10-01 22:27:08 -04:00
Hazel K
d2cf675569 show user info over user feed 2024-10-01 22:21:08 -04:00
Hazel K
cb10fe91bb preserve non-text details in note summaries 2024-10-01 18:28:25 -04:00
Hazel K
204e734192 include user feed 2024-10-01 18:28:04 -04:00
Hazel K
23659ab013 preserve non-text details in note summaries 2024-10-01 18:26:59 -04:00
Hazel K
94ce7272a7 avoid TS errors in get-note-summary 2024-10-01 14:47:06 -04:00
Hazel K
34aeeb0862 respect CWs in note summaries 2024-10-01 14:47:06 -04:00
Hazel K
6785996960 avoid TS errors in get-note-summary 2024-10-01 14:44:34 -04:00
Hazel K
cf49701c2a respect CWs in note summaries 2024-10-01 14:44:16 -04:00
Hazel K
ae3863bed0 use compact rendering for following feed 2024-10-01 14:37:09 -04:00
Julia Johannesen
91889dfed3
Add spacing in type signature 
Again, to match the upstream PR.
 2024-10-01 13:07:32 -04:00
Julia Johannesen
0aec0bb402
Fix to match upstream 
Upstreams linter was mad about the attributes not being before the event
handlers, so this fixes that to match upstream when we end up merging
2024.9 (assuming it gets included in that release)
 2024-10-01 10:30:02 -04:00
Julia Johannesen
7a1596cad9
Make post form attachments accessible 
Adds a role="button", tabindex, and @keydown to MkPostFormAttaches in
order to make it accessible to keyboard users.
 2024-10-01 10:06:40 -04:00
Hazel K
6cb4ee7879 fix page icon 2024-09-30 14:47:35 -04:00
Hazel K
e022148875 add refresh button 2024-09-30 13:56:10 -04:00
Hazel K
6a42874eac add following-feed page 2024-09-30 12:06:00 -04:00
Hazel K
c5117552ca expose prop to force-collapse MkNote / SkNote 2024-09-30 12:04:44 -04:00
Hazel K
04baad2f9c fix icon mappings for ti-user-check and ti-user-heart 2024-09-30 12:03:21 -04:00
piuvas
de33ade423
fix wording for the branding setting 2024-09-29 11:45:35 -03:00
piuvas
4edce0cb48
classic view 2024-09-29 09:04:21 -03:00
piuvas
08711e144b
fix iconOnly view 2024-09-29 08:29:50 -03:00
かっこかり
088707c114
enhance(frontend): cwでも絵文字メニューを開けるように (#14647) 
* fix(frontend): cwでも絵文字メニューを開けるように

* Update Changelog
 2024-09-29 18:24:34 +09:00
syuilo
15f2e1425c tweak MkCondensedLine 
#14642
 2024-09-29 17:30:16 +09:00
syuilo
f0d0cd2e50
wip (#14643) 2024-09-28 18:15:32 +09:00
syuilo
e5856c6b3b 🎨 2024-09-28 14:02:48 +09:00
syuilo
3f3c59e1ae 🎨 2024-09-28 13:45:53 +09:00
syuilo
f49d7927aa 🎨 2024-09-28 13:41:31 +09:00
丈槍由紀
025b2467b2 Add back button to the Roles page. 2024-09-27 23:00:08 -04:00
丈槍由紀
d9ba0f9f0d Add back button to antenna, list, and tag timelines. 2024-09-27 23:00:02 -04:00
FineArchs
25670b5f16
Mk:C:containerのborderStyleとborderRadiusを設定できるように (#14638) 
* borderStyle and borderRadius

* changelog
 2024-09-28 10:06:01 +09:00
syuilo
6fdb2b13f4 update deps 2024-09-28 10:04:16 +09:00
syuilo
28e9d4e483
feat: フォローされた際のメッセージを設定できるようにする (#14430) 
* feat: フォローされた際のメッセージを設定できるようにする

Resolve #14425

* Update CHANGELOG.md

* 既にフォローしているユーザーのメッセージも見れるように

* Update packages/frontend/src/components/MkNotification.vue

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* fix indent

* Update users.ts

* wip

* Update users.ts

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-09-28 09:55:21 +09:00
syuilo
e4d4cc5277 🎨 2024-09-28 09:52:40 +09:00
FineArchs
27a256b502
show shown (#14639) 2024-09-28 08:12:12 +09:00
かっこかり
d8a2eeb7ed
feat: エクスポート完了時に通知を発行するように (#14484) 
* feat: エクスポート完了時に通知を発行するように

* Update Changelog

* entitity -> entity

* fix: ペイロードを含むように

* fix icon

* exportableEntities -> userExportableEntities
 2024-09-26 14:15:03 +09:00
syuilo
89841e4c9a enhance(frontend): 絵文字ピッカーをドロワー表示するか自由に設定可能に 2024-09-26 12:41:48 +09:00
syuilo
31988db547 🎨 2024-09-26 11:35:40 +09:00
Yuri Lee
d8dd1683c9
Add Sign in with passkey Button (#14577) 
* Sign in with passkey (PoC)

* 💄 Added "Login with Passkey" Button

* refactor: Improve error response when WebAuthn challenge fails

* signinResponse should be placed under the SigninWithPasskeyResponse object.

* Frontend fix

* Fix: Rate limiting key for passkey signin

Use specific rate limiting key: 'signin-with-passkey'  for passkey sign-in API to avoid collisions with signin rate-limit.

* Refactor: enhance Passkey sign-in flow and error handling

- Increased the rate limit for Passkey sign-in attempts to accommodate the two API calls needed per sign-in.
- Improved error messages and handling in both the `WebAuthnService` and the `SigninWithPasskeyApiService`, providing more context and better usability.
- Updated error messages to provide more specific and helpful details to the user.

These changes aim to enhance the Passkey sign-in experience by providing more robust error handling, improving security by limiting API calls, and delivering a more user-friendly interface.

* Refactor: Streamline 2FA flow and remove redundant Passkey button.

- Separate the flow of 1FA and 2FA.
- Remove duplicate passkey buttons

* Fix: Add error messages to MkSignin

* chore: Hide passkey button if the entered user does not use passkey login

* Update CHANGELOG.md

* Refactor: Rename functions and Add comments

* Update locales/ja-JP.yml

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* Fix: Update translation

- update index.d.ts
- update ko-KR.yml, en-US.yml
- Fix: Reflect Changed i18n key on MkSignin

---------

Co-authored-by: Squarecat-meow <kw7551@gmail.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-09-26 08:25:33 +09:00
syuilo
fde94f638b Update about-misskey.vue 2024-09-26 08:18:23 +09:00
syuilo
5c62cbcca8 tweak style 2024-09-25 16:07:23 +09:00
syuilo
5c94b4cb49 🎨 2024-09-25 13:02:31 +09:00
syuilo
53682f5cc6 🎨 2024-09-25 12:31:04 +09:00
syuilo
c88957c037 🎨 2024-09-25 09:39:12 +09:00
syuilo
9d3a331286 🎨 2024-09-25 07:55:24 +09:00
syuilo
1679a40c76 🎨 2024-09-24 21:02:22 +09:00
syuilo
1d8bfe4f1c 🎨 2024-09-24 18:24:28 +09:00
syuilo
ca967e83bd 🎨 2024-09-24 17:52:14 +09:00
syuilo
423bfc8798 🎨 2024-09-24 17:48:49 +09:00
syuilo
9612195fc3 enhance(frontend): tweak control panel 2024-09-24 15:54:47 +09:00
syuilo
4be307f223 refactor 2024-09-24 13:55:35 +09:00
FineArchs
aef15069a2
Playの編集画面の保存ボタン等をstickyにする　など (#14429) 
* flash: sticky buttons

* sticky save buttons

* fix

* add spacer

* fix design

* Update CHANGELOG.md

* revert experimental background

* add background

* Update CHANGELOG.md

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-09-24 10:12:58 +09:00
かっこかり
3674e9b1cb
feat: adminのファイル一覧画面で、ファイルが添付されているノートを一覧できるように (#14403) 
* enhance(moderation): モデレーターがファイルが添付されているノートを照会できるように (MisskeyIO#680)

Co-authored-by: riku6460 <17585784+riku6460@users.noreply.github.com>
Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
(cherry picked from commit b059162324d2cfc697d1af9f3b6fb49fad2734e0)

* Update Changelog

* ✌️

Co-authored-by: riku6460 <17585784+riku6460@users.noreply.github.com>
Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

---------

Co-authored-by: Yuuki <yukikum57@gmail.com>
Co-authored-by: riku6460 <17585784+riku6460@users.noreply.github.com>
Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-09-24 10:11:09 +09:00
おさむのひと
98de7ca526
fix(frontend): 連合一覧等のページネーションが壊れていたのを修正 (#14439) 
* fix

* fix

* fix CHANGELOG.md

* 開発環境以外でログが出ないように

---------

Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-09-24 10:09:55 +09:00
zyoshoka
a37df2cd8e
fix(frontend): weird AP delivered chart in control panel (#14481) 
* fix(frontend): `Out: Fail` was negative number

* fix(frontend): don't stack AP delivered chart

* test(#10336): add `pages/admin/overview.ap-requests.vue` story

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-09-24 09:47:31 +09:00
dakkar
69efba9366 merge: Fetch sponsors from OC (!624) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/624

Closes #653

Approved-by: Julia <julia@insertdomain.name>
Approved-by: Tess K <me@thvxl.se>
 2024-09-23 17:57:39 +00:00
piuvas silly
41edc4cfbd Update 4 files 
- /packages/frontend/src/pages/admin/branding.vue
- /packages/backend/src/models/Meta.ts
- /packages/backend/src/server/api/endpoints/admin/meta.ts
- /packages/backend/src/server/api/endpoints/admin/update-meta.ts
 2024-09-23 16:34:29 +00:00
piuvas silly
3ebef6ac47 Update navbar-for-mobile.vue 2024-09-23 16:26:33 +00:00
piuvas silly
15167d98c5 Update navbar.vue 2024-09-23 16:25:34 +00:00
piuvas silly
a220d327cd Update navbar-for-mobile.vue 2024-09-23 16:24:57 +00:00
かっこかり
cd247b99ee
fix(frontend): MkRangeのタッチ操作時にtooltipが複数重なって表示されないように (#14548) 
* fix: directiveでのtooltip表示との競合を解消 (#265)

(cherry picked from commit 6d15d379a76b1b153ec2996e22bf0fc29ced5fda)

* code style

* Update Changelog

* record origin

* fix: ホバー時にもツールチップが出るように

---------

Co-authored-by: CaffeinePower <86540016+cffnpwr@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-09-23 21:53:51 +09:00
かっこかり
0c6d1ec524
refactor(frontend): popupMenuの項目作成時に三項演算子をなるべく使わないように (#14554) 
* refactor(frontend): popupMenuの項目作成時に三項演算子をなるべく使わないように

* type import

* fix

* lint
 2024-09-23 21:50:30 +09:00
syuilo
2aebdb8cc5 enhance(frontend): tweak control panel 2024-09-23 17:18:37 +09:00
syuilo
cd52dc73bb 🎨 2024-09-23 14:51:34 +09:00
syuilo
1ba09e1eee enhance(frontend): improve forms usability 2024-09-23 14:42:38 +09:00
piuvas
4ee2973303
requested fixes! 2024-09-22 17:32:46 -03:00
piuvas
73c0b11d1c
fix icon-only sidebar bug. 2024-09-22 15:36:10 -03:00
piuvas
d839c1eee1
sidebarlogo localization 2024-09-22 15:28:10 -03:00
piuvas
34392ff11a
fix formatting 2024-09-22 14:50:35 -03:00
piuvas
ec5b3c8788
frontend changes 2024-09-22 14:47:04 -03:00
piuvas
1af6f8c5da
backend configuring 2024-09-22 14:47:04 -03:00
Esurio
7aa956aca9
fix: use i18n in settings 2024-09-22 14:47:04 -03:00
Marie
1a6c4e3714
upd: remove duplication 2024-09-22 19:13:50 +02:00
syuilo
f93a575c3a 🎨 2024-09-22 20:44:24 +09:00
syuilo
e6e4182b53 enhance(frontend): tweak control panel 2024-09-22 20:23:20 +09:00
syuilo
736d8283c1 refactor 2024-09-22 20:21:06 +09:00
syuilo
0041ad3e69 enhance(frontend): tweak control panel 2024-09-22 20:14:19 +09:00
syuilo
973d8366c3 🎨 2024-09-22 20:14:09 +09:00
syuilo
2762e29f7f 🎨 2024-09-22 20:02:47 +09:00
かっこかり
e87cbd2a36
fix(frontend): lint fixe for tweak control panel (#14610) 2024-09-22 19:13:30 +09:00
syuilo
6ba97a7763 enhance(frontend): tweak control panel 2024-09-22 18:35:10 +09:00
syuilo
d435d04eaf enhance(frontend): tweak control panel 2024-09-22 18:26:21 +09:00
かっこかり
01ec708020
ffix(frontend): lint fixes for tweak control panel (#14607) 2024-09-22 17:50:54 +09:00
syuilo
0e92cbf905 enhance(frontend): tweak control panel 2024-09-22 16:24:53 +09:00
syuilo
8ad9f7209b enhance(frontend): tweak control panel 2024-09-22 16:16:50 +09:00
syuilo
3df1bb2d71 enhance(frontend): tweak control panel 2024-09-22 16:01:13 +09:00
syuilo
3ad5c753fa 🎨 2024-09-22 12:44:09 +09:00
syuilo
76408667f3
update deps (#14594) 
* wip

* Update ClientServerService.ts

* eslint

* Update fetch-resource.ts

* wip
 2024-09-22 12:32:01 +09:00
Marie
730bdab5fa upd: add onCancel to esc 2024-09-21 18:04:31 +00:00
dakkar
d3710f0872 maybe fix #510 - try to not edit visibility 
the frontend part is pretty straightforward, the backend part is ugly
but it shouldn't make things worse than they already are
 2024-09-21 18:24:57 +01:00
dakkar
2017b763f2 fix #332 - classic view navbar now respects "side (icon only)" 
* removed `menuDisplay` computed variable
* directly access `defaultStore` in `calcViewState`
* actually call `calcViewState` at setup!

all three these changes were copied from `universal.vue`, the default
view.
 2024-09-21 17:10:05 +01:00
dakkar
1b58326dd6 alert when searching notes from widget, and search is disabled 2024-09-21 16:29:23 +01:00
syuilo
e9085e455f 🎨 2024-09-21 19:41:55 +09:00
かっこかり
7e9d54fa3a
fix(frontend): ファイルの詳細ページのファイルの説明で改行が正しく表示されない問題を修正 (#14588) 
* upd: don't ignore new lines on file info

* Update Changelog

* ✌️

---------

Co-authored-by: Marie <github@yuugi.dev>
 2024-09-20 21:05:20 +09:00
かっこかり
f0834ca14c
enhance: ユーザーコンテンツのインポート操作の実行可否をロールで制御できるように (#14583) 
* enhance: インポート操作の実行可否をロールで制御できるように

* Update Changelog
 2024-09-20 21:04:58 +09:00
syuilo
0b062f1407
Misskey® Reactions Buffering Technology™ (#14579) 
* wip

* wip

* Update ReactionsBufferingService.ts

* Update ReactionsBufferingService.ts

* wip

* wip

* wip

* Update ReactionsBufferingService.ts

* wip

* wip

* wip

* Update NoteEntityService.ts

* wip

* wip

* wip

* wip

* Update CHANGELOG.md
 2024-09-20 21:03:53 +09:00
Esurio
cc51f7038e fix: use i18n in settings 2024-09-19 12:37:56 +00:00
おさむのひと
4ac8aad50a
feat: UserWebhook/SystemWebhookのテスト送信機能を追加 (#14489) 
* feat: UserWebhook/SystemWebhookのテスト送信機能を追加

* fix CHANGELOG.md

* 一部設定をパラメータから上書き出来るように修正

* remove async

* regenerate autogen
 2024-09-19 17:20:50 +09:00
かっこかり
3bf63dd9c5
fix(frontend): 設定変更時のリロード確認ダイアログが複数個表示されることがある問題を修正 (#14543) 
* fix(frontend): reloadAskが同時に複数実行されないように

* Update Changelog

* fix

* フラグ解除が確実に行われるように

* reloadAskを汎用化、理由を受け取るように

* fix
 2024-09-17 22:18:06 +09:00
FineArchs
daf9ae5d4a
ScratchpadにUIインスペクターを追加 (#14565) 
* add ui list

* Update scratchpad.vue

* experiment

* design change

* redesign

* redesign

* Update ja-JP.yml

* redesign

* component properties

* whole json

* use textarea

* fix import

* stringify function

* Update CHANGELOG.md

* UI Component Monitor -> UI Inspector

* uiInspectorOpenedFlags -> uiInspectorOpenedComponents

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* fix

* change key i -> c.value.id

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-09-17 20:11:50 +09:00
syuilo
a5e61b8c19 Revert "refactor" 
This reverts commit 0134e6e420.
 2024-09-17 17:05:52 +09:00
syuilo
cacdf9d939 refactor 
MkMisskeyFlavoredMarkdown -> MkMfm
 2024-09-17 17:03:09 +09:00
syuilo
0134e6e420 refactor 2024-09-17 17:00:48 +09:00
かっこかり
6bd6af440f
fix(frontend): 絵文字関連のスタイルが崩れているのを修正 (#14559) 
* fix(frontend): 絵文字関連のスタイルが崩れていたのを修正 (MisskeyIO#725)

(cherry picked from commit 00fd684a7b382aaeb3355a1c80dc24078a5caa61)

* Update Changelog

* ✌️

---------

Co-authored-by: Yuuki <yukikum57@gmail.com>
 2024-09-17 15:41:52 +09:00
Marie
c5c3c26271
chore: vue lint 2024-09-16 02:11:41 +02:00
Marie
7d449b9009
chore: add spacing between { and } 2024-09-16 01:17:12 +02:00
Marie
696c76768d
chore: lint 2024-09-16 01:14:31 +02:00
Marie
d2564836ed
upd: prompt for confirmation on external links 2024-09-16 01:12:20 +02:00
Marie
e21e2530e6
fix: don't show quoted toast on cancel of quote note 2024-09-16 00:35:26 +02:00
Marie
bde6bb0bd2
upd: don't ignore new lines on file info 2024-09-16 00:15:06 +02:00
Marie
67257ee5c6
upd: fix audio showing multiple warnings 2024-09-16 00:08:15 +02:00
Marie
9b7301fb2e
upd: Prompt for confirmation when Plugin:open_url is used 2024-09-15 23:54:31 +02:00
Marie
b7815df134
upd: fetch sponsors from OC 2024-09-15 20:04:29 +02:00
かっこかり
0e4b6d1dad
enhance(frontend): adminのファイルリストでセンシティブファイルに枠線を追加 (#14510) 
* enhance(frontend): adminのファイルリストでセンシティブファイルに枠線を追加

* Update Changelog
 2024-09-15 17:50:25 +09:00
かっこかり
1544ba9153
refactor(frontend): 非推奨の表現を改める (#14517) 2024-09-15 12:31:17 +09:00
かっこかり
e0f54d6a68
fix(frontend): MkDateSeparatedListで月の違う同じ日はセパレータが出ないのを修正 (#14545) 
* fix(frontend): MkDateSeparatedListで月の違う同じ日はセパレータが出ないのを修正

* Update Changelog
 2024-09-15 12:20:29 +09:00
dakkar
b211507a07 merge: Run eslint with caching (!618) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/618

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
 2024-09-14 10:45:44 +00:00
Esurio
bd586c86ec fix: use i18n in SkSearchResultWindow 2024-09-14 16:41:31 +09:00
4censord
0a8cb21e9b
Run eslint with caching 
This reduces the time for subsequent lints significantly.
e.g. for `package/frontend`, the first run takes ~10min.
With the cache, every subsequent run takes only a few seconds.
 2024-09-14 00:58:02 +02:00
Julia
d4c5322f9c merge: 2024.8 (!610) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/610

Approved-by: Julia <julia@insertdomain.name>
 2024-09-13 15:57:16 +00:00
かっこかり
837a8e15d8
refactor(frontend): frontend-embed/src/to-be-sharedを共通化 (#14536) 
* refactor(frontend): shouldCollapsedを共通化

* refactor(frontend): config.js, worker-multi-dispatch.js, intl-const.jsを共通化

* fix(frontend-shared): fix type error

* refactor(frontend): is-link.jsと、同一の振る舞いをする記述を共通化

* fix

* fix lint

* lint fixes
 2024-09-10 18:39:53 +09:00
かっこかり
f393b6b898
fix(frontend/frontend-embed): インポートパス・テーマまわりなどの修正 (#14535) 
* fix(frontend/frontend-embed): wrong imports

* enhance(frontend-embed): サーバーデフォルトのテーマがある場合はそちらを利用するように

* 🎨

* 🎨

* 🎨
 2024-09-10 16:14:02 +09:00
かっこかり
2cbe1d1210
feat(frontend): ノート・ユーザータイムライン埋め込み (#13929) 
* fix

* navhookをbootに移動

* サーバーサイドのbootも分けるように

* 埋め込みページかどうかの判定は最初の一回だけに

* tooltipは出せるように

* fix design

* 埋め込み独自のtooltipを削除

* ロジックの分岐が多かったMkNoteDetailedを分離

* fix indent

* プレビュー用iframeにフォーカスが当たるのを修正

* popupの制御を出す側で行うように

* パラメータが逆になっていたのを修正

* Update MkEmbedCodeGenDialog.vue

* fix

* eliminate misskey-js lint warns

* fix

* add appropriate attributes to embed html

* enhance: サーバーサイドのembed系をさらに分離

* enhance: embed routerを分離（route定義をboot時に変更できるようにする改修を含む）

* type

* lint

* fix indent

* server-side styleを完全に分離

* Revert "refactor: 画面サイズのしきい値をconstにまとめる"

This reverts commit 05ca36f400889456981e89489ae0ae242fa09b67.

* fix

* revert all changes in base.pug

* embedドメインをまとめた

* embedドメインをまとめた

* prevent calling contextmenu in embed page by stopping at the caller

* fix import

* fix import

* improve directory structure

* fix import

* register timeline ui as a container

* wa-

* rename

* wa-

* Update EmMediaList.vue

* Update EmMediaList.vue

* Update EmMediaList.vue

* Update EmMediaImage.vue

* Update EmNote.vue

* revert mkmedialist changes

* 戻し漏れ

* wip

* tweak embed media ui

* revert original media components

* Update boot.embed.js

* rename

* wip

* Update MkNote.vue

* wip

* Update MkSubNoteContent.vue

* Update EmNote.vue

* Update packages/frontend/src/router/definition.ts

* Revert "Update packages/frontend/src/router/definition.ts"

This reverts commit 937ae44521cdb0f250796943b20142b65f8ed944.

* refactor EmMediaImage

* fix import

* remove unused imports

* Update router.ts

* wip

* Update boot.ts

* wip

* wip

* wip

* wip

* Update EmNote.vue

* Update EmNote.vue

* Create EmA.vue

* Create EmAvatar.vue

* Update EmAvatar.vue

* wip

* wip

* wip

* Create EmImgWithBlurhash.vue

* Update EmImgWithBlurhash.vue

* Create EmPagination.vue

* wip

* Update boot.ts

* wip

* wip

* wi@p

* wip

* wip

* wiop

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update boot.ts

* wip

* Update MkMisskeyFlavoredMarkdown.ts

* wip

* wip

* wip

* wip

* wip

* Update post-message.ts

* wip

* Update EmNoteDetailed.vue

* Update EmNoteDetailed.vue

* Create instance.ts

* Update EmNoteDetailed.vue

* wip

* Update EmNoteDetailed.vue

* wip

* wip

* wip

* Update pnpm-lock.yaml

* wip

* wip

* wp

* wip

* Update ClientServerService.ts

* wip

* Update boot.ts

* Update vite.config.local-dev.ts

* Update vite.config.ts

* Create index.html

* wa-

* wip

* Update boot.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Create EmLink.vue

* Create EmMention.vue

* Update EmMfm.ts

* wip

* wip

* wip

* wip

* Update vite.config.ts

* Update boot.ts

* Update EmA.vue

* うぃｐ

* wip

* wip

* Create EmError.vue

* wip

* Update MkEmbedCodeGenDialog.vue

* Update EmNote.vue

* wip

* wip

* Update user-timeline.vue

* Update check-spdx-license-id.yml

* wip

* wip

* style(frontend-shared): lint fixes on build.js

* fix(frontend-shared): include `*.{js,json}` files in js-built

* wip

* use alias

* refactor

* refactor

* Update scroll.ts

* refactor

* refactor

* refactor

* wip

* wip

* wip

* wip

* Update roles.vue

* Update branding.vue

* wip

* wip

* wip

* Update page.vue

* wip

* fix import

* add missing css variables

* 絵文字をtwemojiに変更

クライアントデフォルトにあわせるため

* force empoll readonly

* fix compiler error

* fix broken imports

* tweak button style

* run api extractor

* fix storybook theme preloads

* fix storybook instance imports

* Update preview.ts

* Update preview.ts

* Update preview.ts

* Revert "Update preview.ts"

This reverts commit 12bab1c6fbd3baf753515df760ff19d027b85155.

* Revert "Update preview.ts"

This reverts commit 5c0ce01dbdf2194ffe94aba950f747a9968f29c4.

* Revert "Update preview.ts"

This reverts commit f4863524d7e5ca0f25470808849c24a72bea000a.

* Revert "fix storybook instance imports"

This reverts commit ed8eabb246edf731d31adffbe3c77c539e53ae9e.

* Revert "wip"

This reverts commit d3c1926519878155193a1654f49141e515d49683.

* Revert "Update page.vue"

This reverts commit 27c7900b0c1ae296b56075e8a9c22585d9cd744b.

* Revert "Update branding.vue"

This reverts commit c08ccb65ba66774c3e2b3dcfc6153004b5c0aa16.

* Revert "Update roles.vue"

This reverts commit 1488b670660cb1803d17d8f5c78f2d79e59fa52d.

* Revert "wip"

This reverts commit aab1c769814b08c257cad3025422a0eea3bfba4f.

* refactor: use common media proxy

* fix imports

* fix

* fix: MediaProxyの初期化を保証する（storybook対策？）

* enhance(frontend-embed): improve embedParams provide

* fix(backend): MK_DEV_PREFER=backendのときにembed viteが読み込めないのを修正

* fix

* embed-pageを共通化

* fix import

* fix import

* fix import

* const.jsを共通化

（たぶんrevertしすぎた）

* fix type error

* fix duplicated import

* fix lint

* fix

* コメントとして残す

* sharedとembedをlint対象にする

* lint

* attempt to fix eslint (frontend-shared)

* lint fixes

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
 2024-09-09 20:57:36 +09:00
dakkar
fcd63e0378 merge: chore: Update Donation button (!616) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/616

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
 2024-09-08 16:33:24 +00:00
Marie
14ce6f7cbb chore: add missing person 2024-09-06 22:59:35 +00:00
Marie
ccc2cdb887 chore: update contributor section 2024-09-06 22:46:34 +00:00
Marie
19c90d8e9f chore: update Ko-Fi text to OpenCollective 2024-09-06 21:27:35 +00:00
Marie
9a7300489c chore: update donation links in backend and frontend 2024-09-06 21:25:38 +00:00
かっこかり
567acea2a3
fix(frontend): instance infoページで不必要なapiリクエストが飛ぶのを抑止 (#14515) 
* fix(frontend): instance infoページで不必要なapiリクエストが飛ぶのを抑止

* fix
 2024-09-06 17:23:40 +09:00
かっこかり
cdb0566c5b
refactor(frontend): scss deprecated 警告に対応 (#14513) 2024-09-06 16:12:14 +09:00
かっこかり
f7398faeac
enhance(frontend): アイコンデコレーション管理画面にプレビューを追加 (#14511) 
* enhance(frontend): アイコンデコレーション管理画面にプレビューを追加

* Update Changelog

* tweak
 2024-09-06 15:37:03 +09:00
Essem
8669125f37
chore: Remove esm from about page 2024-09-04 16:06:15 -05:00
dakkar
e04c7ad09f copy changes from MkNote* to SkNote* 2024-08-30 12:12:44 +01:00
dakkar
6151099f5b Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.8 2024-08-30 12:08:31 +01:00
zyoshoka
3fe7e37f10
fix(frontend): server metrics look strange after reload (#14467) 2024-08-30 10:59:23 +09:00
zyoshoka
7fe3035059
fix(backend): use prefixItems in admin/queue/*-delayed endpoint schema (#14468) 
* fix(backend): represent tuples with `prefixItems`

* refactor(frontend): fix type errors

* fix(backend): add `prefixItems` in `SchemaType`

* fix(backend): add `unevaluatedItems: false` to disallow extra items

* refactor(frontend): consolidate `'deliver' | 'queue'` type def into `queue.vue`

* fix(backend): add `unevaluatedItems` in `SchemaType`
 2024-08-30 10:58:59 +09:00
zyoshoka
06855f769f
refactor(sw): use fully typed locales (#14470) 
* refactor(sw): use fully typed locales

* fix(backend): enumerate achievement notification type
 2024-08-30 10:58:11 +09:00
syuilo
36dff66883 refactor 2024-08-27 20:36:43 +09:00
Leah
717d22d4be remove extra line 2024-08-26 19:12:27 +02:00