bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15162 commits 1 branch 0 tags 292 MiB
Commit graph

15162 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
marcin mikołajczak
b3700afdd3 Notification for participation request/accepted participation 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-19 23:20:00 +02:00
marcin mikołajczak
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
marcin mikołajczak
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
marcin mikołajczak
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
marcin mikołajczak
fa9106bb1b Merge remote-tracking branch 'soapbox/develop' into polls 2022-08-16 07:42:22 +02:00
marcin mikołajczak
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
Alex Gleason
f5d8063e43 Merge branch 'merge-pleroma' into 'develop' 
Merge Pleroma

See merge request soapbox-pub/soapbox-be!156
 2022-08-13 19:29:49 +00:00
Alex Gleason
91873fed45
GitLab CI: allow_failure in review_app 2022-08-13 14:29:13 -05:00
Alex Gleason
dae909ad34
Revert "Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'" 
This reverts commit 93f12c0d0d, reversing
changes made to 6ce3f76b5d.
 2022-08-13 14:06:21 -05:00
Alex Gleason
70c2eaf15b
Don't auto-retry erratic tests, wasting CI minutes 2022-08-13 14:05:41 -05:00
Alex Gleason
f5713ab575
Tag erratic test 2022-08-13 14:04:21 -05:00
Alex Gleason
55c15ea81e
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-08-13 13:42:11 -05:00
Alex Gleason
858f83c85a
Restore panel.html and terms-of-service.html so tests pass 2022-08-13 13:35:04 -05:00
Alex Gleason
e1689cb323
Merge remote-tracking branch 'origin/develop' into delete-pleroma-fe 2022-08-13 13:27:25 -05:00
Alex Gleason
a77a6c0b9d
GitLab CI: allow_failure for review_app 2022-08-13 13:27:11 -05:00
Alex Gleason
9069af3187
soapbox.exs: delete landing-fe 2022-08-13 13:26:39 -05:00
Alex Gleason
f3f269b523 Merge branch 'more-docker-fixes' into 'develop' 
docker.exs: don't call fetch_env! for DB_PASS

See merge request soapbox-pub/soapbox-be!154
 2022-08-13 18:07:15 +00:00
Alex Gleason
705ccabec4
Fix landing page image 2022-08-13 13:06:31 -05:00
Alex Gleason
e8cfd1da05
Delete Pleroma FE 2022-08-13 12:50:37 -05:00
Alex Gleason
7d478b6ba3
docker.exs: don't call fetch_env! for DB_PASS 2022-08-13 12:15:26 -05:00
Alex Gleason
366e66b9ee Merge branch 'docker-fixes' into 'develop' 
Docker fixes

See merge request soapbox-pub/soapbox-be!153
 2022-08-13 00:02:22 +00:00
Alex Gleason
362c650f49
Copy .gitignore into .dockerignore 2022-08-12 18:30:06 -05:00
Alex Gleason
547fb9bd24
Docker config: pleroma --> postgres, default config 2022-08-12 18:29:49 -05:00
Alex Gleason
f4b002d844
docker-entrypoint: fix DATABASE_URL building 2022-08-12 18:29:19 -05:00
Alex Gleason
c5649dbd27
Dockerfile: ENV --> ARG 2022-08-12 18:28:55 -05:00
marcin mikołajczak
9ffb4d055a Handle voters count correctly 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-12 23:49:20 +02:00
marcin mikołajczak
3482b5d3a3 wip events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-12 23:11:34 +02:00