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
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
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
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
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
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
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
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
6da22b1d96
Be serious about supported api versions
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-11-03 23:35:38 +01:00