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 |
|
Alex Gleason
|
cce9083282
|
Merge branch 'disable-inline-images' into 'develop'
Disable inline images
See merge request soapbox-pub/rebased!218
|
2022-11-26 23:16:56 +00:00 |
|
Alex Gleason
|
2714e770c7
|
Allow inline images in tests (for now)
|
2022-11-26 17:07:15 -06:00 |
|
Alex Gleason
|
6d4f99d9b3
|
Disable inline images
|
2022-11-26 16:21:15 -06:00 |
|
Alex Gleason
|
2899feb4d9
|
Fix remote follow redirect
|
2022-11-26 13:57:08 -06:00 |
|
|
|
7b165deb05
|
api/v1/pleroma/events/joined_events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-23 23:38:00 +01:00 |
|
|
|
e9a83d03fc
|
Add only_events param to timelines
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-23 20:03:42 +01:00 |
|
|
|
92716dd605
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-23 20:01:51 +01:00 |
|
|
|
adfbd3d756
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-11-23 19:50:09 +01:00 |
|
marcin mikołajczak
|
13c61e59e7
|
Merge branch 'merge-pleroma' into 'develop'
Merge pleroma/develop
See merge request soapbox-pub/rebased!216
|
2022-11-23 16:08:38 +00:00 |
|
marcin mikołajczak
|
32bcd7fdf6
|
Merge branch 'link-verification' into 'develop'
Verify link ownership with rel="me"
See merge request soapbox-pub/rebased!214
|
2022-11-23 16:08:36 +00:00 |
|
|
|
052d5e768a
|
don't use restrict_filtered twice
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-23 15:34:59 +01:00 |
|
|
|
1d6b91c071
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-23 15:33:54 +01:00 |
|
marcin mikołajczak
|
5866789d46
|
Merge branch 'webfinger-fix' into 'develop'
Use correct domain for fqn and InstanceView
See merge request soapbox-pub/rebased!215
|
2022-11-22 23:31:52 +00:00 |
|
|
|
55834e7517
|
update tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-23 00:13:06 +01:00 |
|
|
|
7510688bb1
|
Use correct domain for fqn and InstanceView
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-22 23:34:23 +01:00 |
|
marcin mikołajczak
|
eca1f581d0
|
Merge branch 'privacy-policy-api' into 'develop'
/api/v1/instance/domain_blocks endpoint
See merge request soapbox-pub/rebased!212
|
2022-11-21 21:01:40 +00:00 |
|
|
|
db050332cb
|
Do not verify links in bio
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-21 20:36:34 +01:00 |
|
