2ec404eca4
Merge branch 'fork' into backend-new
2024-12-06 20:30:44 +01:00
b38501ef92
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-06 20:30:32 +01:00
f3b722bf53
Merge branch 'fork' into backend-new
2024-12-06 20:05:26 +01:00
Haelwenn (lanodan) Monnier
3a8e24fed4
Merge remote-tracking branch 'pleroma/stable' into mergeback/2.7.1
2024-11-26 16:46:47 +01:00
Haelwenn (lanodan) Monnier
7bb2dccc05
Version 2.7.1
2024-11-26 14:09:09 +01:00
lain
53c2d2cd87
Merge branch 'mastodon-websocket-fix' into 'develop'
...
Fix Mastodon WebSocket authentication
See merge request pleroma/pleroma!4206
2024-11-26 14:06:31 +01:00
feld
ced6b10c70
Merge branch 'swoosh-mailgun' into 'develop'
...
Fix Swoosh Mailgun support
See merge request pleroma/pleroma!4217
2024-11-26 13:58:48 +01:00
375e71631d
Merge remote-tracking branch 'origin/develop' into fork
2024-11-19 18:39:47 +01:00
lain
dcb0c47773
Merge branch 'mastodon-websocket-fix' into 'develop'
...
Fix Mastodon WebSocket authentication
See merge request pleroma/pleroma!4206
2024-11-13 08:22:44 +00:00
9d6d528bcb
Merge branch 'fork' into backend-new
2024-11-01 08:12:37 +01:00
0f0207d60d
Update source link
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-13 14:59:48 +02:00
d580f81f27
Merge branch 'fork' into backend-new
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-12 23:57:31 +02:00
aeac257cf2
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-21 00:26:12 +02:00
Mark Felder
f00545d85b
Elixir 1.14 and Erlang/OTP 23 is now the minimum supported release
2024-09-18 13:14:17 -04:00
Mint
e10db52e0a
Add dependencies for Swoosh's Mua mail adapter
2024-09-13 02:58:59 +03:00
4cee86756c
Merge remote-tracking branch 'origin/develop' into fork
2024-09-11 22:09:18 +02:00
Mark Felder
7def11d7c3
LDAP Auth: fix TLS certificate verification
...
Currently we only support STARTTLS and it was not verifying certificate and hostname correctly. We must pass a custom fqdn_fun/1 function so it knows what value to compare against.
2024-09-11 12:47:46 -04:00
1853055508
Merge remote-tracking branch 'mint/argon2' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-08 10:20:09 +02:00
c9b28eaf9a
Argon2 password support
2024-09-08 05:23:46 +03:00
02f934dd65
identify itself as pl
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-06 23:32:41 +02:00
d2c5fd62ab
Merge branch 'fork' into backend-new
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-06 23:23:59 +02:00
8067388d77
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-24 01:05:15 +02:00
22f41e5324
Merge branch 'fork' into backend-new
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-20 14:53:19 +02:00
Mark Felder
190a505ad3
Merge remote-tracking branch 'origin/develop' into mogrify
2024-08-17 17:57:27 -04:00
Mark Felder
7537c22b22
Update Oban to 2.18
2024-08-17 15:41:53 -04:00
Mark Felder
e1333c4fa4
Update mogrify
...
Sent a pull request upstream to expand the version range depended on my blurhash
https://github.com/rinpatch/blurhash/pull/1
2024-08-16 10:10:01 -04:00
0a4fece245
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-14 18:16:28 +02:00
Mark Felder
c116024bba
Fix Swoosh Mailgun support
2024-08-12 15:28:33 -04:00
Mark Felder
8c91fd8785
Fix Mastodon WebSocket authentication
...
Mastodon uses the Sec-Websocket-Protocol header to send the auth token. It is not clear if this is a violation of the RFC, but Mastodon is not the first application in the wild to use this header for authentication purposes. Phoenix does not allow accessing this header, so we work around it temporarily with a minor patch to Phoenix 1.7.14. We will reach out to Phoenix to discuss how to make this use case possible.
2024-08-04 15:04:29 -04:00
9a5a9a961d
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-02 14:58:05 +02:00
Lain Soykaf
a5d32aab50
Mix: Update version to 2.7.0
2024-08-01 11:49:57 +04:00
5a560fd0b3
Change build name
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-25 22:04:01 +02:00
fbefe343ff
GitHub Actions workflow
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-24 13:50:18 +02:00
e0d0992e10
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-21 12:36:25 +02:00
Mark Felder
4cbb59c8f6
Add Oban Live Dashboard
2024-07-17 09:32:29 -04:00
9055a3b49a
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-13 17:49:07 +02:00
15508da194
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-10 23:50:06 +02:00
Pleroma User
e4ba5777ee
Merge branch 'develop' into 'move-poison'
...
# Conflicts:
# mix.exs
2024-07-06 13:59:30 +00:00
Mark Felder
eb419b7ffd
Add eldap back to applications as the module functions were unavailable
2024-07-01 15:58:49 -04:00
Mark Felder
33fa035c31
Update elixir-captcha to fix the compile warning
2024-07-01 11:38:40 -04:00
Mark Felder
436286c93f
Update Tesla to 1.11.0
2024-07-01 11:38:40 -04:00
f60c845de9
Update plug_cowboy
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-30 23:19:03 +02:00
fc32646f7f
Merge branch 'fork' into backend-new
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-30 12:06:48 +02:00
5d1cb904ac
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-24 11:37:28 +02:00
pleromian
47c6f3ddc6
poison is used only in tests
2024-06-21 00:41:09 +02:00
Mark Felder
c11c35cf8f
Enable :logger_backends application on < Elixir 1.15
2024-06-18 17:06:09 +00:00
Haelwenn (lanodan) Monnier
c389ea0f42
Fix compatibility with Loggers in Elixir 1.15+
2024-06-12 15:18:47 -04:00
Haelwenn (lanodan) Monnier
ba6afdb44d
mix: Turn off prune_code_path
2024-06-12 15:18:47 -04:00
2afe272595
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-08 15:37:29 +02:00
Pleroma User
dbf29cbae4
Bump deps
2024-06-08 01:39:08 +00:00
