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
Mark Felder
bff47479a7
Exile: fix for MacOS dev environments
2024-01-22 18:37:13 -05:00
Mark Felder
8efae57d67
Dialyzer: suppress Mix.Task errors
...
Callback info about the 'Elixir.Mix.Task' behaviour is not available.
2024-01-22 18:37:13 -05:00
Mark Felder
fff235433e
Exile: switch to fork with BSD compile fix
2024-01-22 13:44:20 -05:00
Mark Felder
0ac010ba3f
Replace custom fifo implementation with Exile
...
This is for streaming media to ffmpeg thumbnailer. The existing implementation relies on undocumented behavior.
Erlang open_port/2 does not officially support passing a string of a file path for opening. The specs clearly state you are to provide one of the following for open_port/2:
{spawn, Command :: string() | binary()} |
{spawn_driver, Command :: string() | binary()} |
{spawn_executable, FileName :: file:name_all()} |
{fd, In :: integer() >= 0, Out :: integer() >= 0}
Our method technically works but is strongly discouraged as it can block the scheduler and dialyzer throws errors as it recognizes we're breaking the contract and some of the functions we wrote may never return.
This is indirectly covered by the Erlang FAQ section "9.12 Why can't I open devices (e.g. a serial port) like normal files?"
https://www.erlang.org/faq/problems#idm1127
2024-01-22 10:13:17 -05:00
Mark Felder
1790400313
Add Dialyxir with manual job execution
2024-01-20 22:49:37 -05:00
Lain Soykaf
8883fa326a
Mix: Update http_signatures version
2023-12-30 11:44:23 +04:00
Mark Felder
b51ba39dd1
Update Floki to get the :attributes_as_maps feature to allow us to compare equality of parsed documents without issues of key ordering
2023-12-29 22:50:26 -05:00
Mark Felder
7e3bbdded5
Elixir 1.13 is the minimum required version
2023-12-20 23:39:12 +00:00
tusooa
453cb6a388
Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1
2023-12-15 19:43:07 -05:00
tusooa
ad6a6aa07b
Bump version to 2.6.1
2023-12-14 20:14:41 -05:00
Haelwenn (lanodan) Monnier
41f6e8f7f4
mix: Bump elixir-captcha for system-CFLAGS
2023-12-14 20:13:20 -05:00
Haelwenn (lanodan) Monnier
08839602bd
mix: cherry-pick eblurhash latest git for system-CFLAGS
2023-12-14 20:13:00 -05:00
Lain Soykaf
6c5ebcded5
Mix: Update vix.
2023-12-12 08:59:47 +04:00
Lain Soykaf
8b4a786266
Use version of vix that compiles correctly under arm32
2023-12-11 18:38:27 +04:00
lain
1955b3c557
Merge branch 'vips' into 'develop'
...
Replace ImageMagick with Vips
See merge request pleroma/pleroma!3771
2023-11-29 06:03:37 +00:00
Lain Soykaf
03db495e1d
AnalyzeMetadata: Switch to rinpatch_blurhash
2023-11-28 12:23:41 +04: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
feld
906b121a10
Merge branch 'develop' into 'vips'
...
# Conflicts:
# mix.exs
2023-11-17 16:50:36 +00:00
Mark Felder
9511212e32
Fetch the library from the Pleroma repository
2023-11-17 11:18:42 -05:00
Mark Felder
0c6a54b37c
Upload.Filter.AnalyzeMetadata: Blurhash with a Rust NIF, and use Vix to retrieve image metadata
2023-11-17 10:26:00 -05:00
Haelwenn (lanodan) Monnier
5f85067a95
mix: Bump elixir-captcha for system-CFLAGS
2023-11-14 10:44:59 +01:00
Haelwenn (lanodan) Monnier
2b6ae571bb
mix: cherry-pick eblurhash latest git for system-CFLAGS
2023-11-14 10:44:57 +01:00
Mark Felder
577ade75cf
Override elixir_make version
2023-11-13 15:41:39 -05:00
Mark Felder
13baba90f6
Replace ImageMagick with Vips for Media Preview Proxy
2023-11-13 15:41:39 -05: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
Mark Felder
e23672d82f
Ensure benchee doesn't run unless we are executing benchmarks
2023-11-08 12:44:57 -05:00
Mark Felder
9fa6531109
Phoenix is no longer required in extra_applications
2023-11-07 16:14:05 -05:00
Mark Felder
a0e08c6ec2
Merge branch 'develop' into phoenix1.7
2023-11-07 16:05:04 -05:00
tusooa
aaf53d9d77
Bump package version for mergeback
2023-10-31 20:49:31 -04:00
tusooa
a2a69709b5
Bump version to 2.6.0
2023-10-24 19:57:31 -04:00
96a6b4dbc8
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-08-05 15:22:01 +02:00
Haelwenn (lanodan) Monnier
4099ddb3dc
Mergeback release 2.5.4
2023-08-05 08:58:05 +02:00
Alex Gleason
fa4f0ae328
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2023-08-04 09:32:59 -05:00
Haelwenn (lanodan) Monnier
6a0fd77c48
Release 2.5.53
2023-08-04 09:50:28 +02: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
Haelwenn (lanodan) Monnier
9e69adf76f
mix: Remove override on plug
2023-06-27 02:38:31 +02:00
Haelwenn (lanodan) Monnier
aa4c4ab2a0
mix: 2023-06 deps update
...
this fixes compatibility with Erlang OTP 26
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/2913
2023-06-27 02:38:31 +02:00
Alex Gleason
944fd73b36
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2023-06-05 15:38:19 -05:00
feld
86b38dd14b
Merge branch 'develop' into 'phoenix1.7'
...
# Conflicts:
# mix.exs
2023-06-02 15:41:40 +00:00
Mark Felder
2e45be2653
Add :phoenix to extra_applications to suppress a warning
...
Related to use of Phoenix.Flash.get/2
2023-06-02 11:34:04 -04:00
Haelwenn (lanodan) Monnier
313e68c180
mix: bump gettext to ~0.20
...
Includes https://github.com/elixir-gettext/gettext/pull/304 in 0.20.0+
Includes https://github.com/elixir-gettext/expo/issues/91 in 0.22+ via expo 0.2.0+
2023-06-02 03:06:32 +02:00
Mark Felder
d9f031c9da
Bump minimum Elixir to 1.12
2023-05-31 21:12:13 +00:00
Mark Felder
4dc2d4bf7b
Remove locked version of plug
...
Required for Phoenix 1.7 websocket changes
2023-05-31 15:30:31 -04:00
Mark Felder
6e1ea2eafc
Remove unnecessary compilers as of Phoenix 1.7
2023-05-31 13:36:07 -04:00
Mark Felder
bed44f9f62
Update to Phoenix 1.7
...
Chase the other deps to match versions you get from a current "mix phx.new" project creation
2023-05-31 13:10:18 -04:00
a1567f2c68
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-27 01:33:43 +02:00
Haelwenn (lanodan) Monnier
869f0d24a6
Merge branch 'release/2.5.2' into mergeback/2.5.2
2023-05-26 23:47:50 +02:00
Haelwenn (lanodan) Monnier
7618e562b3
Version 2.5.2
2023-05-26 19:57:00 +02: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
Haelwenn (lanodan) Monnier
ce16ff7ae8
mix: Update all dependencies
2023-04-04 11:19:38 +02:00
tusooa
40f14fd31c
Merge branch 'remove-crypt' into 'develop'
...
Remove crypt(3) support
Closes #3030 and #3062
See merge request pleroma/pleroma!3847
2023-03-30 12:47:36 +02:00
bda8589f16
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-15 19:39:24 +01:00
Haelwenn (lanodan) Monnier
5716654d12
Remove crypt(3) support
...
This was used to support migration from GNU Social, which was used by at least
shitposter.club, should be entirely irrelevant now.
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3030
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3062
2023-03-05 01:37:57 +01:00
tusooa
f33401f54b
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1
2023-03-01 20:09:50 -05:00
tusooa
75b76a0666
Bump version in mix project to 2.5.1
2023-02-20 12:32:45 -05:00
Sean King
c69ae5f7c7
Bump crypt to v1.0.1
2023-02-20 12:29:38 -05:00
lain
bb9ed51da7
Update mix.exs
2023-02-20 12:28:52 -05:00
tusooa
002159fc1c
Bump linkify
2023-02-20 12:28:52 -05:00
tusooa
259905a893
Bump earmark to 1.4.22
2023-02-20 12:20:29 -05:00
Sean King
bf346cf07c
Bump crypt to v1.0.1
2023-02-09 23:06:04 -07:00
lain
d0b781ab69
Merge branch 'from/upstream-develop/tusooa/2974-zwnj' into 'develop'
...
Bump linkify - Fix zwnj in tags and double-dot links
Closes #2974 and #3022
See merge request pleroma/pleroma!3830
2023-02-09 21:25:15 +00:00
lain
7138910f30
Update mix.exs
2023-02-09 14:37:34 -05:00
tusooa
bddcb3ed68
Add names to additionalProperties
2023-01-15 17:28:32 -05:00
a9e3ff9af9
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2023-01-10 13:39:39 +01:00
tusooa
a2766f310c
Bump linkify
2023-01-06 14:12:07 -05:00
tusooa
4b66f2b7f1
Bump earmark to 1.4.22
2022-12-28 11:57:29 -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
Haelwenn (lanodan) Monnier
6126f203d3
mix: version 2.5.50
2022-12-23 18:46:14 +01:00
Haelwenn (lanodan) Monnier
91c22637de
mix: Release 2.5.0
2022-12-23 17:10:02 +01:00
7ee63904ec
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-22 19:20:52 +01:00
Lain Soykaf
63d00f8123
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps
2022-12-15 17:19:36 -05: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
Haelwenn (lanodan) Monnier
f6d55e1e77
Mergeback of release 2.4.5
2022-11-27 13:20:42 +01: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
Mark Felder
e9c3be262c
Bump credo
...
Old credo is throwing errors on my Elixir 1.13 / OTP 25
2022-11-13 14:17:41 -05:00
