Commit graph

17491 commits

Author SHA1 Message Date
marcin mikołajczak
fdbcf99836 Merge branch 'merge-pleroma' into 'develop'
Merge pleroma

See merge request soapbox-pub/rebased!268
2023-11-21 21:23:21 +00:00
6d7cd696b5 Update docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-21 22:14:03 +01:00
marcin mikołajczak
4a60306d7d Merge branch 'authorize_interaction' into 'develop'
Support /authorize-interaction route used by Mastodon

See merge request soapbox-pub/rebased!285
2023-11-21 15:21:47 +00:00
d611be290a Support /authorize-interaction route used by Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-21 16:12:28 +01:00
ea1805218c fix tests?
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-21 00:39:29 +01:00
Alex Gleason
2e64ab0c26 Merge branch 'neetzsche/add-scrobble-urls' into 'develop'
Add optional URL value for scrobbles

See merge request soapbox-pub/rebased!292
2023-11-20 20:56:36 +00:00
NEETzsche
61c810eba0 Add optional URL value for scrobbles 2023-11-20 13:21:11 -07:00
Alex Gleason
e52efb1efe Merge branch 'revert-d92eef29' into 'develop'
Revert "Merge branch 'neetzsche/include-scrobble-url' into 'develop'"

See merge request soapbox-pub/rebased!291
2023-11-20 17:45:42 +00:00
Alex Gleason
ff1db302c9 Revert "Merge branch 'neetzsche/include-scrobble-url' into 'develop'"
This reverts merge request !288
2023-11-20 17:44:55 +00:00
HJ
4ebfc011fc Merge branch 'favicon' into 'develop'
Make favicon configurable, embed favicon and manifest in server-generated meta

See merge request pleroma/pleroma!3963
2023-11-19 08:52:37 +00:00
Henry Jameson
6513f54f73 changelog 2023-11-19 10:32:39 +02:00
Henry Jameson
2112e8b5e4 update, add images 2023-11-19 10:30:49 +02:00
739dbfff6f Update/fix test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-18 00:01:54 +01: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
be39146ecc Update docs to include dependencies on rust and vips where appropriate 2023-11-17 11:44:33 -05:00
Mark Felder
cf5ef1d75f Vix has pre-built NIFs for the following triples:
aarch64-apple-darwin
aarch64-linux-gnu
aarch64-linux-musl
armv7l-linux-gnueabihf
x86_64-apple-darwin
x86_64-linux-gnu
x86_64-linux-musl
aarch64-apple-darwin
aarch64-linux-gnu
aarch64-linux-musl
armv7l-linux-gnueabihf
x86_64-apple-darwin
x86_64-linux-gnu
x86_64-linux-musl
2023-11-17 11:37:51 -05:00
Mark Felder
8208777b06 Rust is required for blurhash 2023-11-17 11:32:56 -05:00
Mark Felder
7988c62f6d Update changelogs 2023-11-17 11:21:46 -05:00
Mark Felder
9511212e32 Fetch the library from the Pleroma repository 2023-11-17 11:18:42 -05:00
Mark Felder
88cc7e6a04 Resize images to 100 pixels before hashing 2023-11-17 11:06:31 -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
Alex Gleason
d92eef2967 Merge branch 'neetzsche/include-scrobble-url' into 'develop'
Add optional URL value for scrobbles

See merge request soapbox-pub/rebased!288
2023-11-16 20:22:54 +00:00
NEETzsche
19b041a90b Add optional URL value for scrobbles 2023-11-16 20:13:42 +00:00
Haelwenn (lanodan) Monnier
06c58bce00 scrubbers/default: Add more formatting elements from HTML4 / GoToSocial
Added: acronym, bdo, big, cite, dfn, ins, kbd, q, samp, s, tt, var, wbr
2023-11-16 18:27:32 +01:00
1ee3ba5fd3 Optionally filter local timelines according to domain
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-16 17:31:36 +01:00
Haelwenn (lanodan) Monnier
8ac7cc98c1 MastoAPI AccountView: Change last_status_at to be a date
Changed in Mastodon 3.1.0 with: https://github.com/tootsuite/mastodon/pull/12966
2023-11-16 15:52:01 +01:00
Haelwenn
ca1b18ba2d Merge branch 'federation_status-access' into 'develop'
router: Make /federation_status publicly available

See merge request pleroma/pleroma!3937
2023-11-15 08:20:37 +00:00
Haelwenn
50c896169c Merge branch 'cflags' into 'develop'
Make eblurhash and elixir-captcha use system CFLAGS

See merge request pleroma/pleroma!3943
2023-11-15 08:19:29 +00:00
Haelwenn (lanodan) Monnier
2a58596aef Fix tests for Add support for configuring a favicon and embed PWA manifest in server-generated-meta 2023-11-15 09:12:25 +01:00
db533b032b Add tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-14 23:46:24 +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
3075b8c923 Set domain timestamps type to utc_datetime
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-14 13:55: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
Haelwenn (lanodan) Monnier
5d3e145dc4 RedirectController: Unify server-generated-meta insertion code 2023-11-14 11:06:36 +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
Haelwenn
6d708664b5 Merge branch 'docs/max-elixir-erlang' into 'develop'
docs: Put a max version on erlang and elixir

Closes #3194

See merge request pleroma/pleroma!3945
2023-11-14 09:49:49 +00:00
Haelwenn (lanodan) Monnier
66f5ae0c5a router: Make /federation_status publicly available 2023-11-14 10:48:30 +01:00
Haelwenn (lanodan) Monnier
19519d6c96 docs: clang is also supported 2023-11-14 10:47:34 +01:00
Haelwenn (lanodan) Monnier
3831d31009 docs: Put a max version on erlang and elixir
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3194
2023-11-14 10:47:33 +01:00
Haelwenn (lanodan) Monnier
4472ab1fe9 changelog.d/system-cflags.fix: New entry 2023-11-14 10:45:00 +01: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
Haelwenn
bf2d6abaf2 Merge branch 'healthcheck-disabled-error' into 'develop'
TwitterAPI: Return proper error when healthcheck is disabled

See merge request pleroma/pleroma!3953
2023-11-14 09:41:26 +00:00
Mark Felder
ce42dac331 Change mediaproxy previews to use vips to generate thumbnails instead of ImageMagick 2023-11-13 15:41:39 -05:00
Mark Felder
a4b6e5613f Revert "Add Pleroma.Upload.Filter.HeifToJpeg based on vips"
This reverts commit 31d4448ee61b4afac6aa23f8c0287d13aed411a1.

This functionality is not reliably working with vips/vix due to codec patent junk
2023-11-13 15:41:39 -05:00
Mark Felder
577ade75cf Override elixir_make version 2023-11-13 15:41:39 -05:00
Mark Felder
481b6ac0d5 Add Pleroma.Upload.Filter.HeifToJpeg based on vips 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
1db10744f7 Use the "change" type 2023-11-13 15:35:00 -05:00