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

27008 Commits

Author SHA1 Message Date
dakkar 4ddee7b01e Merge branch 'develop' into future 2024-05-31 11:24:00 +01:00
Marie 9bde071f42 merge: feat: send edit events to servers that interacted (!515) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/515

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-05-30 19:16:10 +00:00
Marie f115c21494 merge: fix(i18n): adjust grammar in about_misskey (!523) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/523

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Leah <kevinlukej@gmail.com>
 2024-05-30 19:09:52 +00:00
Amelia Yukii 55fc2879f3 merge: set the correct "marked an NSFW" when loading admin-user (!483) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/483

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-05-30 14:22:00 +00:00
dakkar 3050dcbef7 set the correct "marked an NSFW" when loading admin-user 2024-05-30 14:22:00 +00:00
fEmber da764d3541 merge: fix: start only one instance of ChartManagementService scheduled job (!514) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/514

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-30 13:18:44 +00:00
fEmber 2532fea702 fix: start only one instance of ChartManagementService scheduled job 2024-05-30 13:18:44 +00:00
fEmber d0be6ca332 merge: fix: don't create duplicate workers when clustering is disabled (!508) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/508

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-30 13:17:52 +00:00
fEmber cebad801e2 fix: don't create duplicate workers when clustering is disabled 2024-05-30 13:17:51 +00:00
Amelia Yukii 0bdfe63a02 merge: fix incorrect variable name (!528) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/528

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-05-30 13:03:55 +00:00
Marie d7bd112b37 fix incorrect variable name 2024-05-30 13:03:54 +00:00
Amelia Yukii 5f4c7af4d1 merge: Fix Visiblity issue (!527) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/527

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-05-30 12:08:30 +00:00
Marie 981975404d Fix Visiblity issue 2024-05-30 12:08:30 +00:00
dakkar dc0bd3c2ee merge: feat: allow using wildcards in antenna (!114) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/114

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Leah <kevinlukej@gmail.com>
 2024-05-30 09:14:21 +00:00
Amelia Yukii 4893efae0f merge: put back button to delete all files for a user - fixes #535 (!526) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/526

Closes #535

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-05-24 20:47:10 +00:00
dakkar c42d61f69b put back button to delete all files for a user - fixes #535 2024-05-24 20:47:10 +00:00
dakkar dbe1c5d055 merge: allow custom oneko image via themes - fixes #472 (!478) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/478

Closes #472

Approved-by: Luna <her@mint.lgbt>
Approved-by: Leah <kevinlukej@gmail.com>
 2024-05-24 09:50:42 +00:00
Amelia Yukii a9b1affdf0 merge: more timeline filters - #228 (!455) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/455

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-05-23 21:56:28 +00:00
dakkar d27ce442ea more timeline filters - #228 2024-05-23 21:56:28 +00:00
Amelia Yukii 47963f323b merge: Ported firefish crop and fade mfm (!525) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/525

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-05-23 21:40:27 +00:00
Leah f9a7cd0daa Ported firefish crop and fade mfm 2024-05-23 21:40:25 +00:00
Amelia Yukii 3d0bf928a7 merge: Ported cutiekeys followmouse mfm (!524) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/524

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-05-23 18:08:31 +00:00
Leah 4c4b431248 Ported cutiekeys followmouse mfm 2024-05-23 18:08:31 +00:00
Sebastian Di Luzio eac9f38942 fix(i18n): adjust grammar in about_misskey 2024-05-20 11:10:45 +00:00
dakkar 95ec40d3c8 merge: allow overriding all string config values via env - fixes #465 (!476) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/476

Closes #465

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Luna <her@mint.lgbt>
 2024-05-17 16:46:02 +00:00
tess 0f04aa2d64 fix: event propagation for reactions button in MkNote 2024-05-16 23:40:55 +02:00
tess 85339cdfeb fix: event propagation for reactions button 2024-05-16 18:07:31 +02:00
dakkar 1c0853e917 merge: Dockerfile: circumvent PEP-668 + fix check_connect.js path (!518) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/518

Approved-by: dakkar <dakkar@thenautilus.net>
 2024-05-15 16:02:22 +00:00
Lucent ab787b8fa6 Dockerfile: circumvent PEP-668 + fix check_connect.js path 2024-05-15 13:53:31 +02:00
dakkar 8732668372 lint 2024-05-11 14:31:56 +01:00
dakkar 9a1ed96a31 fix icons 2024-05-11 14:21:33 +01:00
dakkar 4e28004d0e copy changes from createNote to updateNote 2024-05-11 14:21:17 +01:00
dakkar 451b0ecc9b Merge remote-tracking branch 'misskey/release/2024.5.0' into future-2024-04-25-post 2024-05-11 14:13:07 +01:00
dakkar a81be17d69 make the linter happy 2024-05-11 13:40:28 +01:00
dakkar 8cb2cb057a fix duplicate line in package.json 2024-05-11 13:14:17 +01:00
dakkar 30bd7768d6 Merge branch 'develop' into future-2024-04-25-post 2024-05-11 13:11:07 +01:00
dakkar af2385700d fix some icons 2024-05-11 13:09:32 +01:00
dakkar af801bd9d2 Merge branch 'future-2024-04-10' into future-2024-04-25-post 2024-05-11 13:05:35 +01:00
dakkar 77004280cd Merge branch 'future-2024-03-23' into future-2024-04-25-post 2024-05-11 13:05:31 +01:00
dakkar 91ef2ceed7 port changes from global timeline to bubble timeline 2024-05-11 12:38:01 +01:00
dakkar b8ce9f0b0f remove github bits, again 2024-05-11 12:33:16 +01:00
Sugar 194d8a5527 feat: send edit events to servers that interacted 
a server replied to, renoted or reacted to a note knows about a note,
and as such it should get notified about it being edited.

this matches similar logic in mastodon.
 2024-05-11 09:44:03 +02:00
syuilo 6046ba1841
Merge pull request #13816 from misskey-dev/develop 
developにマージされた分の追いつき用
 2024-05-10 21:33:20 +09:00
dakkar a9e4630cc4 merge: bump develop after 2024.3.3 (!512) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/512

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
 2024-05-10 09:17:28 +00:00
おさむのひと f6af6d9679
fix(backend): UserEntityService.getRelationsの取得処理を軽量化 (#13811) 
* fix(backend): UserEntityService.getRelationsの取得処理を軽量化

* rollback
 2024-05-10 15:33:25 +09:00
おさむのひと b298897bde
fix(backend): 不要なUserProfileの取得を修正 (#13812) 
* fix(backend): 不要なuserProfileの取得を修正

* fix: pnpm@9.0.6 to pnpm@9.1.0

* Revert "fix: pnpm@9.0.6 to pnpm@9.1.0"

This reverts commit eaf265ec2cf255cadeaa516d5b668134bc397211.
 2024-05-10 15:32:23 +09:00
dakkar e47b5a8679 bump version for next devel 2024-05-09 21:33:55 +01:00
dakkar 95959b0d2b Merge remote-tracking branch 'sharkey/stable' into feature/next-release 2024-05-09 21:33:36 +01:00
dakkar 3d6eb18e2a merge: Release 2024.3.3 (!501) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/501

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-09 20:28:58 +00:00
dakkar c3cbde68d6 pin to node 20 
node-gyp / re2 seems to fail on node 22
 2024-05-09 19:20:49 +01:00