marcin mikołajczak
|
9e3468c833
|
Merge branch 'develop' into 'internal-webhooks'
# Conflicts:
# lib/pleroma/webhook.ex
|
2023-01-11 09:58:50 +00:00 |
|
marcin mikołajczak
|
64945b3b4c
|
Merge branch 'restrict-unauth' into 'develop'
Respect restrict_unauthenticated in /api/v1/accounts/lookup
See merge request soapbox-pub/rebased!232
|
2022-12-30 17:53:30 +00:00 |
|
Atsuko Karagi
|
08db6765c8
|
Respect restrict_unauthenticated in /api/v1/accounts/lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-29 23:30:04 +01:00 |
|
marcin mikołajczak
|
232170cbff
|
Merge branch 'events-csp' into 'develop'
Actually fix CSP
See merge request soapbox-pub/rebased!231
|
2022-12-25 11:30:09 +00:00 |
|
|
|
9a3369f724
|
Actually fix CSP
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-25 10:04:29 +01:00 |
|
Alex Gleason
|
bc7af05954
|
Merge branch 'rebased-3.0' into 'develop'
Bump version to v3.0
See merge request soapbox-pub/rebased!230
|
2022-12-24 23:00:39 +00:00 |
|
Alex Gleason
|
7796bd4037
|
Bump version to v3.0
|
2022-12-24 16:59:22 -06:00 |
|
marcin mikołajczak
|
2eaa1976ce
|
Merge branch 'translations-config' into 'develop'
Allow to enable translations for unauthenticated users or disable translating remote content
See merge request soapbox-pub/rebased!228
|
2022-12-19 23:57:13 +00:00 |
|
|
|
1f981686cd
|
Allow to enable translations for unauthenticated or disable translating remote content
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-19 23:55:09 +01:00 |
|
marcin mikołajczak
|
8a1898591e
|
Merge branch 'target-languages' into 'develop'
Include unspecified variants in target languages list for DeepL
See merge request soapbox-pub/rebased!227
|
2022-12-16 15:10:16 +00:00 |
|
|
|
214e8d7172
|
Include unspecified variants in target languages list for DeepL
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-16 15:55:28 +01: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 |
|
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 |
|
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 |
|
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 |
|
Alex Gleason
|
b996b87455
|
Make approval required the default
|
2022-12-06 10:17:31 -06: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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ec4b8ab4f6
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-11-27 23:34:12 +01:00 |
|
Alex Gleason
|
7a14517763
|
Merge branch 'fix-close-reports' into 'develop'
Fix closing a report where the reporter is deactivated
Closes #133
See merge request soapbox-pub/rebased!219
|
2022-11-27 18:34:37 +00:00 |
|
Alex Gleason
|
f2a1acf1a8
|
Fix closing a report where the reporter is deactivated
Fixes https://gitlab.com/soapbox-pub/rebased/-/issues/133
|
2022-11-27 12:10:03 -06:00 |
|
|
|
7fa342bd76
|
Cleanup, language detection
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-27 19:08:50 +01:00 |
|
|
|
0424697a2e
|
mix format
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-27 15:28:29 +01:00 |
|
|
|
1edda97964
|
Add Geospatial config to description.exs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-27 15:28:13 +01:00 |
|
|
|
1d011e6ed2
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-11-27 14:09:03 +01:00 |
|
|
|
58c70c88c2
|
Only allow valid content types, again
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-27 14:08:58 +01:00 |
|
