c39fae12bc
Merge remote-tracking branch 'tusooa/from/upstream-develop/tusooa/import' into backend-new
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-15 11:08:04 +01:00
f792c806bc
Change default favicon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-15 11:02:20 +01:00
53a73aada2
Merge branch 'multitenancy' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:29:24 +01:00
0f33698747
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 23:08:40 +01:00
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
Mark Felder
64ad451a7b
Websocket refactor to use Phoenix.Socket.Transport
...
This will make us compatible with Cowboy and Bandit
2024-02-14 15:27:07 -05:00
913465f3d2
Merge remote-tracking branch 'origin/develop' into multitenancy-v2
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-01-24 16:59:21 +01:00
Mark Felder
653b14e1c7
Use config to control Uploader callback timeout
2024-01-22 18:37:13 -05:00
Mark Felder
17877f612e
Use config to control streamer registry
2024-01-20 18:51:20 -05:00
Mark Felder
4bb57d4f25
Use config to control background migrators
2024-01-20 18:47:25 -05:00
Mark Felder
c7eda0b24a
Use config to control loading of custom modules
2024-01-20 18:43:53 -05:00
Mark Felder
029aaf3d74
Use config to control max_restarts
2024-01-20 18:41:04 -05:00
Mark Felder
1d816222e0
Remove support for multiple federation publisher modules
...
This also unravels some needless indirection.
2023-12-28 11:55:19 -05:00
Alex Gleason
2eb5c453ad
Allow configuring the origin of the service actor
2023-12-24 00:02:50 -06:00
c4a89058ca
Use service domains like Takahe
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-29 00:10:31 +01:00
96747ece8d
Merge remote-tracking branch 'origin/develop' into multitenancy
2023-11-28 13:50:56 +01:00
lain
ef7bda61ad
Merge branch 'promex' into 'develop'
...
Switch to PromEx for prometheus metrics
See merge request pleroma/pleroma!3967
2023-11-28 07:50:16 +00: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
a1a6abf6c6
Merge remote-tracking branch 'origin/develop' into multitenancy
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-14 13:56:33 +01:00
c3b989951a
Check if domains resolve correctly
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-14 13:51:55 +01:00
Henry Jameson
a5aa8ea796
Add support for configuring a favicon and embed PWA manifest in server-generated-meta
2023-11-14 11:05:23 +01:00
Mark Felder
66cb3294ed
Switch to PromEx for prometheus metrics
...
Recommending use of the separate HTTP server for exposing the metrics
and securing it externally on your firewall or reverse proxy. It will
listen on port 4021 by default.
2023-11-13 15:34:59 -05: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
