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
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
9b1bae653d
add "show bots" toggle to following feed
2024-10-15 14:16:46 -04:00
499e8895c5
save filters for following feed
2024-10-15 14:16:46 -04:00
463b9ac59d
add filters for following feed
2024-10-15 14:16:46 -04:00
5c1d16947c
fix import order in common.ts
2024-10-15 12:28:40 -04:00
652cc8602c
refresh locales after any change, not just a version update
2024-10-15 12:23:18 -04:00
2cd41228d8
Merge branch 'develop' into feature/2024.9.0
2024-10-13 11:35:10 -04:00
bd2cdd9363
restore missing hasPendingReceivedFollowRequest in navbar
2024-10-13 01:09:49 -04:00
edce54ad0f
add new i18n pendingFollowRequests
2024-10-13 01:04:41 -04:00
19a1f3111b
fix default followreq tab
2024-10-13 01:04:41 -04:00
0c03f9ead0
fix default followreq tab
2024-10-13 01:04:40 -04:00
0e6ba9ccd4
ux: should not show follow requests tab when have no pending sent follow req
2024-10-13 01:04:40 -04:00
1eacf0772c
FEAT: Allow users to view pending follow requests they sent
...
This commit implements the `following/requests/sent` interface firstly
implemented on Firefish, and provides a UI interface to view the pending
follow requests users sent.
2024-10-13 01:04:40 -04:00
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
3093707469
merge: Prevent usernames from overflowing the reactions hover-list ( resolves #737 ) ( !682 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/682
Closes #737
Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se>
2024-10-12 21:46:04 +00:00
a44d58781f
Merge branch 'develop' into feature/2024.9.0
2024-10-12 20:00:40 +01:00
bf6ca8efdc
also ignore stale *failed* responses - #741
...
since `misskeyApi` doesn't pass us the request, we close over a copy
of the username we requested, to make sure it still matches the
current username value
2024-10-12 18:23:20 +01:00
5af38db74b
ignore stale `users/show` responses - fixes #741
...
* person starts typing "abcd"
* request for user "abcd" is sent to server
* person continues typing "ef"
* request for user "abcdef" is sent to server
* response for user "abcdef" arrives, icon for user "abcdef" is shown
* response for user "abcd" arrives, icon for user "abcd" was shown –
with this commit, this response is ignored instead
This is not just "showing the wrong avatar", btw: `MkSignin` uses the
`user` variable to decide whether to use 2FA, so having the wrong data
in user can make a login attempt fail.
2024-10-12 18:16:06 +01:00
a1375c8ab7
prevent usernames from overflowing the reactions hover-list
2024-10-12 00:29:40 -04:00
b27b398717
fix calculation of `instance-info.isSuspended` when `instance` is null
2024-10-11 14:07:31 -04:00
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
f3e6b43ea4
merge: New logo ( !681 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/681
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-11 18:04:32 +00:00
69483bb55b
new logo
2024-10-11 11:32:35 -05:00
7837852149
copy `iAmModerator` check to other instance-info controls
2024-10-11 11:25:10 -04:00
66a88c89b5
fix TypeScript and ESLint errors in instance-info.vue
2024-10-11 11:24:39 -04:00
f496d4b88b
re-implement suspension toggle to match other controls
2024-10-11 10:16:57 -04:00
87a12c020f
convert "suspend deliver" button into a toggle
2024-10-11 09:52:59 -04:00
eb2ea85d40
merge: Minor improvements to relation badges on user profiles ( !674 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/674
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-11 13:28:55 +00:00
3cec5f927e
fix some linting in frontends
2024-10-11 11:24:49 +01:00
2ecaa57cd5
fix nyaize test
2024-10-11 10:25:07 +01:00
02d36c4518
Merge branch 'develop' into feature/2024.9.0
2024-10-11 10:10:16 +01:00
fefdd1c1e8
merge: Fix: Finding emoji that include capital letters ( !676 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/676
Closes #522
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-10 20:11:03 +00:00
5cebb4da54
fix: Finding emoji that include capital letters
...
Custom emoji names and aliases that include capital letters can now be found in the emoji picker.
I kind of hate copy-pasting `.toLowerCase()` like this but apparently I'm not allowed to refactor Misskey code.
2024-10-10 21:48:53 +02:00
a7076ed3e0
show "blocking you" indicator to instance staff only
2024-10-10 14:01:40 -04:00
523ad3d60c
add "following" and "mutuals" relation badges
2024-10-10 14:01:40 -04:00
1b106d92e0
fix HTML semantics of relational info-badges
2024-10-10 14:01:40 -04:00
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
8e85487f64
merge: Add show bots toggle to hamburger menu ( !664 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/664
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-10 16:31:20 +00:00
1b278f5630
Remove show bots from client settings
2024-10-10 16:15:59 +00:00
2da85e1163
(not related to the merge) fix instance name in `severAllFollowRelations`
2024-10-10 14:09:36 +01:00
7bd971c036
upd: add option to disable external url warning
2024-10-10 02:00:41 +02:00
60c6267d7a
replace new icons with ours
2024-10-09 16:24:10 +01:00
0a7075044a
fix deleteAndEdit danger class
2024-10-09 16:10:03 +01:00
10aab285d1
fix import
2024-10-09 16:07:37 +01:00
50120371f7
fix import
2024-10-09 16:07:30 +01:00
5856858f49
try to fix icons
2024-10-09 15:52:42 +01:00
73abf3204e
fix following-feed imports
2024-10-09 15:52:42 +01:00
c5ff081557
fix MkUrlWarningDialog imports
2024-10-09 15:52:42 +01:00
7519f98462
copy changes from MkNoteDetailed to SkNoteDetailed
2024-10-09 15:52:42 +01:00
3fca2ba2f6
copy changes from MkNote to SkNote
2024-10-09 15:52:42 +01:00
b4c53687b4
oops, missed a closing tag
2024-10-09 15:27:05 +01:00
f00576bce6
Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
2024-10-09 15:17:22 +01:00
2d6f1ed464
Merge branch 'merge-requests/668' into feature/2024.9.0
2024-10-09 10:41:22 +01:00
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
672c4f746c
inform users about sharkey specific localization
2024-10-08 00:33:16 -03:00
eb5a2b023e
count CW for character limit
2024-10-07 19:25:03 -04:00
5f435f7250
restore sorting of pinned notes
2024-10-07 16:26:30 -04:00
c783ccf8cb
sort pinned notes by date
2024-10-07 16:20:40 -04:00
35114df6d4
always default to latest notes instead of pins
2024-10-07 16:20:40 -04:00
3003affe6a
fix extra gap above user notes
2024-10-07 16:20:40 -04:00
60ec877d3c
on user profiles, move pinned notes down with the other notes
2024-10-07 16:20:40 -04:00
3defc831c3
Fix formatting issues
2024-10-07 21:51:55 +02:00
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
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
cd9bce3072
prevent login and password reset for system accounts
2024-10-07 14:58:39 -04:00
126a2fcf15
Merge branch 'develop' into hazelnoot/625-protect-system-accounts
2024-10-07 14:10:45 -04:00
6cfadb1f61
add prefix to components
2024-10-07 11:21:37 -04:00
12de9fcb18
fix error display
2024-10-07 11:18:08 -04:00
0da7f9b3f6
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-07 10:45:16 -04:00
adc7b91e3b
fix UI hiding on admin-user.vue
2024-10-07 10:41:41 -04:00
1c3495ef59
Make including followers in response a parameter
2024-10-07 16:23:24 +02:00
a790fef261
prevent deletion or suspension of system accounts
2024-10-07 10:02:55 -04:00
bfd812720e
Move styling to MkA elements
2024-10-07 12:46:28 +02:00
80cbf00eac
Add following and follower relationship view
2024-10-07 12:30:49 +02:00
347dc25bb8
Add show bots toggle
2024-10-07 03:12:29 +02:00
fadae347ff
Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui
2024-10-06 23:13:10 +02:00
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
f028795483
Move text into translation files
2024-10-06 20:31:41 +02:00
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
941a200f35
Move button into button group
2024-10-06 19:53:10 +02:00
939f07fa55
upd: fix returns
2024-10-06 19:08:32 +02:00
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
60d0e3df7b
preserve refresh button on mobile UI
2024-10-06 12:20:06 -04:00
01fb606fee
fix weird left-alignment
2024-10-06 12:18:15 -04:00
d016ef7675
fix display size reactivity
2024-10-06 12:02:56 -04:00
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
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
4ca27692ac
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-06 11:16:43 -04:00
eec4a5082d
fix OpenAPI definition for admin/meta.silencedHosts
2024-10-06 11:03:28 -04:00
605c22b55e
add lockout for isMediaSilenced
2024-10-06 10:58:27 -04:00
008ac89672
fix translation string
2024-10-06 10:58:06 -04:00
9b11aead5a
Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked
2024-10-06 10:48:20 -04:00
2bc9ce93b8
add missing import
2024-10-06 10:47:55 -04:00
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
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
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
7dd296017b
fix modlog and translations for "Mark as NSFW"
2024-10-05 22:43:34 -04:00
4da0d4be71
add option to reject reports from an instance
2024-10-05 22:01:55 -04:00
b23d650a15
warn when a domain is hard-blocked by a base domain
2024-10-05 20:42:31 -04:00
Hazelnoot
Lhc_fl
CenTdemeern1
dakkar
Marie
Ruben
codingneko
piuvas
PrivateGER