CenTdemeern1
577e66e2ce
Update index.d.ts
2024-10-21 14:26:17 +02:00
piuvas
f43aec7c88
merge misskey's locales
2024-10-19 08:29:35 -03:00
dakkar
52e291af67
Merge branch 'develop' into feature/2024.9.0
2024-10-18 22:00:07 +01:00
dakkar
786677b079
merge: Feat: Implement clickable notifications ( !685 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/685
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-17 15:56:05 +00:00
Hazelnoot
8a34d8e9d2
Merge branch 'develop' into feature/2024.9.0
...
# Conflicts:
# locales/en-US.yml
# locales/ja-JP.yml
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/NoteDeleteService.ts
# packages/backend/src/core/NoteEditService.ts
# packages/frontend-shared/js/config.ts
# packages/frontend/src/boot/common.ts
# packages/frontend/src/pages/following-feed.vue
# packages/misskey-js/src/autogen/endpoint.ts
2024-10-15 18:09:11 -04:00
Hazelnoot
68b90df00b
merge: Refresh locales after any change, not just a version update ( resolves #732 ) ( !692 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/692
Closes #732
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-15 21:50:56 +00:00
Hazel K
463b9ac59d
add filters for following feed
2024-10-15 14:16:46 -04:00
Hazelnoot
652cc8602c
refresh locales after any change, not just a version update
2024-10-15 12:23:18 -04:00
CenTdemeern1
6213018e62
Add Japanese translation
2024-10-15 14:14:59 +02:00
Julia Johannesen
d04e44b552
Fix indentation on locales/generateDTS.js
2024-10-14 15:15:24 -04:00
Lhc_fl
edce54ad0f
add new i18n pendingFollowRequests
2024-10-13 01:04:41 -04:00
CenTdemeern1
5085c39440
Implement clickable notifications
...
I'm not sure about the get function pattern here as it doesn't include a value to base reactivity on; I might be too used to Svelte though and maybe that's fine
2024-10-13 01:03:29 +02:00
Hazelnoot
148bf98f21
Merge branch 'develop' into feature/2024.9.0
...
# Conflicts:
# packages/frontend/src/pages/instance-info.vue
2024-10-11 14:06:21 -04:00
Hazelnoot
5a49955064
fix typo in "Server is suspended due to no responding"
2024-10-11 09:52:59 -04:00
dakkar
02d36c4518
Merge branch 'develop' into feature/2024.9.0
2024-10-11 10:10:16 +01:00
Hazelnoot
a7076ed3e0
show "blocking you" indicator to instance staff only
2024-10-10 14:01:40 -04:00
Hazelnoot
2be802131f
merge: On user profiles, move pinned notes down with the other note tabs ( resolves #555 ) ( !651 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/651
Closes #555
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-10 16:33:39 +00:00
Marie
7bd971c036
upd: add option to disable external url warning
2024-10-10 02:00:41 +02:00
dakkar
f00576bce6
Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
2024-10-09 15:17:22 +01:00
piuvas
38fbf58943
use en-US to generate types
2024-10-08 15:16:58 -03:00
piuvas
6447167bc5
update upstream locales
2024-10-08 11:13:48 -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
piuvas
819b1b324a
reverted to misskey locales
2024-10-07 19:44:23 -03:00
Hazel K
60ec877d3c
on user profiles, move pinned notes down with the other notes
2024-10-07 16:20:40 -04:00
Hazel K
cd9bce3072
prevent login and password reset for system accounts
2024-10-07 14:58:39 -04:00
Hazel K
0da7f9b3f6
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-07 10:45:16 -04: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
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
4ca27692ac
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-06 11:16:43 -04:00
Hazel K
b9e89edbc7
add missing translation
2024-10-06 11:16:18 -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
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
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
Marie
b0568e2baa
chore: remove unused locale
2024-10-04 02:33:02 +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
97a16c2ebc
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-03 14:00:06 -04:00
Marie
85b0dad84e
merge: missing bubble timeline translations ( !605 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/605
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 17:30:01 +00:00
CenTdemeern1
25e90f9c07
Add JP localization for Show Below Avatar
2024-10-03 19:29:38 +02:00
dakkar
c85913d4b0
nicer wordinc
2024-10-03 16:59:37 +01:00
Leah
4281f08a75
moved translation
2024-10-03 16:59:07 +01:00
