Haelwenn
ddc321a094
Merge branch 'tusooa/3205-group-actor' into 'develop'
...
Implement group actors
See merge request pleroma/pleroma!3969
2023-12-28 10:46:53 +00:00
Haelwenn
81ce04990e
Merge branch 'typo' into 'develop'
...
Fix some typos
See merge request pleroma/pleroma!4017
2023-12-28 10:02:17 +00:00
marcin mikołajczak
017e35fbf1
Fix some more typos
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-28 00:17:04 +01:00
marcin mikołajczak
f53197c82a
Fix operation name typo
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-27 23:52:46 +01:00
feld
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
Mark Felder
1a337dcc18
These functions in Pleroma.Instances should be defdelegates to Pleroma.Instances.Instance
2023-12-27 12:44:16 -05:00
tusooa
b273025fd7
Add pleroma:group_actors to instance features
2023-12-27 12:28:11 -05:00
tusooa
e9d2fadd8e
Add changelog for group actors
2023-12-27 12:28:11 -05:00
tusooa
e34a975dd9
Do not boost if group is blocking poster
2023-12-27 12:28:10 -05:00
tusooa
5f5533b88a
Test group actor behaviour in SideEffects
2023-12-27 12:28:10 -05:00
tusooa
5459bbc1ef
Allow group actors to boost posts
2023-12-27 12:28:04 -05:00
tusooa
7a58ddfa48
Allow local user to have group actor type
...
https://git.pleroma.social/pleroma/pleroma/-/issues/3205
2023-12-27 12:27:37 -05:00
tusooa
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
marcin mikołajczak
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
lain
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
Haelwenn
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
feld
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
Mark Felder
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
marcin mikołajczak
4f2fb8dc5e
Use consistent terminology
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-21 00:13:13 +01:00
marcin mikołajczak
39d3df86c8
Use consistent terminology
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-21 00:10:30 +01:00
feld
56618873af
Merge branch 'deprecations' into 'develop'
...
More deprecation fixes/cleanup
See merge request pleroma/pleroma!4012
2023-12-20 22:11:35 +00:00
Mark Felder
d9fe41a301
More deprecation fixes
2023-12-20 16:47:58 -05:00
Haelwenn (lanodan) Monnier
1fc53c3077
config/description.exs: Remove quack
...
Was already removed in f40ccce7e9
2023-12-20 16:24:42 -05:00
Mark Felder
fb3eb6e0a4
Fix more Logger warn -> warning
2023-12-20 16:24:27 -05:00
Mark Felder
2207fafa91
Fix more Logger warn -> warning
2023-12-20 16:24:19 -05:00
Mark Felder
cd3abe0b4c
Fix more Logger warn -> warning
2023-12-20 16:23:57 -05:00
feld
cbdd134174
Merge branch 'deprecations' into 'develop'
...
Deprecations
See merge request pleroma/pleroma!4011
2023-12-20 21:13:35 +00:00
Mark Felder
45150848fb
Backwards compatibility for OTP
2023-12-20 15:56:56 -05:00
Mark Felder
3c80c86437
Chase deprecations/warnings for Elixir 1.15
2023-12-20 20:17:25 +00:00
Mark Felder
107f00d93f
OTP26: Chase the :slave.start/3 deprecation
2023-12-20 20:16:39 +00:00
Mark Felder
9896b64f54
Elixir 1.15: Chase the Logger.warn deprecation
2023-12-20 20:16:26 +00:00
feld
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
Mark Felder
bf57fd82bb
Clarify location of test.secret.exs file
2023-12-20 14:12:06 -05:00
Mark Felder
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
feld
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
Mark Felder
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
Haelwenn
8893a044b3
Merge branch 'priority_activities' into 'develop'
...
Priority activities
See merge request pleroma/pleroma!4004
2023-12-18 00:49:09 +00:00
Lain Soykaf
c1423ddca3
ActivityPub.Publisher: Filter inboxes
2023-12-17 11:15:58 +04:00
Lain Soykaf
77bb1bb6c8
Actually write changelog
2023-12-16 21:41:28 +04:00
Lain Soykaf
a0f70cf7d0
Add changelog
2023-12-16 20:40:51 +04:00
Lain Soykaf
c212fc1dcf
User: Ignore non-local users when setting 'last active at'
2023-12-16 20:32:13 +04:00
Lain Soykaf
3fbc80eb58
B ActivityPub.Publisher: Prioritize direct mentions
2023-12-16 20:26:08 +04:00
Haelwenn
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
tusooa
f5559f3aff
Skip changelog for 2.6.1 mergeback
2023-12-15 19:45:23 -05:00
tusooa
453cb6a388
Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1
2023-12-15 19:43:07 -05:00
tusooa
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
Haelwenn
f07b134add
Fix formatting of changelog
2023-12-15 23:52:37 +00:00
lain
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
Lain Soykaf
766011544a
UserViewTest: Add basice service actor test.
2023-12-15 10:01:31 +04:00
Yonle
cb1b52d980
ap userview: add outbox field.
...
Signed-off-by: Yonle <yonle@lecturify.net>
2023-12-15 09:55:06 +04:00