DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,444 Commits 55 Branches 923 Tags 253 MiB
Commit Graph

3093 Commits

Author SHA1 Message Date
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
Hazelnoot 9b1bae653d add "show bots" toggle to following feed 2024-10-15 14:16:46 -04:00
Hazel K 499e8895c5 save filters for following feed 2024-10-15 14:16:46 -04:00
Hazel K 463b9ac59d add filters for following feed 2024-10-15 14:16:46 -04:00
Hazelnoot 5c1d16947c fix import order in common.ts 2024-10-15 12:28:40 -04:00
Hazelnoot 652cc8602c refresh locales after any change, not just a version update 2024-10-15 12:23:18 -04:00
Hazelnoot 2cd41228d8 Merge branch 'develop' into feature/2024.9.0 2024-10-13 11:35:10 -04:00
Hazelnoot bd2cdd9363 restore missing hasPendingReceivedFollowRequest in navbar 2024-10-13 01:09:49 -04:00
Lhc_fl edce54ad0f add new i18n pendingFollowRequests 2024-10-13 01:04:41 -04:00
Lhc_fl 19a1f3111b fix default followreq tab 2024-10-13 01:04:41 -04:00
Lhc_fl 0c03f9ead0 fix default followreq tab 2024-10-13 01:04:40 -04:00
Lhc_fl 0e6ba9ccd4 ux: should not show follow requests tab when have no pending sent follow req 2024-10-13 01:04:40 -04:00
Lhc_fl 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
Hazelnoot 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
dakkar a44d58781f Merge branch 'develop' into feature/2024.9.0 2024-10-12 20:00:40 +01:00
dakkar 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
dakkar 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
Hazelnoot a1375c8ab7 prevent usernames from overflowing the reactions hover-list 2024-10-12 00:29:40 -04:00
Hazelnoot b27b398717 fix calculation of `instance-info.isSuspended` when `instance` is null 2024-10-11 14:07:31 -04: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 7837852149 copy `iAmModerator` check to other instance-info controls 2024-10-11 11:25:10 -04:00
Hazelnoot 66a88c89b5 fix TypeScript and ESLint errors in instance-info.vue 2024-10-11 11:24:39 -04:00
Hazelnoot f496d4b88b re-implement suspension toggle to match other controls 2024-10-11 10:16:57 -04:00
Hazelnoot 87a12c020f convert "suspend deliver" button into a toggle 2024-10-11 09:52:59 -04:00
Hazelnoot 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
dakkar 3cec5f927e fix some linting in frontends 2024-10-11 11:24:49 +01:00
dakkar 02d36c4518 Merge branch 'develop' into feature/2024.9.0 2024-10-11 10:10:16 +01:00
Marie 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
CenTdemeern1 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
Hazelnoot a7076ed3e0 show "blocking you" indicator to instance staff only 2024-10-10 14:01:40 -04:00
Hazelnoot 523ad3d60c add "following" and "mutuals" relation badges 2024-10-10 14:01:40 -04:00
Hazelnoot 1b106d92e0 fix HTML semantics of relational info-badges 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 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
codingneko 1b278f5630 Remove show bots from client settings 2024-10-10 16:15:59 +00:00
dakkar 2da85e1163 (not related to the merge) fix instance name in `severAllFollowRelations` 2024-10-10 14:09:36 +01:00
Marie 7bd971c036
upd: add option to disable external url warning 2024-10-10 02:00:41 +02:00
dakkar 0a7075044a fix deleteAndEdit danger class 2024-10-09 16:10:03 +01:00
dakkar 10aab285d1 fix import 2024-10-09 16:07:37 +01:00
dakkar 50120371f7 fix import 2024-10-09 16:07:30 +01:00
dakkar 5856858f49 try to fix icons 2024-10-09 15:52:42 +01:00
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 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
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