Commit graph

15390 commits

Author SHA1 Message Date
tusooa
a022b9d733 Merge branch 'from/upstream-develop/tusooa/alpine-bump' into 'develop'
Use latest alpine version for docker image

See merge request pleroma/pleroma!3719
2022-08-21 01:25:25 +00:00
Tusooa Zhu
c59ee1f172
Expose availability of GET /main/ostatus via instance 2022-08-20 21:19:31 -04:00
Tusooa Zhu
4ec9eeb3f8
Make remote interaction page translatable 2022-08-20 21:14:26 -04:00
Tusooa Zhu
ec0e912c52
Add changelog 2022-08-20 21:14:25 -04:00
Tusooa Zhu
1218adacc5
Display status link in remote interaction form 2022-08-20 21:13:52 -04:00
Tusooa Zhu
b7c75db0f7
Lint 2022-08-20 21:13:51 -04:00
Tusooa Zhu
779457d9a4
Add GET endpoints for remote subscription forms
There are two reasons for adding a GET endpoint:

0: Barely displaying the form does not change anything on the server.

1: It makes frontend development easier as they can now use a link,
instead of a form, to allow remote users to interact with local ones.
2022-08-20 21:13:51 -04:00
Tusooa Zhu
a243a217a7
Fix form item name in status_interact.html 2022-08-20 21:13:51 -04:00
Tusooa Zhu
2701628786
Add remote interaction ui for posts 2022-08-20 21:13:51 -04:00
Tusooa Zhu
f047088a93
Update thread visibility function 2022-08-20 21:06:12 -04:00
Tusooa Zhu
4e7ed563c0
Lint 2022-08-20 20:43:47 -04:00
Tusooa Zhu
3885ee182a
Switch to associated_object_id index 2022-08-20 20:43:46 -04:00
Tusooa Zhu
06678fb4ad
Add function to calculate associated object id 2022-08-20 20:43:40 -04:00
Sean King
cc0f32c253
Add glitch-lily as an installable frontend 2022-08-19 22:54:56 -06:00
Tusooa Zhu
31fd41de0c
Release 2.4.4 2022-08-19 20:29:06 -04:00
Tusooa Zhu
5a2c8ef4cc
Refactor streamer test 2022-08-19 20:24:24 -04:00
Tusooa Zhu
a31d6bb52c
Execute session disconnect in background 2022-08-19 20:24:24 -04:00
Tusooa Zhu
f459c1260b
Lint 2022-08-19 20:24:24 -04:00
Tusooa Zhu
3522852c61
Test that server will disconnect websocket upon token revocation 2022-08-19 20:24:24 -04:00
Tusooa Zhu
eb42e90c4f
Use Websockex to replace websocket_client 2022-08-19 20:24:21 -04:00
Tusooa Zhu
c62a4f1c17
Disconnect streaming sessions when token is revoked 2022-08-19 20:22:45 -04:00
feld
6ccab516a3 Merge branch 'varnish-fix-changelog' into 'develop'
Document the changes for Varnish 7.0+ compatibility and RFC compliance

See merge request pleroma/pleroma!3723
2022-08-19 22:41:42 +00:00
Hélène
0cee3c6e93
emoji-test: update to latest 15.0 draft 2022-08-20 00:21:07 +02:00
b3700afdd3 Notification for participation request/accepted participation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-19 23:20:00 +02:00
4d9ddd4f4b Include join state in StatusView
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-19 16:42:29 +02:00
Alex Gleason
6c87e7f16e Merge branch 'rebased' into 'develop'
Soapbox BE --> Rebased

See merge request soapbox-pub/soapbox-be!163
2022-08-19 13:04:41 +00:00
marcin mikołajczak
365ab9ca4d Merge branch 'polls' into 'develop'
Handle voters count correctly

