Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,347 Commits 1 Branch 0 Tags 222 MiB
56927ffd22
Commit Graph

16347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain
ffa6805c09 Merge branch 'description-type' into 'develop' 
Fix type in config description

See merge request pleroma/pleroma!4104
 2024-05-07 11:39:48 +00:00
marcin mikołajczak
637f5bc431 Fix type in description 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-27 20:29:23 +02:00
Haelwenn
88412daf11 Apply @lanodan's suggestion 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-25 12:34:12 +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
marcin mikołajczak
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
lain
87b8ac3ce6 Merge branch 'receiverworker-error-handling' into 'develop' 
ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}

See merge request pleroma/pleroma!4100
 2024-04-19 06:04:44 +00:00
Haelwenn
71a0373232 Merge branch 'ffmpeg-limiter' into 'develop' 
Prevent Media Helper from respawning ffmpeg for bad media

See merge request pleroma/pleroma!4086
 2024-04-17 05:47:54 +00:00
Haelwenn (lanodan) Monnier
a299ddb10e
ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …} 
Otherwise an error like `{:signature, {:error, {:error, :not_found}}}` ends up considered a success.
 2024-04-17 07:43:47 +02:00
tusooa
d80e0d6873 Merge branch 'user-actor-webfinger' into 'develop' 
FEP-2c59, add "webfinger" to user actor

See merge request pleroma/pleroma!4099
 2024-04-12 03:09:37 +00:00
marcin mikołajczak
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
marcin mikołajczak
ccc3ac241f Add hint to rules 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-06 11:45:19 +02:00
marcin mikołajczak
9e6cf45906 /api/v1/accounts/familiar_followers 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-06 11:43:56 +02:00
marcin mikołajczak
01a5f839c5 Merge remote-tracking branch 'origin/develop' into instance_rules 2024-04-06 10:42:23 +02: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
marcin mikołajczak
37ec645ff2 Fix BookmarkFolderView, add test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-20 13:24:43 +01:00
Mark Felder
462d5aa5cb logger: remove request_id metadata which is not useful 2024-03-19 20:53:40 -04:00
Mark Felder
99cee755d8 Show Logger metadata in dev 2024-03-19 12:15:10 -04:00
Mark Felder
40823462e7 Logger metadata for request path and authenticated user 2024-03-19 12:15:10 -04:00
Mark Felder
7dfd148ff8 Logger metadata for inbound federation requests 2024-03-19 12:15:10 -04:00
Mark Felder
741f22bfe0 MediaHelper: cache failed URLs for 15 minutes to prevent excessive retries 2024-03-19 12:14:03 -04:00
Mark Felder
c25fda34e7 Skip generating notifications for internal users 2024-03-19 12:11:30 -04: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
f775a1931b Merge branch 'transient-validators-defaults' into 'develop' 
Set defaults values on transient objects (attachment, poll options) validators

See merge request pleroma/pleroma!4090
 2024-03-19 12:44:13 +00:00
Lain Soykaf
4e8a1b40cb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into transient-validators-defaults 2024-03-19 16:26:02 +04:00
lain
8a14fdbe47 Update transient-validators-defaults.change 2024-03-19 12:03:43 +00:00
lain
4e37cd85ef Merge branch 'fix-bookmark-test' into 'develop' 
CI: Move changelog check to later in the pipeline

See merge request pleroma/pleroma!4095
 2024-03-19 12:02:10 +00:00
Lain Soykaf
040a980277 Add changelog 2024-03-19 15:03:16 +04:00
Lain Soykaf
afae3a94a4 CI: Move changelog check to later in the pipeline 
No reason to not run tests.
 2024-03-19 13:54:35 +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
3cc8414c2e Add changelog 2024-03-19 10:38:29 +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
lain
ca5766c0a7 Merge branch 'postgres-bump' into 'develop' 
Update minimum Postgres version to 11.0; disable JIT

See merge request pleroma/pleroma!4093
 2024-03-19 04:46:40 +00: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
Mark Felder
1413d2e517 Remove vestiges of old Postgres support 2024-03-18 15:42:15 -04:00
Mark Felder
7f97fbc1ae Update minimum Postgres version to 11.0; disable JIT 
This release is where JIT was introduced and it should be disabled. Pleroma's queries do not benefit from JIT, but it can increase latency of queries.
 2024-03-18 15:36:26 -04:00
lain
0e4e20315b Merge branch 'bookmark-folders' into 'develop' 
Bookmark folders

See merge request pleroma/pleroma!4080
 2024-03-18 14:26:19 +00:00
marcin mikołajczak
60c4cb21ea InstanceView: Update features 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-18 14:02:29 +01:00
marcin mikołajczak
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
4f7f44ced1 Merge branch 'develop' into 'develop' 
Notifications: filter on users rather than activities

See merge request pleroma/pleroma!4089
 2024-03-17 20:17:04 +00:00
Matthieu Rakotojaona
a48f5f860e Notifications: filter on users rather than activities 2024-03-17 20:58:59 +01:00
lain
d5b64846ed Merge branch 'remove-rum-tests' into 'develop' 
CI: Remove RUM tests.

See merge request pleroma/pleroma!4092
 2024-03-17 16:33:26 +00:00
lain
56e456fb5b Merge branch 'fix-3241' into 'develop' 
Consider a case when users.inbox is nil (Fix 3241)

Closes #3241

See merge request pleroma/pleroma!4083
 2024-03-17 13:38:59 +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 Soykaf
0450da88b6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-fix-3241 2024-03-17 16:42:17 +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