feld
a67fc30d81
Merge branch 'kphrx-develop-patch-87655' into 'develop'
...
Remove checking ImageMagick's commands for AnalyzeMetadata filter
See merge request pleroma/pleroma!3987
2023-12-09 14:08:13 +00:00
Mark Felder
003d3312fd
Permit the index creation to run concurrently
2023-12-08 15:48:00 -05:00
kPherox
0818a9136d
add changelog
2023-12-07 20:33:23 +09:00
Lain Soykaf
6a191a91ab
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into last_status_at
2023-12-07 11:18:39 +04:00
lain
2656199dc7
Merge branch 'more-test-fixes' into 'develop'
...
More test fixes
See merge request pleroma/pleroma!3984
2023-12-07 05:26:06 +00:00
Mark Felder
1ad0d94d6f
Change set_reachable/1 to an upsert
2023-12-06 15:50:00 -05:00
Lain Soykaf
30084b7332
Add changelog.
2023-11-30 09:55:04 +04:00
HJ
6a6a631c81
Merge branch 'neetzsche/add_url_to_scrobbles' into 'develop'
...
Add optional URL value for scrobbles
See merge request pleroma/pleroma!3977
2023-11-29 15:59:19 +00:00
lain
bc7fcc2dba
Merge branch 'vips' into 'develop'
...
Docs: Remove rust references
See merge request pleroma/pleroma!3983
2023-11-29 15:43:09 +00:00
Lain Soykaf
cd6adef471
Add changelog
2023-11-29 19:42:40 +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
35774d44b2
Merge branch 'generate-unset-user-keys-migration' into 'develop'
...
Fix GenerateUnsetUserKeys migration
See merge request pleroma/pleroma!3976
2023-11-28 12:34:32 +00:00
Lain Soykaf
10525ac7f8
Docs: Remove rust references
2023-11-28 15:21:34 +04:00
Lain Soykaf
da26964d2b
Changelog: Adjust blurhash change
2023-11-28 12:39:22 +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
lain
2b839197a9
Merge branch 'strip-fix' into 'develop'
...
Strip fix
See merge request pleroma/pleroma!3981
2023-11-27 15:30:13 +00:00
HJ
9c57f17af3
Merge branch 'frontends-docs' into 'develop'
...
Front-ends management docs
See merge request pleroma/pleroma!3974
2023-11-27 14:00:12 +00:00
NEETzsche
27df2c0ce6
Fix #strip_report_status_data
2023-11-27 17:56:43 +04:00
NEETzsche
510a7b64f1
Add optional URL value for scrobbles
2023-11-23 04:51:51 -07: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
feld
906b121a10
Merge branch 'develop' into 'vips'
...
# Conflicts:
# mix.exs
2023-11-17 16:50:36 +00:00
Mark Felder
7988c62f6d
Update changelogs
2023-11-17 11:21:46 -05: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
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 (lanodan) Monnier
66f5ae0c5a
router: Make /federation_status publicly available
2023-11-14 10:48:30 +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
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
1db10744f7
Use the "change" type
2023-11-13 15:35:00 -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
marcin mikołajczak
fe776d8b33
Fix GenerateUnsetUserKeys migration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-13 14:18:22 +01:00
lain
752bc168f6
Merge branch 'quotes-count' into 'develop'
...
Count and display post quotes
See merge request pleroma/pleroma!3956
2023-11-12 13:38:09 +00:00
marcin mikołajczak
9a063deacc
Count and display post quotes
2023-11-12 13:38:08 +00: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
Lain Soykaf
5208bd8a95
Add changelog.
2023-11-12 15:00:51 +04:00
Mark Felder
e23672d82f
Ensure benchee doesn't run unless we are executing benchmarks
2023-11-08 12:44:57 -05:00
Mark Felder
0ab853cab8
Merge branch 'develop' into phoenix1.7
2023-11-08 09:18:08 -05:00
Haelwenn (lanodan) Monnier
76c070fe86
ObjectValidators.BareUriTest: Replace calls of SafeText to BareUri
2023-11-08 02:17:50 +01:00
Mark Felder
a0e08c6ec2
Merge branch 'develop' into phoenix1.7
2023-11-07 16:05:04 -05:00
Mark Felder
bf426c53b4
Fix digest email processing, consolidate Oban queues
...
The email related jobs can all share a single Oban queue
2023-11-07 15:14:36 -05:00
tusooa
aaf53d9d77
Bump package version for mergeback
2023-10-31 20:49:31 -04:00
tusooa
ad45b06b3f
Merge branch 'stable' into 'release/2.6.0'
...
# Conflicts:
# .gitlab-ci.yml
# lib/pleroma/web/common_api/utils.ex
# lib/pleroma/web/xml.ex
# mix.exs
# test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
# test/pleroma/web/common_api/utils_test.exs
# test/pleroma/web/mastodon_api/update_credentials_test.exs
# test/pleroma/web/xml_test.exs
2023-10-31 01:07:43 +00:00
tusooa
a2a69709b5
Bump version to 2.6.0
2023-10-24 19:57:31 -04:00
tusooa
b748efe66a
Fix mentioning punycode domains when using Markdown
2023-10-16 21:35:25 -04:00
tusooa
3e7d2e29b3
Add changelog
2023-10-15 17:20:26 -04:00
Haelwenn (lanodan) Monnier
2f6fc6a7ab
TwitterAPI: Return proper error when healthcheck is disabled
2023-09-24 23:32:17 +02:00