017e35fbf1
Fix some more typos
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-28 00:17:04 +01:00
f53197c82a
Fix operation name typo
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-27 23:52:46 +01:00
47e00524f7
Merge branch 'instance-defdelegates' into 'develop'
...
defdelegates for Pleroma.Instances
See merge request pleroma/pleroma!4016
2023-12-27 17:51:52 +00:00
1a337dcc18
These functions in Pleroma.Instances should be defdelegates to Pleroma.Instances.Instance
2023-12-27 12:44:16 -05:00
40f170f0a7
Merge branch 'webfinger-fix' into 'develop'
...
Use correct domain for fqn and InstanceView
See merge request pleroma/pleroma!3958
2023-12-27 17:10:32 +00:00
28e5e65676
Merge remote-tracking branch 'origin/develop' into webfinger-fix
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-22 13:29:56 +01:00
5f1d707367
Merge branch 'bad_inbox_request' into 'develop'
...
Return a 400 from a bad delivery attempt to the inbox
Closes #2884
See merge request pleroma/pleroma!4009
2023-12-22 11:04:25 +00:00
bd50892c25
Merge branch 'instance-v2' into 'develop'
...
Implement api/v2/instance route
See merge request pleroma/pleroma!3939
2023-12-21 21:14:46 +00:00
344c798b4c
Merge branch 'fix-otp-comparison' into 'develop'
...
Fix invalid string comparison for OTP versions and replace with config
See merge request pleroma/pleroma!4013
2023-12-20 23:26:59 +00:00
928bda2e43
Fix invalid string comparison for OTP versions and replace with config
...
Old way was wrong for multiple reasons. If we do this as a config value it fixes :slave.start/3 being picked up as a compile warning on OTP26.
Also if we want to do any real clustering we'll need something like this to support OTP25 and older.
2023-12-20 23:13:33 +00:00
4f2fb8dc5e
Use consistent terminology
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-21 00:13:13 +01:00
39d3df86c8
Use consistent terminology
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-21 00:10:30 +01:00
56618873af
Merge branch 'deprecations' into 'develop'
...
More deprecation fixes/cleanup
See merge request pleroma/pleroma!4012
2023-12-20 22:11:35 +00:00
d9fe41a301
More deprecation fixes
2023-12-20 16:47:58 -05:00
1fc53c3077
config/description.exs: Remove quack
...
Was already removed in f40ccce7e9
2023-12-20 16:24:42 -05:00
fb3eb6e0a4
Fix more Logger warn -> warning
2023-12-20 16:24:27 -05:00
2207fafa91
Fix more Logger warn -> warning
2023-12-20 16:24:19 -05:00
cd3abe0b4c
Fix more Logger warn -> warning
2023-12-20 16:23:57 -05:00
cbdd134174
Merge branch 'deprecations' into 'develop'
...
Deprecations
See merge request pleroma/pleroma!4011
2023-12-20 21:13:35 +00:00
45150848fb
Backwards compatibility for OTP
2023-12-20 15:56:56 -05:00
3c80c86437
Chase deprecations/warnings for Elixir 1.15
2023-12-20 20:17:25 +00:00
107f00d93f
OTP26: Chase the :slave.start/3 deprecation
2023-12-20 20:16:39 +00:00
9896b64f54
Elixir 1.15: Chase the Logger.warn deprecation
2023-12-20 20:16:26 +00:00
d72d42f9ce
Merge branch 'testsecrets' into 'develop'
...
Clarify location of test.secret.exs file
See merge request pleroma/pleroma!4010
2023-12-20 19:13:03 +00:00
bf57fd82bb
Clarify location of test.secret.exs file
2023-12-20 14:12:06 -05:00
f43f33e307
Return a 400 from a bad delivery attempt to the inbox
...
This stops the backend from generating 500 errors from these events.
2023-12-19 13:56:17 -05:00
99b07c817e
Merge branch 'web_push' into 'develop'
...
Fix Web Push notification delivery
See merge request pleroma/pleroma!4008
2023-12-19 16:19:35 +00:00
e2066994b1
Fix Web Push notification delivery
...
Finch does not automatically append header content-type: octet-stream for binary payloads.
2023-12-19 10:56:55 -05:00
8893a044b3
Merge branch 'priority_activities' into 'develop'
...
Priority activities
See merge request pleroma/pleroma!4004
2023-12-18 00:49:09 +00:00
c1423ddca3
ActivityPub.Publisher: Filter inboxes
2023-12-17 11:15:58 +04:00
77bb1bb6c8
Actually write changelog
2023-12-16 21:41:28 +04:00
a0f70cf7d0
Add changelog
2023-12-16 20:40:51 +04:00
c212fc1dcf
User: Ignore non-local users when setting 'last active at'
2023-12-16 20:32:13 +04:00
3fbc80eb58
B ActivityPub.Publisher: Prioritize direct mentions
2023-12-16 20:26:08 +04:00
147b37b893
Merge branch 'mergeback/2.6.1' into 'develop'
...
mergeback: 2.6.1
Closes #3194
See merge request pleroma/pleroma!4003
2023-12-16 01:03:37 +00:00
f5559f3aff
Skip changelog for 2.6.1 mergeback
2023-12-15 19:45:23 -05:00
453cb6a388
Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1
2023-12-15 19:43:07 -05:00
6722b7f395
Merge branch 'release/2.6.1' into 'stable'
...
Release: 2.6.1
See merge request pleroma/pleroma!3999
2023-12-16 00:36:08 +00:00
f07b134add
Fix formatting of changelog
2023-12-15 23:52:37 +00:00
7622a83973
Merge branch 'service-actor-outbox' into 'develop'
...
ap userview: add outbox field.
See merge request pleroma/pleroma!4002
2023-12-15 06:22:55 +00:00
766011544a
UserViewTest: Add basice service actor test.
2023-12-15 10:01:31 +04:00
cb1b52d980
ap userview: add outbox field.
...
Signed-off-by: Yonle <yonle@lecturify.net>
2023-12-15 09:55:06 +04:00
948f01f19a
Bundle 2.6.1 frontend
2023-12-14 20:32:49 -05:00
ad6a6aa07b
Bump version to 2.6.1
2023-12-14 20:14:41 -05:00
b1ea63b4c6
changelog.d/system-cflags.fix: New entry
2023-12-14 20:13:25 -05:00
41f6e8f7f4
mix: Bump elixir-captcha for system-CFLAGS
2023-12-14 20:13:20 -05:00
08839602bd
mix: cherry-pick eblurhash latest git for system-CFLAGS
2023-12-14 20:13:00 -05:00
35090f6eac
TwitterAPI: Return proper error when healthcheck is disabled
2023-12-14 20:11:01 -05:00
272271d939
docs: clang is also supported
2023-12-14 07:29:54 -05:00
1b22f13488
docs: Put a max version on erlang and elixir
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3194
2023-12-14 07:29:54 -05:00
marcin mikołajczak