amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,518 Commits 3 Branches 0 Tags 162 MiB
9562a830ed
Commit Graph

28518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hazelnoot
9562a830ed merge: Merge upstream security advisary (!707) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/707

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
 2024-10-25 15:22:21 +00:00
Hazelnoot
57ce32d44f merge: fix: return getFromDb directly when fanoutTimeline is not enabled (!709) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/709

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
 2024-10-25 15:20:06 +00:00
dakkar
beff26e6f4 merge: follow-up on !710: send MFM payload for notes that don't contain advanced MFM (!713) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/713

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-24 17:32:00 +00:00
dakkar
d7ffc0be62 MR !710 had missed renderUpNote 2024-10-24 13:47:54 +01:00
dakkar
ca91af7fa9 merge: fix: make sure outgoing remote mentions get resolved correctly if referenced with non-canonical casing (!711) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/711

Closes #646

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-24 08:53:27 +00:00
dakkar
ff220bd372 Merge branch 'develop' into 'fix/user-lookup-capitalization' 
# Conflicts:
#   packages/backend/src/core/MfmService.ts
 2024-10-24 08:14:53 +00:00
dakkar
4fed355592 merge: fix: send MFM payload for notes that don't contain advanced MFM (!710) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/710

Closes #647

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-24 08:10:46 +00:00
dakkar
c59852f834 merge: fix: make sure mentions of local users get rendered correctly during AP delivery (!712) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/712

Closes #645

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-24 08:10:13 +00:00
Laura Hausmann
aae7fff494
fix: make sure mentions of local users get rendered correctly during AP delivery (resolves #645) 2024-10-24 05:51:30 +02:00
Laura Hausmann
724aff6e4e
fix: make sure outgoing remote mentions get resolved correctly if referenced with non-canonical casing (resolves #646) 2024-10-24 05:45:22 +02:00
Laura Hausmann
d52f4748f2
fix: send MFM payload for notes that don't contain advanced MFM (resolves #647) 2024-10-24 05:40:17 +02:00
Lhc_fl
67f977f4ff
fix: return getfromdb when FanoutTimeline is not enabled 2024-10-23 23:14:46 +08:00
饺子w (Yumechi)
e05420a92d
Merge commit from fork 
[ghsa-gq5q-c77c-v236](https://github.com/misskey-dev/misskey/security/advisories/ghsa-gq5q-c77c-v236)

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
 2024-10-22 22:30:17 +02:00
dakkar
60be692a0a merge: fix: should use invite limit cycle to calculate invite/limit (!706) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/706

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-22 14:07:17 +00:00
Lhc_fl
6aaeda13b9
fix: should use invite limit cycle to calculate invite/limit 2024-10-22 18:48:24 +08:00
Hazelnoot
42e2a58642 merge: Add followers tab to following feed + fix duplication (resolves #729) (!705) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/705

Closes #729

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-22 09:19:34 +00:00
Hazelnoot
bc45ff2103 add warning about incomplete remote data on following feed 2024-10-21 17:57:54 -04:00
Hazelnoot
04654b2f84 add "followers" tab to following feed 2024-10-21 17:55:06 -04:00
Hazelnoot
053b47d78a return error when calling following feed with both includeReplies and filesOnly 2024-10-21 17:55:06 -04:00
Hazelnoot
6430a191f7 fix duplicate users in the following feed 2024-10-21 17:55:06 -04:00
dakkar
24ecef80e7 merge: Re-add missing JP i18n string for allowClickingNotifications (!702) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/702

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-21 20:14:41 +00:00
dakkar
063c597ca6 merge: re-add "copy link (origin)" that was dropped accidentally (!704) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/704

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-21 16:04:38 +00:00
dakkar
d7a3ec9c5e re-add "copy link (origin)" that was dropped accidentally 
there are 2 nearly identical blocks of code that generate the menu for
logged-in users and for not-logged-in… I had missed the logged-in one
 2024-10-21 15:14:56 +01:00
CenTdemeern1
577e66e2ce Update index.d.ts 2024-10-21 14:26:17 +02:00
CenTdemeern1
1811933025 Re-add missing JP i18n string for allowClickingNotifications 2024-10-21 14:19:27 +02:00
dakkar
d103b76ab0 merge: chore: fix type errors in useNoteCapture (!701) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/701

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-21 08:04:34 +00:00
Lhc_fl
5e4ed13213
revert import sort 2024-10-21 09:03:14 +08:00
dakkar
649b525ab2 merge: parity with misskey locales (again) (!698) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/698

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-20 19:35:41 +00:00
Lhc_fl
684be7d709
fix: fix type error of useNoteCapture 2024-10-21 01:38:03 +08:00
Lhc_fl
54addd0390
fix: fix type error of useNoteCapture 2024-10-21 01:35:40 +08:00
dakkar
4ccc0c4b1e merge: Optimizations to InternalStorageService (resolves #753) (!694) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/694

Closes #753

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-20 15:48:46 +00:00
Hazelnoot
90d8050df4 merge: Fix "Mark as Sensitive by default" locking files into a Sensitive state (!700) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/700

Closes #760

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
 2024-10-20 12:17:17 +00:00
Hazelnoot
5482aac3aa merge: upd: remove file on cleaner, fix load more not working (!699) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/699

Closes #762

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
 2024-10-20 12:14:40 +00:00
Marie
65ac5fef46
fix: default sensitive not letting users unmark files 2024-10-20 11:04:48 +02:00
Marie
5e49246c1e
upd: apply suggestion 2024-10-20 08:42:55 +02:00
Hazelnoot
fcd2c93a19 ensure that "thumbnail stored" / "web stored" messages only appear after success 2024-10-20 00:13:07 -04:00
Hazelnoot
7aee3c1617 fix comment typo in InternalStorageService.ts 2024-10-20 00:11:14 -04:00
Hazelnoot
b1d9314d6e pre-create the files directory to reduce IO operations 2024-10-20 00:10:11 -04:00
Hazelnoot
2deb64486b use async IO for InternalStorageService 2024-10-20 00:10:10 -04:00
Marie
8bf7495c92
upd: remove file on cleaner, fix load more not working 2024-10-20 01:58:35 +02:00
piuvas
61e33cb7e3
bring in portuguese locales just because 2024-10-19 08:38:35 -03:00
piuvas
f43aec7c88
merge misskey's locales 2024-10-19 08:29:35 -03:00
piuvas
aa19418037
move new strings to sharkey-locales 2024-10-19 08:28:55 -03:00
dakkar
ba17776b19 merge: version 2024.9.0 (!675) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/675

Approved-by: Julia <julia@insertdomain.name>
Approved-by: Marie <github@yuugi.dev>
 2024-10-18 21:14:49 +00:00
dakkar
2a4c91efcc Merge branch 'develop' into feature/2024.9.0 2024-10-18 22:09:11 +01:00
Marie
290bfd2075 merge: Allow logged in users to refresh polls (!686) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/686

Closes #743

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-18 21:03:07 +00:00
dakkar
52e291af67 Merge branch 'develop' into feature/2024.9.0 2024-10-18 22:00:07 +01:00
Marie
d4ef030fd9 merge: Free up Usernames after deny/decline (!696) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/696

Closes #752 and #759

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-18 18:13:43 +00:00
Marie
ed064b2193
upd: remove type username to confirm dialog 
resolves # 759
 2024-10-18 01:09:46 +02:00
Marie
fea7889e0c
upd: add recommended checks 2024-10-17 21:56:43 +02:00