d7f90782e2
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-20 23:32:49 +02:00
lain
e8cd6662eb
Merge branch 'familiar-followers' into 'develop'
...
Implement `/api/v1/accounts/familiar_followers`
See merge request pleroma/pleroma!4098
2024-05-19 12:05:55 +00:00
lain
401aca2548
Merge branch 'mark-read' into 'develop'
...
PleromaAPI: Simplify marking notifications as read
See merge request pleroma/pleroma!4111
2024-05-19 07:48:32 +00:00
Mark Felder
d07d49227f
PleromaAPI: marking notifications as read no longer returns notifications
2024-05-18 18:17:35 +00:00
cc4fccdd80
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-17 18:44:47 +02:00
feld
9988dc2227
Revert "Merge branch 'strip-object-actor' into 'develop'"
...
This reverts merge request !4105
2024-05-16 23:33:48 +00:00
feld
e944b15298
Merge branch 'strip-object-actor' into 'develop'
...
Strip actor from objects before federating
Closes #3269
See merge request pleroma/pleroma!4105
2024-05-15 20:51:47 +00:00
feld
53ef576739
Merge branch 'instance_rules' into 'develop'
...
Instance rules
See merge request pleroma/pleroma!3669
2024-05-15 20:29:04 +00:00
adbd40049d
Merge remote-tracking branch 'mkljczk-github/fork' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 18:11:23 +02:00
7a03e49c4d
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 18:10:03 +02:00
8c3f306c62
Revert to pleroma' card parser
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 17:54:13 +02:00
Mark Felder
16c72d0701
Merge branch 'develop' into fix-muted-web-push
2024-05-11 08:06:04 -04:00
Mark Felder
ccceb41bf3
Add test for StatusView rendering of Cards when missing descriptions
2024-05-08 13:54:57 -04:00
Mark Felder
5e7f4f687e
Improve StatusView tests for Cards
2024-05-08 13:52:25 -04:00
Mark Felder
19002fd6c1
Mastodon API: Remove deprecated GET /api/v1/statuses/:id/card endpoint
...
Removed back in 2019
https://github.com/mastodon/mastodon/pull/11213
2024-05-08 01:44:58 +00:00
Mark Felder
37de58823f
Remove test validating missing descriptions are returned as an empty string
2024-05-08 00:49:29 +00:00
Mark Felder
5bbcf5b8b7
Improve test description
2024-05-08 00:36:16 +00:00
Mark Felder
c16c023ebf
Rich Media Cards are fetched asynchonously and not guaranteed to be available on first post render
2024-05-08 00:26:32 +00:00
Mark Felder
fa66bd95dc
Rich Media Cards are cached by URL not per status
2024-05-08 00:23:59 +00:00
Mark Felder
d21aa1a77c
Respect the TTL returned in OpenGraph tags
2024-05-07 19:54:56 -04:00
Mark Felder
f40084e019
Fix broken tests
2024-05-07 19:54:56 -04:00
feld
750fb25f48
Revert "Merge branch 'pleroma-card-image-description' into 'develop'"
...
This reverts merge request !4101
2024-05-07 23:20:38 +00:00
Mark Felder
dd03184811
Strip actor from objects before federating
2024-05-07 11:54:45 -04:00
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
ccc3ac241f
Add hint to rules
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 11:45:19 +02:00
9e6cf45906
/api/v1/accounts/familiar_followers
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 11:43:56 +02:00
01a5f839c5
Merge remote-tracking branch 'origin/develop' into instance_rules
2024-04-06 10:42:23 +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
Mark Felder
291d531e4c
Unify notification push and streaming events for both local and federated activities
...
This also removes generation of notifications for blocked/filtered/muted users and threads.
2024-03-19 12:11:30 -04: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
918c406a91
Merge remote-tracking branch 'origin/develop' into instance_rules
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-18 13:50:25 +01: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
