1
0
Commit Graph

5638 Commits

Author SHA1 Message Date
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 cd5686f9ab fix spacing 2024-05-09 17:37:22 +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 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
tess 19cba1a12a fix: only stop event propagation in MkEmoji and MkCustomEmoji when menu prop is passed 2024-05-06 23:59:42 +02: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
Hazel Koehler cf317da244 revert refactor and cleanup 2024-05-03 22:26:35 -04:00
Essem f843bf6c17 fix: Add unicode flag to custom emoji regexes 2024-05-03 11:48:00 -05:00
Hazel Koehler 26f8919432 feat: check polls and media for muted keywords 2024-05-02 20:31:34 -04:00
dakkar d0a2708f91 merge: handle non-ASCII emoji names (!464)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/464

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-05-02 21:06:10 +00:00
dakkar 12d92b174d merge: save and restore UI language together with other prefs - fixes #443 (!451)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/451

Closes #443

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Ember <acomputerdog@gmail.com>
2024-05-02 21:05:38 +00:00
Tess K b7ceb2063b fix: MkPageWindow doesn't render custom emojis in the titlebar when displaying a user profile who has custom emojis in their display-name 2024-05-02 17:53:05 +00:00
ShittyKopper e333283905 Send default reactions as Like activities to Iceshrimp.NET instances 2024-05-02 02:37:59 +03:00
dakkar 45182c17e2 fix imports 2024-05-01 17:41:33 +01:00
dakkar 6ae01e28aa Compact LD-signed activities against well-known context
This should defend against some spoofing attacks, see also
https://nvd.nist.gov/vuln/detail/CVE-2022-24307 for Mastodon,
https://iceshrimp.dev/iceshrimp/iceshrimp/commit/febb499fcb5fe3d56ca79025e4b5851464660c38
from Iceshrimp and
https://firefish.dev/firefish/firefish/-/commit/e790d6be90dfd5dc6471b650a54520761bb9d745
for Firefish

Thanks to @tesaguri@fedibird.com for reporting and providing the patch.
2024-04-30 10:16:57 +01:00
dakkar ce8d0e45e9 fix backend tests 2024-04-25 11:56:19 +01:00
dakkar deb2474bdb sync notes/edit.ts from notes/create.ts 2024-04-25 11:44:24 +01:00
dakkar 7606bce362 sync NoteEditService from NoteCreateService 2024-04-25 11:44:24 +01:00
dakkar 183cf962a0 sync NoteCreateService.create with .import
again, git merged on the wrong function
2024-04-25 11:44:24 +01:00
dakkar 76a4ebae8a re-instate "followed users from muted instances are not muted" 2024-04-25 11:44:24 +01:00
dakkar 4fe8a26081 Merge remote-tracking branch 'misskey/develop' into future-2024-04-25 2024-04-25 11:44:24 +01:00
dakkar ea6629cebf Merge branch 'develop' into future-2024-04-10-post 2024-04-25 11:18:30 +01:00
Cocoa Hoto 85339ca751 feat: improve emoji endpoint (#13742) 2024-04-25 11:03:34 +09:00
FineArchs 553ba84792 AiScriptのバージョンを0.18.0に上げる (#13743)
* Update package.json

* Update autogen files

* Update flash-edit.vue

* Update flash-edit.vue

* Update CHANGELOG.md

* revert
2024-04-25 10:34:26 +09:00
PrivateGER 493775ad7b reformat expression 2024-04-24 16:05:30 +02:00
dakkar 0f3764ff71 teach ReactionService about non-ASCII emoji names 2024-04-23 14:42:02 +01:00
dakkar 504ff4c2af increase page size for most admin lists - #491
Since I can't quite figure out how to prevent `MkPagination` from
truncating the lists too eagerly, I'm going to hide the problem by
making it truncate _less_.
2024-04-21 11:17:17 +01:00
Sugar 9545b8209a fix: update reaction icons in tutorial to match sharkey icons 2024-04-20 21:09:28 +02:00
Latte macchiato dd3d562a1e Rework cache clearing to be fault tolerant 2024-04-19 21:58:37 +00:00
dakkar fa60c1d4bf make eslint happy
also add some types to `chiptune2.ts`
2024-04-19 14:42:58 +01:00