|
|
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 |
|
|
|
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 |
|
|
|
0a3f523329
|
fix tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-21 16:28:12 +01:00 |
|
Haelwenn
|
7f0b3161ea
|
Merge branch 'akoma/deactivated-users' into 'develop'
Timeline query performance improvements
See merge request pleroma/pleroma!3779
|
2022-11-20 23:40:58 +00:00 |
|
|
|
86d1358b4f
|
fix
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-20 23:48:05 +01:00 |
|
|
|
27df261e54
|
rename tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-20 23:39:04 +01:00 |
|
|
|
b001a2c2c8
|
Verify link ownership with rel="me"
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-20 23:19:52 +01:00 |
|
feld
|
f40ccce7e9
|
Merge branch 'quack-docs' into 'develop'
Remove Quack from docs and cheatsheet
See merge request pleroma/pleroma!3786
|
2022-11-18 16:38:08 +00:00 |
|
Mark Felder
|
c7a0df8006
|
Remove Quack from docs and cheatsheet
|
2022-11-18 10:09:52 -05:00 |
|
feld
|
bb63f72c11
|
Merge branch 'flash-support-csp' into 'develop'
Reduce CSP policy to make Ruffle work on chrome
See merge request pleroma/pleroma!3389
|
2022-11-17 17:29:36 +00:00 |
|
Mark Felder
|
cddcafee7f
|
Document inclusion of wasm-unsafe-eval
|
2022-11-17 12:03:29 -05:00 |
|
HJ
|
a31d3589ed
|
Update http_security_plug.ex
|
2022-11-17 12:03:01 -05:00 |
|
HJ
|
79bd363a68
|
Update lib/pleroma/web/plugs/http_security_plug.ex
|
2022-11-17 12:03:01 -05:00 |
|
Henry Jameson
|
db76ea578a
|
try to fix ruffle on chrome
|
2022-11-17 12:03:01 -05:00 |
|
marcin mikołajczak
|
4f61f19f56
|
Merge branch 'merge-pleroma' into 'develop'
Merge pleroma/develop
See merge request soapbox-pub/rebased!213
|
2022-11-15 23:06:39 +00:00 |
|
|
|
2e7a713e58
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-16 00:06:25 +01:00 |
|
|
|
b7879d58f3
|
Merge remote-tracking branch 'pleroma/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-15 23:27:58 +01:00 |
|
|
|
1175127549
|
Only keep domain_blocks for now
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-14 19:41:40 +01:00 |
|
|
|
9126ba7695
|
Add domain_blocks and extended_description endpoints
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-14 16:31:53 +01:00 |
|
feld
|
a9d991d31e
|
Merge branch 'develop' into 'akoma/deactivated-users'
# Conflicts:
# CHANGELOG.md
|
2022-11-14 14:03:11 +00:00 |
|
|
|
f9dfe64ba4
|
Privacy policy API
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-14 14:28:58 +01:00 |
|
lain
|
0e1356ef9c
|
Merge branch 'akkoma/delete-improvements' into 'develop'
Alter priority of Delete activities to be lowest
See merge request pleroma/pleroma!3782
|
2022-11-14 07:24:46 +00:00 |
|
