Commit graph

635 commits

Author SHA1 Message Date
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
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
d7468558b8 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-04 18:36:25 +02:00
9040b98b07 Merge branch 'multilang' into backend-new
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-02 15:15:37 +02:00
Mark Felder
36b440d9be Update Bandit to 1.5.2
Lots of fixes, also requires Websock Adapter update due to internal module changes in Bandit 1.4.0.
2024-05-29 21:59:50 -04:00
1028f0907d Merge remote-tracking branch 'origin/develop' into fork 2024-05-25 12:35:59 +02:00
cd56247e5f Switch build_name back to Soapbox
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-23 12:14:42 +02:00
Lain Soykaf
ad26b6d593 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bump-elixir 2024-05-20 12:30:15 +04:00
adbd40049d Merge remote-tracking branch 'mkljczk-github/fork' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 18:11:23 +02:00
8c3f306c62 Revert to pleroma' card parser
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 17:54:13 +02:00
0e608c98b2 Rename project to pl
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-28 23:02:11 +02:00
9e37ff9e62 fix deps
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-23 15:19:18 +01:00
bfc56040e7 change build name
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-15 11:14:15 +01:00
5484ef9958 WIP triple hashtags
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-15 11:03:32 +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
267e20dbcd Exile: change to upstream pre-release commit that fixes build on FreeBSD 2024-02-23 15:36:37 -05:00
Haelwenn (lanodan) Monnier
e149ee6e22
Mergeback of security release 2.6.2 2024-02-20 09:34:11 +01:00
Mark Felder
4648997a10 Support a new changelog entry type: deps 2024-02-15 10:24:31 -05:00
Mark Felder
0c5bec0493 Support Bandit as an alternate HTTP backend to Cowboy. This is currently considered experimental, but may improve performance and resource usage. 2024-02-15 09:54:52 -05:00
7e57c5d0b1 Handle trailing formats
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-01-24 19:17:50 +01:00
Mark Felder
138b3cb608 Clear up missing function dialyzer errors for :eldap 2024-01-22 18:37:29 -05:00