Commit graph

27242 commits

Author SHA1 Message Date
Marie
886948769e merge: fix custom emoji pagination when searching - fixes #490 (!489)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/489

Closes #490

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-05-31 18:39:01 +00:00
Marie
11bd8e9571 merge: escape \ character in sqlLikeEscape (!529)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/529

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-31 18:38:04 +00:00
dakkar
3f76cfe9a6 Merge tag '2024.5.0' into future-2024-05-31 2024-05-31 19:34:56 +01:00
Marie
86ccbd9487 merge: Fix/fixing mastodon api search mfm (!532)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/532

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-31 18:32:51 +00:00
dakkar
349856bbac fix more linting 2024-05-31 15:56:22 +01:00
dakkar
38ff7fa3e5 *probably* fix FederationChart re: suspended instances
this is a misskey bug, they'll probably fix it soon, hopefully the
same way
2024-05-31 13:31:49 +01:00
github-actions[bot]
6078081c33 [skip ci] Release: 2024.5.0 2024-05-31 12:24:53 +00:00
dakkar
8c301de790 lint frontend 2024-05-31 13:24:00 +01:00
github-actions[bot]
a59aa20be8 Bump version to 2024.5.0-rc.13 2024-05-31 12:18:52 +00:00
syuilo
61eec93f4e Revert "2024.5.0"
This reverts commit 27d1b7e615.
2024-05-31 21:16:35 +09:00
dakkar
c699675451 fix Indian locale 2024-05-31 13:11:02 +01:00
dakkar
43d15506aa add sentry options to env overrides 2024-05-31 13:10:02 +01:00
syuilo
27d1b7e615 2024.5.0 2024-05-31 21:09:19 +09:00
github-actions[bot]
316d192bc0 Bump version to 2024.5.0-rc.12 2024-05-31 12:05:47 +00:00
dakkar
e045652c80 lint config.ts 2024-05-31 13:00:59 +01:00
dakkar
1c2bb90ac5 fix types in my test 2024-05-31 12:59:32 +01:00
dakkar
bf710428eb various fixes after the merge 2024-05-31 12:55:53 +01:00
dakkar
1169614b7c something rebuilt the locale index… 2024-05-31 12:55:14 +01:00
dakkar
f8c95ea86a rebuild misskey-js 2024-05-31 12:42:40 +01:00
dakkar
43bd8ace96 replace icons 2024-05-31 12:41:41 +01:00
dakkar
326b2c254a copy upstream NoteCreateService changes to NoteEditService 2024-05-31 12:32:31 +01:00
dakkar
3372e0ffe1 Merge remote-tracking branch 'misskey/release/2024.5.0' into future 2024-05-31 12:26:07 +01:00
github-actions[bot]
46164f879b Bump version to 2024.5.0-rc.11 2024-05-31 11:20:13 +00:00
github-actions[bot]
374c8791d7 Bump version to 2024.5.0-rc.10 2024-05-31 11:13:42 +00:00
syuilo
e8f523f00a
Merge branch 'develop' into release/2024.5.0 2024-05-31 20:11:55 +09:00
dakkar
7b630b48b5 Merge branch 'develop' into future 2024-05-31 11:43:09 +01:00
dakkar
19bc4025ea merge: lint our MRs (!506)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/506

Approved-by: Tess K <me@thvxl.se>
Approved-by: Marie <marie@kaifa.ch>
2024-05-31 10:39:45 +00:00
dakkar
0a9697b405 merge: correcty load/save withBots - fixes #528 (!522)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/522

Closes #528

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-05-31 10:38:27 +00:00
dakkar
11aac8253d merge: look inside url when checking activity origin - #512 (!521)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/521

Closes #512

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-05-31 10:37:54 +00:00
dakkar
ad8d916775 minimal fixes, thanks tests 2024-05-31 11:36:47 +01:00
dakkar
4f346ebe0c merge: fix types in config.ts (!520)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/520

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-05-31 10:36:20 +00:00
syuilo
030082f756 🎨 2024-05-31 19:35:27 +09:00
dakkar
f412a074ff misskey-js update after our changes 2024-05-31 11:25:58 +01:00
dakkar
4ddee7b01e Merge branch 'develop' into future 2024-05-31 11:24:00 +01:00
KevinWh0
1656c02536 renamed toMastoHtml to toMastoApiHtml to clear up what it does 2024-05-31 12:21:25 +02:00
KevinWh0
145c4ba132 fixed the search url 2024-05-31 12:19:18 +02:00
dakkar
aed5f18319 merge: fix: fix typo in readme (!530)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/530

Approved-by: Marie <marie@kaifa.ch>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-05-31 10:19:00 +00:00
github-actions[bot]
dc55adbaf7 Bump version to 2024.5.0-rc.9 2024-05-31 07:06:41 +00:00
syuilo
90ba1ca1f9
Merge branch 'develop' into release/2024.5.0 2024-05-31 16:06:00 +09:00
zyoshoka
514a65e453
perf(backend): avoid N+1 selects from user table when packing many entities (#13911)
* perf(backend): avoid N+1 selects from `user` table when packing many entities

* perf(backend): use `packMany` instead of mapping to `pack`
2024-05-31 15:32:42 +09:00
syuilo
a3468fd05b
Merge branch 'develop' into release/2024.5.0 2024-05-31 14:59:32 +09:00
syuilo
97be1a53ad Update 1717117195275-inquiryUrl.js 2024-05-31 14:59:02 +09:00
github-actions[bot]
1e007b63aa Bump version to 2024.5.0-rc.8 2024-05-31 04:38:45 +00:00
syuilo
a0c596b030
Merge branch 'develop' into release/2024.5.0 2024-05-31 13:28:25 +09:00
syuilo
eaa85f5aa3 fix test 2024-05-31 13:28:11 +09:00
syuilo
dfeaa1145b
Merge branch 'develop' into release/2024.5.0 2024-05-31 13:19:49 +09:00
syuilo
0082747237
New Crowdin updates (#13892)
* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)
2024-05-31 13:19:37 +09:00
syuilo
5b8f8e7087 fix(backend): fix backward compatibility of antenna 2024-05-31 11:24:17 +09:00
syuilo
be11fd7508 enhance: サーバーのお問い合わせ先URLを設定できるように 2024-05-31 10:12:23 +09:00
syuilo
ac4a001e9f fix code style 2024-05-31 10:11:11 +09:00