Commit graph

15799 commits

Author SHA1 Message Date
lain
c0cfc454ba Merge branch 'from/upstream-develop/tusooa/register-approval' into 'develop'
Fix failure when registering a user with no email when approval required

Closes #3021

See merge request pleroma/pleroma!3807
2022-12-15 23:07:49 +00:00
Lain Soykaf
bb27e4134b AudioVideoValidator: Fix embedded attachment requirements 2022-12-15 18:06:28 -05:00
Lain Soykaf
4a32b584e1 StatusView: Fix warning 2022-12-15 18:02:33 -05:00
Lain Soykaf
9838790a7d AttachmentValidator: Actually require url 2022-12-15 17:46:20 -05:00
Lain Soykaf
63d00f8123 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps 2022-12-15 17:19:36 -05:00
tusooa
2554028097
Make SimplePolicy Update-aware
This is inspired by d5828f1c5e
2022-12-15 11:57:45 -05:00
tusooa
dc7efcd08b
Make TagPolicy Update-aware
This is inspired by d5828f1c5e
2022-12-15 11:08:24 -05:00
tusooa
62c27e0164
Fix failure when registering a user with no email when approval required 2022-12-14 01:04:42 -05:00
Alex Gleason
bed6f1c00c Merge branch 'mix-user-approve' into 'develop'
Approve & confirm users created through the CLI

Closes #157

See merge request soapbox-pub/rebased!226
2022-12-14 00:09:18 +00:00
Alex Gleason
63757fd1fa
Approve & confirm users created through the CLI 2022-12-13 17:07:53 -06:00
duponin
9876742358 Return 413 when an actor's banner or background exceeds the size limit 2022-12-11 23:15:08 +01:00
duponin
452595baed Uploading an avatar media exceeding max size returns a 413
Until now it was returning a 500 because the upload plug were going
through the changeset and ending in the JSON encoder, which raised
because struct has to @derive the encoder.
2022-12-11 22:54:47 +01:00
marcin mikołajczak
4c0b30e327 Merge branch 'post-languages' into 'develop'
Add supported languages list to /api/v2/instance

See merge request soapbox-pub/rebased!209
2022-12-11 12:12:58 +00:00
a30ac650bc Merge remote-tracking branch 'soapbox/develop' into post-languages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-10 23:17:44 +01:00
8447fbfba2 InstanceView: Move supported languages to pleroma.metadata
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-10 21:21:38 +01:00
Haelwenn
204fd6faae Merge branch 'from/upstream-develop/tusooa/report-fake' into 'develop'
Report an Object, not a Create Activity

Closes #2986

See merge request pleroma/pleroma!3788
2022-12-09 14:25:24 +00:00
tusooa
da0c684344
Add tests for flagging non-Create activities 2022-12-08 20:51:08 -05:00
Alex Gleason
f435f364d7 Merge branch 'delete-chat' into 'develop'
Add ability to delete a chat

See merge request soapbox-pub/rebased!225
2022-12-08 17:23:13 +00:00
Alex Gleason
ab2d8817a9
Merge remote-tracking branch 'pleroma/2061-chat-deletion' into delete-chat 2022-12-08 11:06:12 -06:00
marcin mikołajczak
be301f1d92 Merge branch 'events-csp' into 'develop'
Add OSM tile server to CSP

See merge request soapbox-pub/rebased!224
2022-12-08 16:45:16 +00:00
Alex Gleason
100a744b61 Merge branch 'events-index' into 'develop'
Add events index

See merge request soapbox-pub/rebased!223
2022-12-08 16:06:30 +00:00
marcin mikołajczak
c100dc84da Update http_security_plug.ex 2022-12-08 15:38:42 +00:00
bacf0ddfd5 Add OSM tile server to CSP
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-08 16:25:57 +01:00
Alex Gleason
9a091a8d85
Add events index 2022-12-07 18:01:42 -06:00
tusooa
1036acb6ae Merge branch 'release-template' into 'develop'
Add Gitlab Release™ into Release MR template

See merge request pleroma/pleroma!3797
2022-12-06 20:41:22 +00:00
lain
633a76b5b3 Merge branch 'jrabbit-develop-patch-67125' into 'develop'
Upgrade docs improvement: reccomend tagged releases over pulling stable branch

See merge request pleroma/pleroma!3800
2022-12-06 20:13:55 +00:00
marcin mikołajczak
8c7bdf1dbb Merge branch 'mkljczk-develop-patch-20799' into 'develop'
Allow exporting events to ics when unauthenticated

See merge request soapbox-pub/rebased!222
2022-12-06 20:04:20 +00:00
marcin mikołajczak
ecffbdc321 Allow exporting events to ics when unauthenticated 2022-12-06 19:48:06 +00:00
Alex Gleason
810bd26549 Merge branch 'default-approval-required' into 'develop'
Make approval required the default

See merge request soapbox-pub/rebased!221
2022-12-06 17:43:38 +00:00
jrabbit
8afad1e46e reccomend tagged releases over pulling stable 2022-12-06 17:24:04 +00:00
Alex Gleason
b996b87455
Make approval required the default 2022-12-06 10:17:31 -06:00
Haelwenn
f60cb0f771 Merge branch 'ci/amd64-build-tags' into 'develop'
CI: Tag amd64 releases for amd64 runners

See merge request pleroma/pleroma!3799
2022-12-05 23:33:46 +00:00
Haelwenn
eb7f4bc51b Merge branch 'weblate' into 'develop'
Translations update from Pleroma Weblate

See merge request pleroma/pleroma!3798
2022-12-05 23:15:44 +00:00
marcin mikołajczak
dd9d44fb5d Merge branch 'pleroma-events' into 'develop'
Events

See merge request soapbox-pub/rebased!211
2022-12-05 23:09:01 +00:00
Haelwenn (lanodan) Monnier
b6e96f63b4 CI: Tag amd64 releases for amd64 runners 2022-12-06 00:08:55 +01:00
89cd35fa52 format
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-03 19:56:18 +01:00
61e069df72 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-12-02 23:18:19 +01:00
a9da110ac6 Add rate limiting for events actions
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-02 23:11:28 +01:00
marcin mikołajczak
9fc7362240 Merge branch 'fix-rel-me' into 'develop'
Add missing rel_me cache

See merge request soapbox-pub/rebased!220
2022-12-02 21:24:08 +00:00
5bc4148952 fix tests?
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-02 18:03:07 +01:00
Alex Gleason
642c322388 Merge branch 'fix-remote-follow-redirect' into 'develop'
Fix remote follow redirect

See merge request soapbox-pub/rebased!217
2022-12-02 16:43:58 +00:00
d4904b392a Actually fix verified_at
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-02 17:41:38 +01:00
marcin mikołajczak
0ab061f375 Add missing rel_me cache 2022-12-02 11:20:48 +00:00
Xnuk Shuman
3e8f49be67 Added translation using Weblate (Korean) 2022-12-01 17:17:03 +00:00
f21ec80ea2 Fix race condition, update tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-01 00:34:39 +01:00
60a51cd047 Auto join own events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-30 23:36:40 +01:00
e4b568b963 Use origin URL for remote_url
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-30 11:24:34 +01:00
c2f6a4c452 Add events to features
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-29 19:59:40 +01:00
87e9b4c5ef Update geospatial package, update config and description.exs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-29 13:56:40 +01:00
40658fb6e0 Only suggest Nominatim for now
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-28 23:05:07 +01:00