Commit graph

10733 commits

Author SHA1 Message Date
2ec404eca4 Merge branch 'fork' into backend-new 2024-12-06 20:30:44 +01:00
b38501ef92 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-06 20:30:32 +01:00
74b384968f fix typos
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-06 20:30:07 +01:00
196ded3ba0 fix typo
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-06 20:25:35 +01:00
1e1b31ec2d Add changelog for BigBuffet-specific changes
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-06 20:21:19 +01:00
f3b722bf53 Merge branch 'fork' into backend-new 2024-12-06 20:05:26 +01:00
kPherox
3f98c8bd1b
fix: skip directory entries
In OTP 27.1 or later, `:zip.unzip/2` without `:skip_directories` option returns directory entries.
However in OTP 26, passing `:skip_directories` returns a `:bad_option` error, so this option is not available for compatibility.
2024-11-27 17:55:33 +09:00
ffa874eba7 Merge remote-tracking branch 'origin/develop' into fork 2024-11-25 19:16:02 +01:00
1f06b2ae6c fix deepl
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-11-25 19:15:44 +01:00
lain
d92d6132f2 Merge branch 'meilisearch/misc-fixes' into 'develop'
Miscellaneous fixes for Meilisearch

See merge request pleroma/pleroma!4296
2024-11-21 14:29:26 +00:00
Lain Soykaf
551534f3ee B ReleaseTasks: Fix task module finding. 2024-11-21 16:07:09 +04:00
Mint
da7132caba Remove unused import 2024-11-21 02:40:27 +03:00
Mint
d65f768b59 Meilisearch: stop attempting to index posts with nil date 2024-11-21 02:14:55 +03:00
Mint
c9f9ec04c8 Meilisearch: use PUT method for indexing Mix task
See https://github.com/meilisearch/meilisearch/issues/2619
2024-11-21 02:13:10 +03:00
375e71631d Merge remote-tracking branch 'origin/develop' into fork 2024-11-19 18:39:47 +01:00
9f5325727e Merge branch 'fork' into backend-new
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-11-17 01:14:37 +01:00
lain
dcb0c47773 Merge branch 'mastodon-websocket-fix' into 'develop'
Fix Mastodon WebSocket authentication

See merge request pleroma/pleroma!4206
2024-11-13 08:22:44 +00:00
831e95595c Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-11-12 12:24:08 +01:00
lain
62bbed1e58 Merge branch 'token-view-scopes' into 'develop'
Include session scopes in TokenView

See merge request pleroma/pleroma!4273
2024-11-12 11:18:10 +00:00
lain
4626a9280a Merge branch 'activity-pub-metadata' into 'develop'
Add metadata provider for ActivityPub alternate links

See merge request pleroma/pleroma!4286
2024-11-12 10:49:36 +00:00
Lain Soykaf
2baa9b0072 Merge branch 'develop' into pleroma-token-view-scopes 2024-11-12 14:33:30 +04:00
lain
8b31316d2d Merge branch 'tusooa/se-opt-out' into 'develop'
Fix nonexisting user will not generate metadata for search engine opt-out

Closes #3329

See merge request pleroma/pleroma!4279
2024-11-12 10:24:28 +00:00
Lain Soykaf
5b3e4cf49b B Providers/ActivityPub: Ensure that nothing explodes on unexpected input. 2024-11-12 14:22:02 +04:00
lain
91b26c683a Merge branch 'fix/vapid_keyword_fallback' into 'develop'
push: make vapid_config fallback to empty array

See merge request pleroma/pleroma!4276
2024-11-12 10:01:05 +00:00
lain
6941c47ac8 Merge branch 'develop' into 'tusooa/se-opt-out'
# Conflicts:
#   lib/pleroma/web/metadata/providers/feed.ex
2024-11-12 09:58:28 +00:00
lain
ee3ab8b625 Merge branch 'atom-tag' into 'develop'
Metadata: Do not include .atom feed links for remote accounts

See merge request pleroma/pleroma!4281
2024-11-12 09:44:29 +00:00
6da22b1d96 Be serious about supported api versions
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-11-03 23:35:38 +01:00
9d6d528bcb Merge branch 'fork' into backend-new 2024-11-01 08:12:37 +01:00
Mark Felder
d2de251c4d Pleroma.Upload.Filter.Dedupe: sharding directory structure
Dedupe now uses a three-level sharding directory structure to improve performance when many files are uploaded and stored on a filesystem instead of an object store. (note: Minio still affected as it still uses a traditional filesystem)

This does not help if you already have hundreds of thousands of files uploaded. The media URLs are permanently part of the activity so the files cannot be relocated. A motivated user could write a tool to move the files and perhaps write an Nginx or equivalent redirect to make the files still accessible, but that is beyond the scope of this change.
2024-10-29 16:00:18 -04:00
Mark Felder
7d5ef81737 Fix /api/v2/media returning the wrong status code for media processed synchronously
The API should return a 202 only if data cannot be returned yet and a followup GET /api/v1/media/:id should be called to retrieve it. This is something Mastodon does when it needs to transcode large media files. It does not apply to Pleroma and causes apps to waste an API call when posting a status which causes apps to appear to hang on higher latency environments, such as on mobile networks.

https://docs.joinmastodon.org/methods/media/#v2
2024-10-27 21:52:42 -04:00
910c21cb85 temporary fix for wordpress events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-22 15:59:29 +02:00
b52c948fb9 Permit leave activity
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-21 21:03:49 +02:00
c396c2cc47 Merge branch 'bites-pleroma' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-21 20:47:27 +02:00
46dc19275b Fix the old poll votes count bug
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-20 12:02:00 +02:00
181581dd6b Add test for BiteValidator
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-18 19:50:32 +02:00
61410ad886 Accept bites for objects
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-18 17:59:46 +02:00
e79dcd2bfe Fix rejecting duplicated bites
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-18 15:46:00 +02:00
ad0ebe666c Add Bite to allowed activity types
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-18 10:23:29 +02:00
c2f3242177 wip test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-18 10:23:06 +02:00
f3825b676a Allow to bite users
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-18 10:23:01 +02:00
3387373caf Remove redundant else clauses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-12 23:58:21 +02:00
d580f81f27 Merge branch 'fork' into backend-new
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-12 23:57:31 +02:00
60ec42cb9c Add metadata provider for ActivityPub alternate links
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-12 23:45:18 +02:00
95edffdb19 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-12 18:10:15 +02:00
feld
639016bdee Merge branch 'refactor-change-password' into 'develop'
LDAP: permit password changing

See merge request pleroma/pleroma!4285
2024-10-11 20:48:20 +00:00
feld
4557cd960e Merge branch 'remote-report-policy' into 'develop'
Remote report policy

See merge request pleroma/pleroma!4280
2024-10-11 20:23:46 +00:00
feld
dd7f699d4a Merge branch 'tusooa/3331-fix-incoming-block' into 'develop'
Fix incoming Blocks being rejected

Closes #3331

See merge request pleroma/pleroma!4282
2024-10-11 20:22:21 +00:00
Mark Felder
1da057e6a4 Reorganize the LDAP module 2024-10-11 15:51:56 -04:00
Mark Felder
6bc70b8b2a Add change_password/3 to LDAP module 2024-10-11 15:45:09 -04:00
Mark Felder
67cc38b5ac Support password changes for LDAP auth backend 2024-10-11 15:39:38 -04:00