mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-05-17 01:02:38 +00:00
Code Issues Projects Releases Wiki Activity
15957 commits 212 branches 55 tags 260 MiB
Commit graph

15957 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lain Soykaf 67e727d02f Add changelog 2024-03-19 14:59:25 +04: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 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
Lain Soykaf f0cca36e07 CI: Remove RUM tests. 2024-03-17 15:39:24 +04: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
marcin mikołajczak bb0b17f4d9 Include following/followers in backups 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-10 23:53:12 +01:00
tusooa df7a8d4efe Merge branch 'instance-contact-account' into 'develop' 
Add contact account to InstanceView

See merge request pleroma/pleroma!3960
 2024-03-10 13:14:19 +00:00
feld 72daf522c9 Merge branch 'fix-framegrabs' into 'develop' 
Fix ffmpeg framegrabs with Exile

See merge request pleroma/pleroma!4087
 2024-03-08 14:48:26 +00:00
marcin mikołajczak c0c4a9ed0d Merge remote-tracking branch 'origin/develop' into instance-contact-account 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-08 12:12:55 +01:00
tusooa 139057f346 Merge branch 'link-verification' into 'develop' 
Verify profile link ownership with rel="me"

Closes #2733

See merge request pleroma/pleroma!3959
 2024-03-08 00:52:09 +00:00
Mark Felder 54ff7234b9 Fix ffmpeg framegrabs with Exile 2024-03-07 17:38:21 -05:00
marcin mikołajczak 961a5dd4cd Add test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-07 16:42:22 +01:00
marcin mikołajczak b7c625db0f Merge remote-tracking branch 'origin/develop' into link-verification 2024-03-07 13:13:49 +01:00
tusooa 47ce33a90d Apply tusooa's suggestion 2024-03-07 11:55:31 +00:00
tusooa 1422082bf2 Apply ledyba's suggestion(s) to 1 file(s) 2024-03-07 04:43:56 +00:00
tusooa 8298b326a7 Merge branch 'instance-v2' into 'develop' 
Add some missing fields to instanceV2

See merge request pleroma/pleroma!4081
 2024-03-07 01:31:27 +00:00
Kaede Fujisaki 0242c1f691 fmt 2024-03-02 18:34:12 +09:00
Kaede Fujisaki 1311f8314e add changelog.d 2024-03-02 18:24:39 +09:00
Kaede Fujisaki fb1873b6ec add changelog.d 2024-03-02 18:23:56 +09:00
Kaede Fujisaki 2e548c31d4 Add changelog 2024-03-02 18:13:36 +09:00
Kaede Fujisaki 6ad4acea50 Consider a case when inbox is nil 2024-03-02 18:09:08 +09:00
marcin mikołajczak 9cfa4e67b1 Add ForceMention mrf 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-01 18:16:09 +01:00
marcin mikołajczak acb9e46074 Add some missing fields to instanceV2 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-02-27 13:25:26 +01:00
Haelwenn 03e54aaba9 Merge branch 'remote-fetcher-error' into 'develop' 
RemoteFetcherWorker: Make sure {:error, _} is returned on failure

See merge request pleroma/pleroma!4077
 2024-02-24 11:37:34 +00:00
feld bd4d2e1d83 Merge branch 'exile-freebsd' into 'develop' 
Exile: change to upstream pre-release commit that fixes build on FreeBSD

See merge request pleroma/pleroma!4079
 2024-02-23 20:52:04 +00:00
Mark Felder 267e20dbcd Exile: change to upstream pre-release commit that fixes build on FreeBSD 2024-02-23 15:36:37 -05:00
feld 6144cb43a8 Merge branch 'gun-pool-retry' into 'develop' 
Gun connection pooling: rename variable for clarity

See merge request pleroma/pleroma!4078
 2024-02-23 16:44:53 +00:00
Mark Felder f4e48bc53e Rename variable to make the worker retry logic easier to read 
The boolean value matches the intent of the "last_attempt" variable name now
 2024-02-23 11:12:10 -05:00
Haelwenn 00e828b1a0 Merge branch 'gun-pool-retry' into 'develop' 
Gun connection pool retry fix

See merge request pleroma/pleroma!4076
 2024-02-23 06:47:56 +00:00
Haelwenn (lanodan) Monnier 6af6a9704d
RemoteFetcherWorker: Make sure {:error, _} is returned on failure 
Otherwise jobs are considered a success.
 2024-02-23 01:59:30 +01:00
marcin mikołajczak c592a0e58d Merge remote-tracking branch 'origin/develop' into HEAD 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-02-22 21:05:20 +01:00
Mark Felder 72fc41d891 Prevent publisher jobs from erroring if the connection pool is full 
A full pool is a soft-error. Snooze the job for 30 seconds and try again.
 2024-02-22 14:14:40 -05:00
Mark Felder ac55764599 Gun Connection Pool was not attempting to free a connection and retry once if the pool was full. 2024-02-22 14:07:46 -05:00
Haelwenn f0468697cd Merge branch 'mergeback/2.6.2' into 'develop' 
Mergeback: Security Release 2.6.2

Closes #3245

See merge request pleroma/pleroma!4075
 2024-02-20 10:52:46 +00:00
Haelwenn (lanodan) Monnier e149ee6e22
Mergeback of security release 2.6.2 2024-02-20 09:34:11 +01:00
Haelwenn (lanodan) Monnier 7d624c4750
StealEmojiPolicy: Sanitize shortcodes 
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3245
 2024-02-20 09:09:54 +01:00
feld 0b9bc4a0d0 Merge branch 'memleak' into 'develop' 
Force more frequent full_sweep GC runs on the Websocket processes

See merge request pleroma/pleroma!4060
 2024-02-17 16:21:55 +00:00
Mark Felder 7e99d0619d Force more frequent full_sweep GC runs on the Websocket processes 
Websocket processes seem to be the primary culprit for Binary memory allocation bloat.
 2024-02-17 09:53:52 -05:00
Haelwenn a145d909b5 Merge branch 'weblate' into 'develop' 
Translations update from Pleroma Weblate

See merge request pleroma/pleroma!4070
 2024-02-16 18:28:55 +00:00
SyoBoN 2c9fed9b73 Translated using Weblate (Japanese) 
Currently translated at 63.1% (60 of 95 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-errors/ja/
 2024-02-16 17:54:01 +00:00
feld 0fbec6b532 Merge branch 'deps-changelog-revert' into 'develop' 
Revert "Support a new changelog entry type: deps"

See merge request pleroma/pleroma!4071
 2024-02-16 17:53:52 +00:00