Aldis Ruiz
|
d6503e44b0
|
Update file config.exs
|
2023-09-19 23:00:15 +00:00 |
|
|
|
f1592b2947
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-07-26 22:32:27 +02:00 |
|
tusooa
|
28ff828caa
|
Add emoji policy to remove emojis matching certain urls
https://git.pleroma.social/pleroma/pleroma/-/issues/2775
|
2023-07-07 06:58:22 -04:00 |
|
Haelwenn
|
41f2ee69a8
|
Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop'
Detail backup states
Closes #3024
See merge request pleroma/pleroma!3809
|
2023-06-27 12:08:11 +00:00 |
|
Alex Gleason
|
e8928e2295
|
Merge branch 'merge-pleroma' into 'develop'
Merge Pleroma
See merge request soapbox-pub/rebased!247
|
2023-06-07 21:50:27 +00:00 |
|
Alex Gleason
|
f2cf4941ee
|
Add AntiDuplicationPolicy
|
2023-05-21 14:12:53 -05:00 |
|
|
|
94cdedc6c9
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-05-09 22:27:06 +02:00 |
|
duponin
|
0231a09310
|
Remove SSH/BBS feature from core
And link to sshocial, the replacement client for this removed feature
|
2023-04-23 10:47:07 +02:00 |
|
|
|
830d7c1d58
|
Let moderators do things
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-02-04 23:23:07 +01:00 |
|
tusooa
|
179efd9467
|
Make backup parameters configurable
|
2022-12-24 00:20:25 -05:00 |
|
|
|
e3970f730c
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-23 19:45:55 +01: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 |
|
Sean King
|
60df2d8a97
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
|
2022-12-18 22:03:48 -07:00 |
|
Alex Gleason
|
b996b87455
|
Make approval required the default
|
2022-12-06 10:17:31 -06: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 |
|
|
|
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 |
|
|
|
1d011e6ed2
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-11-27 14:09:03 +01:00 |
|
Alex Gleason
|
6d4f99d9b3
|
Disable inline images
|
2022-11-26 16:21:15 -06: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 |
|
tusooa
|
1b0e47b79b
|
Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
Give admin the choice to not strip reported statuses
Closes #2887
See merge request pleroma/pleroma!3773
|
2022-11-12 17:55:50 +00:00 |
|
Mark Felder
|
6b87b3f2ea
|
Remove Quack logging backend
|
2022-11-11 12:36:29 -05:00 |
|
|
|
eb70676931
|
Update links to Soapbox
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-11 12:13:30 +01:00 |
|
tusooa
|
6f047cc308
|
Do not strip reported statuses when configured not to
|
2022-11-09 22:36:57 -05:00 |
|
|
|
8661703c16
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-09 17:08:18 +01:00 |
|
Alex Gleason
|
28c8948765
|
Merge branch 'reject-anon-report' into 'develop'
Add RemoteReportPolicy to reject reports without enough information
See merge request soapbox-pub/rebased!202
|
2022-11-06 14:39:06 +00:00 |
|
|
|
2c62043ef9
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-05 21:08:08 +01:00 |
|
Alex Gleason
|
3957167a9d
|
RemoteReportPolicy: add :reject_all option, fix tests
|
2022-11-05 14:07:37 -05:00 |
|
Alex Gleason
|
87e9bbf86c
|
Add RemoteReportPolicy to reject reports without enough information
|
2022-11-05 13:56:56 -05:00 |
|
Alex Gleason
|
39d7093ff5
|
Remove Shout feature
|
2022-11-03 13:29:52 -05:00 |
|
Alexander Strizhakov
|
4121bca895
|
expanding WebFinger
|
2022-11-03 09:48:24 -04:00 |
|
Alex Gleason
|
f303a02e86
|
Let favicon be configurable
|
2022-10-27 13:15:15 -05:00 |
|
|
|
8221504ecb
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-10-12 21:52:36 +02:00 |
|
|
|
58e0ca0d68
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-09-30 20:04:29 +02:00 |
|
Alex Gleason
|
5dfb582bd2
|
Revert "Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop'"
This reverts commit 757a21554f, reversing
changes made to 5d7d623390.
|
2022-09-28 17:41:36 -05:00 |
|
Alex Gleason
|
544be36c80
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2022-09-28 17:29:53 -05:00 |
|
|
|
c6fddd6e0a
|
Add migration cooldown period
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-28 23:48:45 +02:00 |
|
Tusooa Zhu
|
467b6cad6f
|
Reduce incoming and outgoing federation queue sizes to 5
|
2022-09-17 16:34:33 -04:00 |
|
|
|
3b498061ed
|
Merge remote-tracking branch 'rebased/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-16 21:24:22 +02:00 |
|
Alex Gleason
|
f5e77a3eaa
|
soapbox-fe --> soapbox
|
2022-09-13 15:26:28 -05:00 |
|
marcin mikołajczak
|
98ccf6cbdc
|
Merge branch 'webfinger-expanding' into 'develop'
Webfinger expanding
See merge request soapbox-pub/rebased!96
|
2022-09-10 22:03:10 +00:00 |
|
Alex Gleason
|
ce9bacc3be
|
Merge branch 'fix-subscriptions' into 'develop'
Create notifications async with NotificationWorker, #91
See merge request soapbox-pub/rebased!173
|
2022-09-06 16:33:02 +00:00 |
|
Alex Gleason
|
05a20c8d6d
|
Create notifications async with NotificationWorker, #91
|
2022-09-05 12:38:30 -05:00 |
|
tusooa
|
f7c2073103
|
Merge branch 'bump/min-elixir-1.10' into 'develop'
Bump minimum Elixir version to 1.10
See merge request pleroma/pleroma!3741
|
2022-09-05 15:19:34 +00:00 |
|
|
|
d4eccd86b3
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-05 15:30:14 +02:00 |
|
tusooa
|
20347898e2
|
Merge branch 'fix/federation-context-issues' into 'develop'
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects
See merge request pleroma/pleroma!3717
|
2022-09-04 18:43:36 +00:00 |
|
Haelwenn (lanodan) Monnier
|
21ab7369ca
|
Bump minimum Elixir version to 1.10
With the release of Elixir 1.14, Elixir 1.9 is now end-of-life.
Elixir 1.10 Release Notes:
https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
|
2022-09-02 22:53:54 +02:00 |
|
|
|
a15bf235cf
|
Merge remote-tracking branch 'pleroma/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-30 10:15:07 +02:00 |
|
|
|
ee8f11b085
|
Export to ical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-30 10:05:39 +02:00 |
|
Sean King
|
d67d191344
|
Fix fedi-fe build URL
|
2022-08-24 23:39:02 -06:00 |
|
