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

27885 Commits

Author SHA1 Message Date
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 a676b0ee61 paginate in offset mode when querying emoji - fixes #490 
since the backend sorts emojis by name length when a query is present,
the normal pagination with `sinceId` / `untilId` would not work
reliably

`offsetMode` is better in this case, although it will produce
non-stable results if custom emojis that match the query are added or
removed while we paginate
 2024-05-09 21:02:37 +01:00
dakkar 9d91196344 allow `offset` in `admin/emoji/list` - #490 
also, use `skip` + `take` instead of `limit` (the TypeORM docs say so
https://github.com/typeorm/typeorm/blob/master/docs/select-query-builder.md#adding-limit-expression )
 2024-05-09 21:02:34 +01:00
dakkar 3f73251df5 allow computed `offsetMode` in `MkPagination` - #490 2024-05-09 21:01:33 +01:00
dakkar c3cbde68d6 pin to node 20 
node-gyp / re2 seems to fail on node 22
 2024-05-09 19:20:49 +01:00
dakkar cd5686f9ab fix spacing 2024-05-09 17:37:22 +01:00
dakkar 23cbcbaa24 bump version to 2024.3.3 2024-05-09 14:14:15 +01:00
dakkar f1d96b8ae8 merge: fix: incorrect type for quote property (!480) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/480

Closes #401

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
 2024-05-09 09:05:16 +00:00
dakkar f38e55d9de merge: rework pagination - probably fixes #491 (!495) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/495

Closes #491

Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-09 08:15:16 +00:00
dakkar d40500d399 merge: fix: update reaction icons in tutorial to match sharkey icons (!499) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/499

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-09 08:02:59 +00:00
dakkar 16c545aa1f merge: fix: update pl-PL translation for note from verb to noun (!498) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/498

Closes #503

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
 2024-05-09 08:02:01 +00:00
dakkar 01256af028 merge: Rework cache clearing to be fault tolerant (!497) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/497

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-09 08:01:18 +00:00
dakkar 84a98e41b6 merge: make eslint happy (!496) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/496

Approved-by: Tess K <me@thvxl.se>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-09 08:00:54 +00:00
dakkar 89f412c696 merge: Send default reactions as Like activities to Iceshrimp.NET instances (!505) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/505

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-09 07:59:46 +00:00
dakkar 3ab7f3bd8a merge: fix #507: retain custom emoji aspect ratio in admin panel (!510) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/510

Closes #507

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-09 07:59:35 +00:00
dakkar 37989ec0e9 merge: fix: #505 and #516 inconsistent event propagation causes issues in notes and emoji picker when clicking on emojis (!511) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/511

Closes #505 and #516

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-09 07:59:23 +00:00
tess ab074db0c1 fix: retain custom emoji aspect ratio in admin panel for remote emojis 2024-05-08 08:23:32 +02:00
Ember ac9e4733fd merge: laxer HTML sanitisation for admin-controlled text - fixes #447 (!454) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/454

Closes #447

Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-07 20:19:53 +00:00
dakkar 2c40dd31f3 laxer HTML sanitisation for admin-controlled text - fixes #447 2024-05-07 20:19:52 +00:00
Ember ed91663672 merge: don't count "system" local accounts in user chart - fixes #451 (!500) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/500

Closes #451

Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-07 20:17:54 +00:00
dakkar 89f4f0e5f4 don't count "system" local accounts in user chart - fixes #451 2024-05-07 20:17:53 +00:00
Ember 58ff225c4e merge: really edit notes in more cases - fixes #424 (!504) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/504

Closes #424

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
 2024-05-07 20:16:39 +00:00
dakkar eab690a5e3 really edit notes in more cases - fixes #424 2024-05-07 20:16:38 +00:00
dakkar fee39627f1 update merge guide more 2024-05-07 10:20:54 +01:00
tamaina 6e6bb5606b Merge branch 'develop' into release/2024.5.0 2024-05-07 14:38:53 +09:00
tamaina f5d57c02c7 dev: modify release manager to set indent type 2024-05-07 14:38:43 +09:00
tamaina 0fd06e3f0d fix 2024-05-07 11:07:16 +09:00
github-actions[bot] 313515c681 Bump version to 2024.5.0-beta.1 2024-05-07 01:45:00 +00:00
tess 19cba1a12a fix: only stop event propagation in MkEmoji and MkCustomEmoji when menu prop is passed 2024-05-06 23:59:42 +02:00
tamaina 455543b36e change package.json 2024-05-06 21:36:05 +09:00
KevinWh0 a058c855fc changed grabbing theme color for dot to match the other things in this project 2024-05-06 13:59:42 +02:00
KevinWh0 342eda431f fixing a buch of comments 2024-05-06 13:54:43 +02:00
github-actions[bot] 73a5b6cec9 Bump version to 2024.5.0-beta.0 2024-05-06 11:50:00 +00:00
syuilo c639f30d39 Update CHANGELOG.md 2024-05-06 20:41:39 +09:00
syuilo fc77ad9355 refactor(frontend): provide linkNavigationBehavior 2024-05-06 20:37:04 +09:00
Tess K 83df1c0128 merge: feat: check polls and media for muted keywords (!507) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/507

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
 2024-05-04 18:51:36 +00:00
Tess K 5e20de45d7 merge: Compact LD-signed activities against well-known context (!503) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/503

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
 2024-05-04 17:19:42 +00:00
tess 598ebdd44a fix: retain custom emoji aspect ratio in admin panel 2024-05-04 17:49:20 +02:00