Commit graph

16865 commits

Author SHA1 Message Date
lain
138ead9856 Merge branch 'mergeback/2.8.0-image-fixes' into 'develop'
Mergeback/2.8.0 image fixes

See merge request pleroma/pleroma!4306
2024-12-21 09:20:20 +00:00
lain
fe3e61f6ec Merge branch 'maint/hexpm-images' into 'stable'
Switching release building to mostly use hex.pm images

See merge request pleroma/pleroma!4305
2024-12-21 07:24:16 +00:00
Lain Soykaf
6f3d82e2a0 Add changelog 2024-12-20 16:16:54 +04:00
Lain Soykaf
7dc90f5ea4 Switch release builder to hexpm images (mostly) 2024-12-20 16:14:08 +04:00
lain
a902b53b24 Merge branch '2.8.0-release-fix' into 'stable'
CI: Allow failure for non-musl arm for now

See merge request pleroma/pleroma!4304
2024-12-20 03:52:30 +00:00
Lain Soykaf
89e92121c2 CI: Allow failure for non-musl arm for now 2024-12-20 07:37:15 +04:00
lain
64660423c5 Merge branch 'mergeback/2.8.0' into 'develop'
Mergeback/2.8.0

See merge request pleroma/pleroma!4302
2024-12-19 10:47:04 +00:00
lain
1170dfdd49 Merge branch 'release/2.8.0' into 'stable'
Release/2.8.0

See merge request pleroma/pleroma!4295
2024-12-19 10:15:30 +00:00
Lain Soykaf
c0fdd0e2cf Update changelog 2024-12-09 12:48:11 +04:00
tusooa
b51f5a84eb Verify a local Update sent through AP C2S so users can only update their own objects 2024-12-09 12:43:08 +04:00
Lain Soykaf
8c6b3d3ce6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into release/2.8.0 2024-11-28 11:23:07 +04:00
Haelwenn
16027b769c Merge branch 'fix/install-frontend-in-otp27' into 'develop'
Fix installing frontend in Erlang/OTP 27.1+

See merge request pleroma/pleroma!4300
2024-11-27 14:48:53 +00: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
lain
36f8b924ae Merge branch 'mergeback/2.7.1' into 'develop'
mergeback: Version 2.7.1

See merge request pleroma/pleroma!4299
2024-11-27 08:09:51 +00:00
Haelwenn (lanodan) Monnier
3a8e24fed4
Merge remote-tracking branch 'pleroma/stable' into mergeback/2.7.1 2024-11-26 16:46:47 +01:00
Haelwenn
31487e5be4 Merge branch 'release/2.7.1' into 'stable'
Version 2.7.1

See merge request pleroma/pleroma!4298
2024-11-26 13:38:35 +00:00
Haelwenn (lanodan) Monnier
7bb2dccc05
Version 2.7.1 2024-11-26 14:09:09 +01:00
feld
6a0883e5d3
Merge branch 'bugfix-truncate-remote-user-fields' into 'develop'
User: truncate remote user fields instead of rejecting

See merge request pleroma/pleroma!4220
2024-11-26 14:06:49 +01:00
lain
53c2d2cd87
Merge branch 'mastodon-websocket-fix' into 'develop'
Fix Mastodon WebSocket authentication

See merge request pleroma/pleroma!4206
2024-11-26 14:06:31 +01:00
lain
f45f17b5ff
Merge branch 'follow-validator' into 'develop'
Do not require a cc field when validating an incoming Follow activity

See merge request pleroma/pleroma!4212
2024-11-26 14:04:45 +01:00
feld
a6e97c497b
Merge branch 'following-state-bug' into 'develop'
Fix Following status bug

See merge request pleroma/pleroma!4251
2024-11-26 14:04:21 +01:00
feld
2977779e94
Merge branch 'well-known' into 'develop'
NodeInfo: Accept application/activity+json requests

See merge request pleroma/pleroma!4242
2024-11-26 14:03:18 +01:00
feld
ced6b10c70
Merge branch 'swoosh-mailgun' into 'develop'
Fix Swoosh Mailgun support

See merge request pleroma/pleroma!4217
2024-11-26 13:58:48 +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
Mint
462a6a2000 Revert "Docs: fix OTP mix task command for Meilisearch"
This reverts commit 3a82a51a6e.
2024-11-21 16:52:30 +03:00
lain
2482d56153 Merge branch 'fix-module-search-in-pleroma-ctl' into 'develop'
B ReleaseTasks: Fix task module finding.

See merge request pleroma/pleroma!4297
2024-11-21 13:15:33 +00:00
Lain Soykaf
14dbf789b3 Linting 2024-11-21 16:32:05 +04: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
af7de4c17a Changelog 2024-11-21 02:17:53 +03:00
Mint
3a82a51a6e Docs: fix OTP mix task command for Meilisearch 2024-11-21 02:16:36 +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
Lain Soykaf
0d8c2827e1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into release/2.8.0 2024-11-13 14:05:27 +04: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
lain
83b866b257 Merge branch 'bump-lexbor' into 'develop'
bump fast_html to 2.3.0

See merge request pleroma/pleroma!4294
2024-11-13 07:18:18 +00:00
Haelwenn (lanodan) Monnier
0c3b71e1cc
mix.lock: bump fast_html to 2.3.0 2024-11-13 05:17:51 +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
29b048d351 B TwitterAPI/ControllerTest: Actually test the keys 2024-11-12 14:35:02 +04: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
a815feb299 Merge branch 'weblate' into 'develop'
Translations update from Pleroma Weblate

See merge request pleroma/pleroma!4287
2024-11-12 10:12:09 +00:00
Codimp
1e9edccab8 Translated using Weblate (French)
Currently translated at 5.4% (53 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/fr/
2024-11-12 10:01:15 +00: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
lain
f7bf9a8c8f Merge branch 'dedupe-sharding' into 'develop'
Pleroma.Upload.Filter.Dedupe: sharding directory structure

See merge request pleroma/pleroma!4292
2024-11-12 09:22:44 +00:00
Lain Soykaf
ebea518c8c B DedupeTest: Add explicit test for the sharding structure 2024-11-12 12:43:16 +04:00