|
|
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 |
|
Haelwenn (lanodan) Monnier
|
1eb3ce956b
|
Add Gitlab Release™ into Release MR template
|
2022-11-28 22:08:47 +01:00 |
|
Haelwenn
|
d8e326467c
|
Merge branch 'fix/2.4.5-release-date' into 'stable'
Fix changelog date
See merge request pleroma/pleroma!3796
|
2022-11-28 04:35:51 +00:00 |
|
Sean King
|
75c9f7770f
|
Fix changelog date
|
2022-11-27 20:17:48 -07:00 |
|
Haelwenn
|
20790c1dd3
|
Merge branch 'mergeback/2.4.5' into 'develop'
CHANGELOG.md: Fix date for 2.4.5
See merge request pleroma/pleroma!3795
|
2022-11-28 02:31:18 +00:00 |
|
Haelwenn
|
3394394e0f
|
Merge branch 'develop' into 'develop'
Change follow_operation schema to use type BooleanLike
Closes #2999
See merge request pleroma/pleroma!3787
|
2022-11-28 00:13:35 +00:00 |
|
ave
|
0f88c2bca4
|
Change follow_operation schema to use type BooleanLike
|
2022-11-28 00:13:34 +00:00 |
|
|
|
ec4b8ab4f6
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-11-27 23:34:12 +01:00 |
|
Haelwenn (lanodan) Monnier
|
d6cd447cfa
|
CHANGELOG.md: Fix date for 2.4.5
|
2022-11-27 22:28:48 +01:00 |
|
Haelwenn
|
36789986c0
|
Merge branch 'mergeback/2.4.5' into 'develop'
Mergeback: 2.4.5
See merge request pleroma/pleroma!3794
|
2022-11-27 21:24:44 +00:00 |
|
Haelwenn
|
76bdb01c18
|
Merge branch 'release/2.4.5' into 'stable'
Release 2.4.5
See merge request pleroma/pleroma!3793
|
2022-11-27 21:24:19 +00: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 |
|
