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
453cb6a388
Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1
2023-12-15 19:43:07 -05:00
ad6a6aa07b
Bump version to 2.6.1
2023-12-14 20:14:41 -05:00
41f6e8f7f4
mix: Bump elixir-captcha for system-CFLAGS
2023-12-14 20:13:20 -05:00
08839602bd
mix: cherry-pick eblurhash latest git for system-CFLAGS
2023-12-14 20:13:00 -05:00
6c5ebcded5
Mix: Update vix.
2023-12-12 08:59:47 +04:00
8b4a786266
Use version of vix that compiles correctly under arm32
2023-12-11 18:38:27 +04:00
1955b3c557
Merge branch 'vips' into 'develop'
...
Replace ImageMagick with Vips
See merge request pleroma/pleroma!3771
2023-11-29 06:03:37 +00:00
03db495e1d
AnalyzeMetadata: Switch to rinpatch_blurhash
2023-11-28 12:23:41 +04:00
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
906b121a10
Merge branch 'develop' into 'vips'
...
# Conflicts:
# mix.exs
2023-11-17 16:50:36 +00:00
9511212e32
Fetch the library from the Pleroma repository
2023-11-17 11:18:42 -05:00
0c6a54b37c
Upload.Filter.AnalyzeMetadata: Blurhash with a Rust NIF, and use Vix to retrieve image metadata
2023-11-17 10:26:00 -05:00
5f85067a95
mix: Bump elixir-captcha for system-CFLAGS
2023-11-14 10:44:59 +01:00
2b6ae571bb
mix: cherry-pick eblurhash latest git for system-CFLAGS
2023-11-14 10:44:57 +01:00
577ade75cf
Override elixir_make version
2023-11-13 15:41:39 -05:00
13baba90f6
Replace ImageMagick with Vips for Media Preview Proxy
2023-11-13 15:41:39 -05:00
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
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
e23672d82f
Ensure benchee doesn't run unless we are executing benchmarks
2023-11-08 12:44:57 -05:00
9fa6531109
Phoenix is no longer required in extra_applications
2023-11-07 16:14:05 -05:00
a0e08c6ec2
Merge branch 'develop' into phoenix1.7
2023-11-07 16:05:04 -05:00
aaf53d9d77
Bump package version for mergeback
2023-10-31 20:49:31 -04:00
a2a69709b5
Bump version to 2.6.0
2023-10-24 19:57:31 -04:00
4099ddb3dc
Mergeback release 2.5.4
2023-08-05 08:58:05 +02:00
6a0fd77c48
Release 2.5.53
2023-08-04 09:50:28 +02:00
9e69adf76f
mix: Remove override on plug
2023-06-27 02:38:31 +02:00
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
86b38dd14b
Merge branch 'develop' into 'phoenix1.7'
...
# Conflicts:
# mix.exs
2023-06-02 15:41:40 +00:00
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
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
d9f031c9da
Bump minimum Elixir to 1.12
2023-05-31 21:12:13 +00:00
4dc2d4bf7b
Remove locked version of plug
...
Required for Phoenix 1.7 websocket changes
2023-05-31 15:30:31 -04:00
6e1ea2eafc
Remove unnecessary compilers as of Phoenix 1.7
2023-05-31 13:36:07 -04:00
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
869f0d24a6
Merge branch 'release/2.5.2' into mergeback/2.5.2
2023-05-26 23:47:50 +02:00
7618e562b3
Version 2.5.2
2023-05-26 19:57:00 +02:00
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
ce16ff7ae8
mix: Update all dependencies
2023-04-04 11:19:38 +02:00
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
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
f33401f54b
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1
2023-03-01 20:09:50 -05:00
75b76a0666
Bump version in mix project to 2.5.1
2023-02-20 12:32:45 -05:00
c69ae5f7c7
Bump crypt to v1.0.1
2023-02-20 12:29:38 -05:00
bb9ed51da7
Update mix.exs
2023-02-20 12:28:52 -05:00
002159fc1c
Bump linkify
2023-02-20 12:28:52 -05:00
259905a893
Bump earmark to 1.4.22
2023-02-20 12:20:29 -05:00
bf346cf07c
Bump crypt to v1.0.1
2023-02-09 23:06:04 -07:00
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
7138910f30
Update mix.exs
2023-02-09 14:37:34 -05:00
Mark Felder