See merge request soapbox-pub/soapbox-be!165
2022-08-19 05:23:53 +00:00
Hélène
4661b56720
ArticleNotePageValidator: fix replies fixing
Some software, like GoToSocial, expose replies as ActivityPub
Collections, but do not expose any item array directly in the object,
causing validation to fail via the ObjectID validator. Now, Pleroma will
drop that field in this situation too.
2022-08-19 02:45:49 +02:00
a0923b96a0 Fix voters_count in polls from remote Pleroma instances
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-18 23:39:07 +02:00
322e00e45a Revert "Merge branch 'revert-f6e02270' into 'develop'"
This reverts commit 5b8ad6bc91, reversing
changes made to f6e02270c3.
2022-08-18 23:06:18 +02:00
Hélène
61254111e5
HttpSignaturePlug: accept standard (request-target)
The (request-target) used by Pleroma is non-standard, but many HTTP
signature implementations do it this way due to a misinterpretation of
the draft 06 of HTTP signatures: "path" was interpreted as not having
the query, though later examples show that it must be the absolute path
with the query part of the URL as well.

This behavior is kept to make sure most software (Pleroma itself,
Mastodon, and probably others) do not break, but Pleroma now accepts
signatures for a (request-target) containing the query, as expected by
many HTTP signature libraries, and clarified in the draft 11 of HTTP
signatures.

Additionally, the new draft renamed (request-target) to @request-target.
We now support both for incoming requests' signatures.
2022-08-18 17:01:34 +02:00
marcin mikołajczak
5b8ad6bc91 Merge branch 'revert-f6e02270' into 'develop'
Revert "Merge branch 'polls' into 'develop'"

See merge request soapbox-pub/soapbox-be!164
2022-08-18 06:57:52 +00:00
marcin mikołajczak
4de58c2b2c Revert "Merge branch 'polls' into 'develop'"
This reverts merge request !152
2022-08-18 06:38:03 +00:00
marcin mikołajczak
f6e02270c3 Merge branch 'polls' into 'develop'
Handle voters count correctly

See merge request soapbox-pub/soapbox-be!152
2022-08-18 06:34:05 +00:00
Alex Gleason
5e69265d22
README: update rebased logo 2022-08-17 11:29:17 -05:00
Alex Gleason
4de6c67e92
Soapbox BE --> Rebased 2022-08-17 11:25:39 -05:00
FloatingGhost
f41d970a59
fix resolution of GTS user keys 2022-08-16 18:51:34 +02:00
fa9106bb1b Merge remote-tracking branch 'soapbox/develop' into polls 2022-08-16 07:42:22 +02:00
95f18a7296 Add tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
2022-08-15 21:22:06 +02:00
Alex Gleason
02caf99400 Merge branch 'instance-favicon-tests' into 'develop'
Disable instance favicons in tests

See merge request soapbox-pub/soapbox-be!161
2022-08-15 01:44:15 +00:00
Alex Gleason
93c237881f
Disable instance favicons in tests 2022-08-14 20:43:19 -05:00
Alex Gleason
f8a8523d29 Merge branch 'instance-favicons' into 'develop'
Soapbox: enable instance favicons

See merge request soapbox-pub/soapbox-be!160
2022-08-15 00:41:02 +00:00
Alex Gleason
899ac39d71
Soapbox: enable instance favicons 2022-08-14 19:40:14 -05:00
Hélène
88c1c76d3e
Migrations: delete contexts with BaseMigrator
Due to the lengthiness of this task, the migration has been adapted into
a BaseMigrator migration, running in the background instead.
2022-08-15 01:47:09 +02:00
Hélène
bb02ee99f5
CommonFixes: more predictable context generation
`context` fields for objects and activities can now be generated based
on the object/activity `inReplyTo` field or its ActivityPub ID, as a
fallback method in cases where `context` fields are missing for incoming
activities and objects.
2022-08-15 01:46:55 +02:00
Alex Gleason
02ffc908f6 Merge branch 'keycloak-default-scope' into 'develop'
Set better default scope for keycloak

See merge request soapbox-pub/soapbox-be!159
2022-08-14 22:18:24 +00:00
Alex Gleason
91ba80466d
Set better default scope for keycloak 2022-08-14 16:16:20 -05:00
Alex Gleason
a9550ac88d Merge branch 'delete-pleroma-fe' into 'develop'
Delete Pleroma FE

See merge request soapbox-pub/soapbox-be!155
2022-08-13 22:04:59 +00:00
Alex Gleason
ce19607358
index.html: add server-generated-meta so tests pass 2022-08-13 14:33:12 -05:00
Alex Gleason
d4d09828bf
Merge remote-tracking branch 'origin/develop' into delete-pleroma-fe 2022-08-13 14:30:14 -05:00