Commit graph

6493 commits

Author SHA1 Message Date
0e608c98b2 Rename project to pl
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-28 23:02:11 +02:00
0bf8a2e38c Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-27 20:26:16 +02:00
lain
50af909c01 Merge branch 'pleroma-card-image-description' into 'develop'
Include image description in status media cards

See merge request pleroma/pleroma!4101
2024-04-19 07:39:05 +00:00
6f6bede900 Include image description in status media cards
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-19 10:20:31 +04:00
4f5c4d79c4 FEP-2c59, add "webfinger" to user actor
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-11 17:50:11 +02:00
cd86965cde Add hint to rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 12:01:04 +02:00
1745b128f9 AdminAPI: Allow filtering reports by rule_id
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 11:58:25 +02:00
3d09ea0fca Apply, suggestions, use strings for actual Mastodon API compatibility
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 11:57:28 +02:00
5a6be1dd6e Merge remote-tracking branch 'origin/develop' into fork 2024-03-21 00:00:28 +01:00
lain
987f44d811 Merge branch 'bookmark-folders' into 'develop'
Fix BookmarkFolderView, add test

See merge request pleroma/pleroma!4096
2024-03-20 13:26:47 +00:00
9f4829695b Merge branch 'bookmark-folders' into HEAD 2024-03-20 13:25:30 +01:00
37ec645ff2 Fix BookmarkFolderView, add test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-20 13:24:43 +01:00
Lain Soykaf
9617189e96 Tests: Actually run the bookmark folder tests. 2024-03-19 13:51:04 +04:00
lain
8e37f19883 Merge branch 'test-improvements' into 'develop'
Tests: Explicitly set db pool size and max cases to the same value.

See merge request pleroma/pleroma!4094
2024-03-19 07:44:05 +00:00
Lain Soykaf
665947ab2a Tests: Reduced the max case number to make tests more stable. 2024-03-19 11:03:05 +04:00
Lain Soykaf
923803a533 Tests: Explicitly set db pool size and max cases to the same value. 2024-03-19 10:34:37 +04:00
8b92459345 Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-18 22:00:35 +01:00
Mark Felder
357553a64a Remove usage of :persistent_term for Postgres version storage, fix test
This test should not have been passing. The search result's activity id should not be the same id as the local post.

capture_log was not being used. Removed.
2024-03-18 16:27:52 -04:00
Mark Felder
b822a912ad Remove test for postgres < 11 2024-03-18 16:15:40 -04:00
lain
2b71f4897f Merge branch 'develop' into 'bookmark-folders'
# Conflicts:
#   docs/development/API/differences_in_mastoapi_responses.md
2024-03-18 10:35:02 +00:00
lain
cf0aa1238c Merge branch 'public-polls' into 'develop'
Expose nonAnonymous field from Smithereen polls

See merge request pleroma/pleroma!3962
2024-03-18 06:26:22 +00:00
Lain Soykaf
caf855cf9c ActivityPub.Publisher: Don't try federating if a user doesn't have an inbox. 2024-03-17 16:57:45 +04:00
lain
95bcd5d28f Merge branch 'force-mention' into 'develop'
Add ForceMention mrf

See merge request pleroma/pleroma!4082
2024-03-17 12:32:14 +00:00
feld
0b5bba23ce Merge branch 'backups' into 'develop'
Include following/followers in backups

See merge request pleroma/pleroma!4085
2024-03-15 19:32:35 +00:00
0fb0d081cc Merge branch 'backups-chats' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:48:54 +01:00
3a23924ee8 Reject requests from specified instances if authorized_fetch_mode is enabled
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:38:40 +01:00
51edd70319 Merge branch 'bookmark-folders' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:32:16 +01:00
0e6c94f857 Merge branch 'backups' into fork 2024-03-14 23:30:57 +01:00
53a73aada2 Merge branch 'multitenancy' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:29:24 +01:00
fb572f5aa6 Fix adding language to json ld header, add transmogrifier test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:24:38 +01:00
281c82a49b Add language from activity context in ObjectValidator
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:24:24 +01:00
c5a05a8e14 Rename test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:23:52 +01:00
86f2545068 Rename MapOfString to ContentLanguageMap
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:23:05 +01:00
cf9ecddbee Remove test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:22:22 +01:00
bdff856ab8 Move maybe_add_content_map out of Transmogrifier, use code from tusooa's branch for MapOfString
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:22:15 +01:00
d5a33cf370 Remove test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:19:06 +01:00
0a0e2ccd6e Rename test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:19:02 +01:00
edec300ddb Make status.language == nil for 'und' value
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:18:55 +01:00
adb84b1df9 Add ObjectValidators.LanguageCode type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:18:36 +01:00
bf2a10331e Allow to specify post language
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:18:17 +01:00
70a697201e Gancio support
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:13:26 +01:00
dbd24fe0c2 add test for leaving Mobilizon events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:12:31 +01:00
fa725d50a7 Test "content" for Mobilizon statuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:12:27 +01:00
e9e2b18650 Merge branch 'webhooks_' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:06:25 +01:00
a97334520b Fixes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:00:48 +01:00
612e6284b4 Remove unneeded code
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 22:50:10 +01:00
0f33698747 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 23:08:40 +01:00
bd33a7ac8f Remove stuff I don't need to stay closer to upstream
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 16:07:29 +01:00
3c21a33656 Backup chats and chat messages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 10:57:59 +01:00
bb0b17f4d9 Include following/followers in backups
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-10 23:53:12 +01:00