mkljczk
8cd7716872
Fix Mastodon incoming edits with inlined "likes"
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-01-28 22:47:42 +01:00
lain
acced73e5d
Merge branch 'description' into 'develop'
...
description.exs: Remove suggestion referencing a deleted module
See merge request pleroma/pleroma!4316
2025-01-21 18:15:11 +00:00
mkljczk
4128ea3948
description.exs: Remove suggestion referencing a deleted module
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-01-21 18:24:42 +01:00
mkljczk
f2c612d4ae
Merge branch 'actor-published' into 'develop'
...
Include "published" in actor view
See merge request pleroma/pleroma!4312
2025-01-21 13:03:35 +00:00
Haelwenn
4461cc984d
Merge branch 'proxy-redirect' into 'develop'
...
MediaProxyController: Use 301 for permanent redirects
See merge request pleroma/pleroma!4313
2025-01-21 09:31:17 +00:00
Lain Soykaf
2226171890
MediaProxyController: Use 301 for permanent redirects
2025-01-21 12:24:56 +04:00
mkljczk
38b17933e1
Include "published" in actor view
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-01-19 16:26:46 +01:00
mkljczk
1bebc900ed
Merge branch 'backup-links' into 'develop'
...
Link to exported outbox/followers/following collections in backup actor.json
See merge request pleroma/pleroma!4311
2025-01-18 23:33:10 +00:00
mkljczk
855294bb3d
Link to exported outbox/followers/following collections in backup actor.json
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-01-09 12:58:51 +01:00
mkljczk
aa74c87443
fix tests
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 22:41:53 +01:00
mkljczk
36b71733a0
fix alias ordering
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 21:01:41 +01:00
mkljczk
d818a3d762
Merge remote-tracking branch 'origin/develop' into translate-posts
2024-12-30 18:17:50 +01:00
mkljczk
f565cf2b5b
update spec
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 18:11:21 +01:00
mkljczk
ddf5bfc995
Update changelog
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 17:58:54 +01:00
FloatingGhost
bdb9f888d7
Add /api/v1/followed_tags
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 17:57:57 +01:00
floatingghost
c94c6eac22
Remerge of hashtag following ( #341 )
...
this time with less idiot
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/341
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 17:56:18 +01:00
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
Phantasm
047916445b
docs openbsd: No need to switch users when creating DB
2024-11-29 16:00:52 +01:00
Haelwenn (lanodan) Monnier
2d8ad2267e
mix: Bump captcha for OpenBSD make fixes
...
Ref: https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha/-/merge_requests/10
Ref: https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha/-/merge_requests/9
2024-11-28 22:13:46 +01: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
Phantasm
a323701c33
docs openbsd: spellcheck
2024-11-27 22:21:00 +01:00
Phantasm
49c35f8d95
dosc openbsd: add missing acquire certificate instruction for httpd
2024-11-27 21:47:13 +01:00
Phantasm
accdefb8db
openbsd httpd: use more appropriate HTTP response code for redirect
2024-11-27 21:46:50 +01:00
Phantasm
3b5b3ba4fc
openbsd: properly set daemon workdir, use default rc_start, set MIX_ENV in login.conf
...
Setting the MIX_ENV variable in rc_pre() isn't possible, because the
environment doesn't persist between rc_pre and rc_start(). This way we
can also ditch the custom rc_start() function in favor of the default
one which is just:
rc_start() {
rc_exec "${daemon} ${daemon_flags}
}
2024-11-27 21:40:36 +01:00
Phantasm
e0ba132bce
docs openbsd: ensure db has UTF-8 enconding
2024-11-27 21:24:21 +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
Phantasm
b0721ddbf5
docs openbsd: recommend changing pgsql auth method, remove redundant service check
2024-11-25 00:03:04 +01:00
Phantasm
df492669e5
docs openbsd: proper permission for Pleroma service file
2024-11-24 23:45:03 +01:00
Phantasm
ee25acea6d
docs openbsd: Fix nginx acme challenges, automatic certificate renewals in proper places
2024-11-24 23:43:55 +01:00
Phantasm
79c5ca05c9
docs openbsd: inherit default daemon limits and tweak them
...
su _pleroma commands were also changed in docs to simulate a full login
to apply the custom environment from login.conf
2024-11-24 16:42:24 +01:00
