|
|
bd33a7ac8f
|
Remove stuff I don't need to stay closer to upstream
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-12 16:07:29 +01:00 |
|
Alex Gleason
|
2eb5c453ad
|
Allow configuring the origin of the service actor
|
2023-12-24 00:02:50 -06:00 |
|
|
|
c78495900e
|
Merge remote-tracking branch 'origin/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-17 22:53:06 +01:00 |
|
lain
|
5f19fbc5a9
|
Merge branch 'phoenix1.7' into 'develop'
Update to Phoenix 1.7
See merge request pleroma/pleroma!3900
|
2023-11-12 13:34:27 +00:00 |
|
Lain Soykaf
|
0c5cc51983
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-meilisearch
|
2023-11-12 13:53:18 +04:00 |
|
Mark Felder
|
a0e08c6ec2
|
Merge branch 'develop' into phoenix1.7
|
2023-11-07 16:05:04 -05:00 |
|
Mark Felder
|
bf426c53b4
|
Fix digest email processing, consolidate Oban queues
The email related jobs can all share a single Oban queue
|
2023-11-07 15:14:36 -05:00 |
|
|
|
0ebbe8d9d7
|
Merge remote-tracking branch 'pleroma/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-10-28 00:30:08 +02:00 |
|
Aldis Ruiz
|
c86b34eb45
|
Update config.exs, to fix incomplete soapbox install via pleroma_ctl
|
2023-10-04 23:03:24 +00:00 |
|
niggy
|
b882bcc884
|
Lock insecure auth methods behind config setting
|
2023-09-22 03:50:35 +00:00 |
|
Aldis Ruiz
|
d6503e44b0
|
Update file config.exs
|
2023-09-19 23:00:15 +00:00 |
|
tusooa
|
163e563733
|
Allow more flexibility in InlineQuotePolicy
|
2023-09-13 19:19:05 -04:00 |
|
Alex Gleason
|
93e4972b50
|
Add InlineQuotePolicy as a default MRF
|
2023-09-13 19:19:04 -04:00 |
|
Alex Gleason
|
57ef1d1211
|
Add InlineQuotePolicy to force quote URLs inline
|
2023-09-13 19:19:04 -04: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 |
|
Mark Felder
|
ffee478ed0
|
Move websocket config for Shoutbox to the Endpoint
This is the modern way of configuring it
|
2023-05-31 15:30:58 -04:00 |
|
Mark Felder
|
a7e7db4a29
|
Phoenix.Endpoint.Cowboy2Handler -> Plug.Cowboy.Handler
|
2023-05-31 13:48:16 -04: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 |
|
Ekaterina Vaartis
|
398141da68
|
Merge remote-tracking branch 'upstream/develop' into meilisearch
|
2022-12-20 21:00:07 +03: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 |
|
Ekaterina Vaartis
|
fd2cfc80d2
|
Change search_indexing = 10 and retries for indexing = 2
|
2022-10-10 20:19:09 +03:00 |
|
