Commit Graph

28307 Commits

Author SHA1 Message Date
dakkar 73abf3204e fix following-feed imports 2024-10-09 15:52:42 +01:00
dakkar c5ff081557 fix MkUrlWarningDialog imports 2024-10-09 15:52:42 +01:00
dakkar 7519f98462 copy changes from MkNoteDetailed to SkNoteDetailed 2024-10-09 15:52:42 +01:00
dakkar 3fca2ba2f6 copy changes from MkNote to SkNote 2024-10-09 15:52:42 +01:00
dakkar 1a656e8eb5 copy changes from NoteCreateService to NoteEditService 2024-10-09 15:40:00 +01:00
dakkar b4c53687b4 oops, missed a closing tag 2024-10-09 15:27:05 +01:00
dakkar f00576bce6 Merge remote-tracking branch 'misskey/master' into feature/2024.9.0 2024-10-09 15:17:22 +01:00
dakkar 2d6f1ed464 Merge branch 'merge-requests/668' into feature/2024.9.0 2024-10-09 10:41:22 +01:00
piuvas 14ae00b563
make en-US our crowdin source 2024-10-08 15:20:52 -03:00
piuvas 38fbf58943
use en-US to generate types 2024-10-08 15:16:58 -03:00
Marie 72a0f16b38 merge: Show instance sponsors if OC is set as donation url (!642)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/642

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Julia <julia@insertdomain.name>
2024-10-08 18:07:58 +00:00
piuvas 96d1d16aaa
reintroduce sharkey changes from other languages 2024-10-08 11:14:28 -03:00
piuvas 6447167bc5
update upstream locales 2024-10-08 11:13:48 -03:00
Marie 80c3acf731 merge: Count CW text in the character limit (resolves #724) (!667)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/667

Closes #724

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-08 09:08:37 +00:00
piuvas 672c4f746c
inform users about sharkey specific localization 2024-10-08 00:33:16 -03:00
piuvas 6c1f2c6d11
update crowdin.yml 2024-10-07 20:51:45 -03:00
piuvas 6f7c0c2de3
merge translations (based part) 2024-10-07 20:38:42 -03:00
piuvas 5145afb625
fix pt-BR thing (i also changed this for misskey dw) 2024-10-07 20:38:08 -03:00
Hazel K eb5a2b023e count CW for character limit 2024-10-07 19:25:03 -04:00
Hazelnoot a90b4d487a merge: Increase character hard limits (resolves #686 and #696) (!647)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/647

Closes #686 and #696

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-07 23:20:14 +00:00
piuvas 52fcdb290b
empty out new languages 2024-10-07 20:18:51 -03:00
piuvas 819b1b324a
reverted to misskey locales 2024-10-07 19:44:23 -03:00
piuvas b0921189a4
separated locales 2024-10-07 19:44:06 -03:00
Marie ba5eec2129 merge: Prevent deletion or suspension of system accounts (resolves #625) (!666)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/666

Closes #625

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-07 19:34:26 +00:00
Marie f7e9ffb99a merge: Display instance follow/following relationships in instance view (partial implementation of 648) (!665)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/665

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-07 19:30:48 +00:00
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
dakkar 32a97a5a05 merge: Add feed of latest posts by followed users (!640)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/640

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-07 17:15:33 +00:00
Hazel K 39214431f4 check for host 2024-10-07 11:45:58 -04:00
Hazel K 9137ae1eef update autogen types 2024-10-07 11:21:52 -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
PrivateGER 46e53e294e
Parameterize followee as well 2024-10-07 16:47:15 +02: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
Hazel K c77e90d98a update autogen types 2024-10-07 10:41:18 -04:00
Hazel K 844dfaaf5d model missing "approved" property in show-user response 2024-10-07 10:40:44 -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
PrivateGER a292e46f84 Pack other side of relation into response as well 2024-10-07 11:56:18 +02:00
Hazelnoot 934e007698 merge: Add controls to delete all files or sever all relations with a remote instance (!654)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/654

Approved-by: Marie <github@yuugi.dev>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2024-10-06 21:33:39 +00: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