Lain Soykaf
263b02ffcb
Tests: Use StaticConfig when possible.
2025-02-23 17:52:17 +04:00
Lain Soykaf
a92b1fbded
UserRelationshipTest: Don't use Mock.
2025-02-23 17:51:25 +04:00
lain
6f48ade417
Merge branch 'post-languages' into 'develop'
...
Allow to specify post language
See merge request pleroma/pleroma!3940
2025-02-22 12:42:42 +00:00
lain
801a2256f4
Merge branch 'follow-hashtags' into 'develop'
...
Hashtag following (from Akkoma)
See merge request pleroma/pleroma!4307
2025-02-22 12:26:18 +00:00
lain
fe3c72f7a2
Merge branch 'docs-fix' into 'develop'
...
Cheatsheet: Use the correct section
See merge request pleroma/pleroma!4325
2025-02-22 12:18:19 +00:00
Lain Soykaf
0d7d6ebebb
Cheatsheet: Use the correct section
2025-02-22 16:17:30 +04:00
feld
ce3a2b49f2
Merge branch 'feld/emailed-patch' into 'develop'
...
Fix missing check for domain presence in rich media ignore_host configuration
See merge request pleroma/pleroma!4324
2025-02-22 02:16:38 +00:00
Mark Felder
f26509bf16
Fix missing check for domain presence in rich media ignore_host configuration
2025-02-21 17:38:55 -08:00
mkljczk
31e3b98641
Merge branch 'fix-incoming-scrobbles' into 'develop'
...
Allow incoming "Listen" activities
See merge request pleroma/pleroma!4323
2025-02-17 21:07:57 +00:00
mkljczk
d905fa0ad8
Allow incoming "Listen" activities
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17 21:28:07 +01:00
mkljczk
ce4c07cc2b
update test
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17 19:21:08 +01:00
mkljczk
04af8bfd9c
credo
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17 18:26:24 +01:00
mkljczk
120fbbc97e
Include contentMap in outgoing posts
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17 17:55:03 +01:00
mkljczk
ea01b5934f
Merge remote-tracking branch 'origin/develop' into post-languages
2025-02-17 17:36:02 +01:00
lain
a1f4da7ae2
Merge branch '3355-vips-blurhash' into 'develop'
...
AnalyzeMetadata: Don't crash on grayscale image blurhash
Closes #3355
See merge request pleroma/pleroma!4319
2025-01-30 09:19:59 +00:00
Lain Soykaf
ebd8278910
Add changelog
2025-01-30 12:32:16 +04:00
Lain Soykaf
81ab906466
AnalyzeMetadata: Don't crash on grayscale image blurhash
2025-01-30 12:18:20 +04:00
mkljczk
011d70df79
Merge branch 'fix-mastodon-edits' into 'develop'
...
Fix Mastodon incoming edits with inlined "likes"
See merge request pleroma/pleroma!4318
2025-01-28 22:33:08 +00:00
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
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
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
