lain
2b71f4897f
Merge branch 'develop' into 'bookmark-folders'
...
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
2024-03-18 10:35:02 +00:00
lain
cf0aa1238c
Merge branch 'public-polls' into 'develop'
...
Expose nonAnonymous field from Smithereen polls
See merge request pleroma/pleroma!3962
2024-03-18 06:26:22 +00:00
Matthieu Rakotojaona
a48f5f860e
Notifications: filter on users rather than activities
2024-03-17 20:58:59 +01:00
Lain Soykaf
0450da88b6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-fix-3241
2024-03-17 16:42:17 +04:00
lain
95bcd5d28f
Merge branch 'force-mention' into 'develop'
...
Add ForceMention mrf
See merge request pleroma/pleroma!4082
2024-03-17 12:32:14 +00:00
feld
0b5bba23ce
Merge branch 'backups' into 'develop'
...
Include following/followers in backups
See merge request pleroma/pleroma!4085
2024-03-15 19:32:35 +00:00
Haelwenn (lanodan) Monnier
4ad1d02d7e
changelog.d/transient-validators-defaults.change: insert
2024-03-15 16:25:02 +01:00
marcin mikołajczak
bb0b17f4d9
Include following/followers in backups
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-10 23:53:12 +01:00
tusooa
df7a8d4efe
Merge branch 'instance-contact-account' into 'develop'
...
Add contact account to InstanceView
See merge request pleroma/pleroma!3960
2024-03-10 13:14:19 +00:00
feld
72daf522c9
Merge branch 'fix-framegrabs' into 'develop'
...
Fix ffmpeg framegrabs with Exile
See merge request pleroma/pleroma!4087
2024-03-08 14:48:26 +00:00
marcin mikołajczak
c0c4a9ed0d
Merge remote-tracking branch 'origin/develop' into instance-contact-account
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-08 12:12:55 +01:00
Mark Felder
54ff7234b9
Fix ffmpeg framegrabs with Exile
2024-03-07 17:38:21 -05:00
marcin mikołajczak
b7c625db0f
Merge remote-tracking branch 'origin/develop' into link-verification
2024-03-07 13:13:49 +01:00
tusooa
8298b326a7
Merge branch 'instance-v2' into 'develop'
...
Add some missing fields to instanceV2
See merge request pleroma/pleroma!4081
2024-03-07 01:31:27 +00:00
Kaede Fujisaki
1311f8314e
add changelog.d
2024-03-02 18:24:39 +09:00
marcin mikołajczak
9cfa4e67b1
Add ForceMention mrf
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-01 18:16:09 +01:00
marcin mikołajczak
d415686bb9
Allow to group bookmarks in folders
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-01 11:04:01 +01:00
marcin mikołajczak
acb9e46074
Add some missing fields to instanceV2
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-02-27 13:25:26 +01:00
Haelwenn
03e54aaba9
Merge branch 'remote-fetcher-error' into 'develop'
...
RemoteFetcherWorker: Make sure {:error, _} is returned on failure
See merge request pleroma/pleroma!4077
2024-02-24 11:37:34 +00:00
Mark Felder
267e20dbcd
Exile: change to upstream pre-release commit that fixes build on FreeBSD
2024-02-23 15:36:37 -05:00
Mark Felder
f4e48bc53e
Rename variable to make the worker retry logic easier to read
...
The boolean value matches the intent of the "last_attempt" variable name now
2024-02-23 11:12:10 -05:00
Haelwenn (lanodan) Monnier
6af6a9704d
RemoteFetcherWorker: Make sure {:error, _} is returned on failure
...
Otherwise jobs are considered a success.
2024-02-23 01:59:30 +01:00
marcin mikołajczak
c592a0e58d
Merge remote-tracking branch 'origin/develop' into HEAD
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-02-22 21:05:20 +01:00
Mark Felder
72fc41d891
Prevent publisher jobs from erroring if the connection pool is full
...
A full pool is a soft-error. Snooze the job for 30 seconds and try again.
2024-02-22 14:14:40 -05:00
Haelwenn (lanodan) Monnier
e149ee6e22
Mergeback of security release 2.6.2
2024-02-20 09:34:11 +01:00
Haelwenn (lanodan) Monnier
7d624c4750
StealEmojiPolicy: Sanitize shortcodes
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3245
2024-02-20 09:09:54 +01:00
Mark Felder
7e99d0619d
Force more frequent full_sweep GC runs on the Websocket processes
...
Websocket processes seem to be the primary culprit for Binary memory allocation bloat.
2024-02-17 09:53:52 -05:00
Mark Felder
1951d56ed9
Revert "Add support for a "deps" changelog type and document deps changes since 2.6.1 release"
...
This reverts commit 2a4fa4c408
.
2024-02-16 12:53:18 -05:00
Mark Felder
2a4fa4c408
Add support for a "deps" changelog type and document deps changes since 2.6.1 release
2024-02-15 10:27:13 -05:00
Mark Felder
772f8d08cf
Tesla changelog
2024-02-15 10:24:32 -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
feld
4dd8a1a1ca
Merge branch 'websocket-refactor' into 'develop'
...
Websocket refactor to use Phoenix.Socket.Transport
See merge request pleroma/pleroma!4064
2024-02-15 14:36:54 +00:00
lain
d3208d2250
Merge branch 'oauth-nickname' into 'develop'
...
Use User.full_nickname/1 in oauth html template
See merge request pleroma/pleroma!4054
2024-02-15 09:35:39 +00:00
Haelwenn
f28dcc9cb7
Merge branch 'config-stat-symlink' into 'develop'
...
Config: Check the permissions of the linked file instead of the symlink
See merge request pleroma/pleroma!4061
2024-02-15 01:48:03 +00:00
Haelwenn
d19642d7eb
Merge branch 'bugfix-ccworks' into 'develop'
...
Bugfix for ccworks AP bridge
Closes #3234
See merge request pleroma/pleroma!4043
2024-02-15 01:30:22 +00:00
feld
802c618885
Merge branch 'atom-leaks' into 'develop'
...
Fix minor atom leaks
See merge request pleroma/pleroma!4065
2024-02-14 23:28:00 +00:00
Mark Felder
9138754b0a
Changelog
2024-02-14 18:04:39 -05:00
Mark Felder
6be129ead2
Websocket refactor changelog
2024-02-14 15:27:12 -05:00
feld
af9bb77cad
Merge branch 'gun-logs' into 'develop'
...
Gun connection pool logs
See merge request pleroma/pleroma!4063
2024-02-14 18:57:11 +00:00
Mark Felder
9a4c8e2316
Change some Gun connection pool logs to debug level
2024-02-14 13:28:32 -05:00
Mark Felder
60ba6fd244
MediaProxy RFC compliance
2024-02-14 13:25:52 -05:00
Haelwenn (lanodan) Monnier
3b82864bcc
Config: Check the permissions of the linked file instead of the symlink↵
2024-02-14 18:19:50 +01:00
Mark Felder
67c3acde34
Update .gitignore
2024-02-12 17:22:57 -05:00
Mark Felder
cb4d3db8c6
Changelog for notifications fix pulled in from Rebased
2024-02-12 14:14:38 -05:00
Mark Felder
0eca3e38eb
Fix Gun connection supervisor logic error
...
This was recently changed to solve a Dialyzer error, but the replacement logic was faulty as "retry" would only be compared to :error and not have its truthiness evaluated.
The original logic was also faulty as it returned {:error, :pool_full} even retry was true. It never retried when the pool was full.
2024-02-09 10:48:40 -05:00
marcin mikołajczak
0fcdcc2300
Use User.full_nickname/1 in oauth html template
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-02-09 16:46:45 +01:00
Mark Felder
9f2319e50d
RichMedia.Helpers: move the validate_page_url/1 function to the Parser module
...
This will ensure that the page validation happens in Parser.parse/1 so it can be called from anywhere and still filter invalid URLs.
2024-02-06 18:34:02 -05:00
Mark Felder
04fc4eddaa
Fix Rich Media Previews for updated activities
...
The Rich Media Previews were not regenerated when a post was updated due to a cache invalidation issue. They are now cached by the activity id so they can be evicted with the other activity cache objects in the :scrubber_cache.
2024-02-04 23:47:04 -05:00
Mark Felder
0ffeb84f0c
Changelog
2024-02-02 12:14:21 -05:00
marcin mikołajczak
1ed8ae2d8e
Add changelog
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-01-31 22:55:58 +01:00
Mark Felder
e17441b0ed
Changelog
2024-01-31 10:13:02 -05:00
Haelwenn
251c455b91
Merge branch 'deps-bump' into 'develop'
...
Bump dependencies
See merge request pleroma/pleroma!4044
2024-01-29 17:43:00 +00:00
Mark Felder
6a22a80f9f
Pleroma.Web.MastodonAPI.DirectoryController: dialyzer errors
...
lib/pleroma/web/mastodon_api/controllers/directory_controller.ex:6:unused_fun
Function skip_auth/2 will never be called.
________________________________________________________________________________
lib/pleroma/web/mastodon_api/controllers/directory_controller.ex:6:unused_fun
Function skip_plug/2 will never be called.
________________________________________________________________________________
lib/pleroma/web/mastodon_api/controllers/directory_controller.ex:18:guard_fail
The guard clause:
when _action :: atom() == <<105, 110, 100, 101, 120>>
can never succeed.
2024-01-28 17:41:07 -05:00
Mark Felder
7d7662277c
Changelog
2024-01-26 21:05:43 -05:00
Haelwenn (lanodan) Monnier
5c5d9d9b9d
Bump dependencies
2024-01-26 15:50:45 -05:00
Haelwenn (lanodan) Monnier
558b421079
Test incoming federation from Convergence AP Bridge
2024-01-26 17:05:18 +01:00
Mark Felder
0dd65246ea
MRF.HashtagPolicy: fix dialyzer error
...
lib/pleroma/web/activity_pub/mrf/hashtag_policy.ex:87:exact_eq
The test <<_::32>> == <<_::48>> can never evaluate to 'true'.
2024-01-22 18:37:19 -05:00
Mark Felder
bff47479a7
Exile: fix for MacOS dev environments
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
Haelwenn
ab3f03a04a
Merge branch 'develop' into 'public-polls'
...
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
2024-01-21 12:03:29 +00:00
Mark Felder
cca9d6aeaa
Dialyzer fixes
2024-01-20 19:29:29 -05:00
Haelwenn
3c65a2899d
Merge branch 'handle_object_fetch_failures' into 'develop'
...
Handle object fetch failures gracefully
See merge request pleroma/pleroma!4015
2024-01-19 18:43:00 +00:00
marcin mikołajczak
b39403a48f
Update API docs for my changes
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-01-17 17:13:21 +01:00
Haelwenn
4c20713ecd
Merge branch 'otp26' into 'develop'
...
OTP26 support
See merge request pleroma/pleroma!4025
2024-01-17 09:51:56 +00:00
Haelwenn
9b39bc6aa8
Merge branch 'mrf-regex-error' into 'develop'
...
MRF: Log sensible regex error for subdomain_match
See merge request pleroma/pleroma!4026
2024-01-15 08:24:54 +00:00
Haelwenn
c29430b018
Merge branch 'mrf-steal-emoji-extname' into 'develop'
...
MRF.StealEmojiPolicy: Properly add fallback extension to filenames missing one
See merge request pleroma/pleroma!4029
2024-01-15 08:24:24 +00:00
Mark Felder
12c052551b
Allow the Remote Fetcher to attempt fetching an unreachable instance
2024-01-14 14:05:43 -05:00
tusooa
d3a4f5b7d7
Merge branch 'nil-contentMap' into 'develop'
...
Support objects with a nil contentMap (firefish)
Closes #3231
See merge request pleroma/pleroma!4030
2024-01-13 22:23:21 +00:00
feld
9cc46c5538
Merge branch 'qtfaststart-fix' into 'develop'
...
Fix MediaProxy crashing on some videos
See merge request pleroma/pleroma!4024
2024-01-13 04:35:32 +00:00
Mint
3c30eadd5e
Fix duplicate inbox deliveries
2024-01-11 20:48:35 +03:00
Haelwenn (lanodan) Monnier
7651198508
Support objects with a nil contentMap (firefish)
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3231
2024-01-11 07:16:45 +01:00
Haelwenn (lanodan) Monnier
4ca65c6182
MRF.StealEmojiPolicy: Properly add fallback extension to filenames missing one
2024-01-07 19:37:35 +01:00
Ekaterina Vaartis
29158681f9
Fetch count before downloading the pack and use that as page size
2024-01-07 17:07:50 +03:00
Ekaterina Vaartis
69e4ebbb8e
Make remote emoji packs API use specifically the V1 URL
...
Akkoma does not understand it without V1, and it works either way with
normal pleroma, so no reason to not do this
2024-01-07 15:30:52 +03:00
Alexander Tumin
32d8e0d496
Fix authentication check on account rendering when bio is defined
2024-01-04 16:57:48 +03:00
Haelwenn (lanodan) Monnier
6af49270a9
MRF: Log sensible error for subdomains_regex
2024-01-02 15:37:41 +01:00
Mark Felder
63a74f7b6d
Support for Erlang OTP 26
2023-12-29 23:22:31 -05:00
Haelwenn
f74f5e0a56
Merge branch 'publisher' into 'develop'
...
Discard some failed publisher jobs
See merge request pleroma/pleroma!4022
2023-12-29 23:18:34 +00:00
Mark Felder
50edef5bc1
Change QTFastStart to recover gracefully if it encounters an error during bitstring matching
...
This fixes issues with internal errors when trying to serve the video
2023-12-29 14:12:44 -05:00
feld
8ac4458630
Merge branch 'finch-redirects' into 'develop'
...
Fix following redirects with Finch
See merge request pleroma/pleroma!4023
2023-12-29 17:00:58 +00:00
lain
a6fc97ffec
Merge branch 'bugfix/chat-attachment-empty-array' into 'develop'
...
ChatMessage: Tolerate attachment field set to an empty array
Closes #3224
See merge request pleroma/pleroma!4020
2023-12-29 08:12:27 +00:00
Mark Felder
2950397d47
Fix following redirects with Finch
2023-12-29 00:50:50 -05:00
Mark Felder
7ebca7ecfa
Activity publishing failures will prevent the job from retrying if the publishing request returns a 403 or 410
2023-12-29 00:25:33 -05:00
Mark Felder
77949d4590
Make the Publisher log error less noisy
2023-12-29 00:25:11 -05:00
Haelwenn (lanodan) Monnier
39dc6c65ef
ChatMessage: Tolerate attachment field set to an empty array
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3224
2023-12-29 05:32:47 +01:00
Mark Felder
d519a535e1
Changelog
2023-12-28 23:32:21 -05:00
Mark Felder
aa070c7daf
Handle 401s as I have observed it in the wild
2023-12-28 23:09:33 -05:00
Mark Felder
013f7c4f8f
Changelog
2023-12-28 14:55:26 -05:00
Haelwenn
ddc321a094
Merge branch 'tusooa/3205-group-actor' into 'develop'
...
Implement group actors
See merge request pleroma/pleroma!3969
2023-12-28 10:46:53 +00:00
Mark Felder
ad0a5deb67
Prevent requeuing Remote Fetcher jobs that exceed thread depth
2023-12-27 22:28:41 -05:00
marcin mikołajczak
017e35fbf1
Fix some more typos
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-28 00:17:04 +01:00
Mark Felder
53db65678d
Separate files for each distinct sentence in the changelog
2023-12-27 15:44:31 -05:00
marcin mikołajczak
f6fee39e42
Add changelog
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-27 21:24:20 +01:00
Mark Felder
1a337dcc18
These functions in Pleroma.Instances should be defdelegates to Pleroma.Instances.Instance
2023-12-27 12:44:16 -05:00
tusooa
e9d2fadd8e
Add changelog for group actors
2023-12-27 12:28:11 -05:00
Mark Felder
5f51094138
Update changelog
2023-12-27 11:09:42 -05:00
Mark Felder
73c4c6d7de
Revert "Mark instances as unreachable when returning a 403 from an object fetch"
...
This reverts commit d472bafec1
.
2023-12-26 17:20:36 -05:00
Mark Felder
9c0040124a
Skip remote fetch jobs for unreachable instances
2023-12-26 16:28:05 -05:00
Mark Felder
c4f0a3b570
Changelogs
2023-12-26 16:08:36 -05:00
marcin mikołajczak
9fc6676d8c
Merge remote-tracking branch 'origin/develop' into instance-contact-account
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-22 13:54:44 +01:00
marcin mikołajczak
28e5e65676
Merge remote-tracking branch 'origin/develop' into webfinger-fix
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-22 13:29:56 +01:00
lain
5f1d707367
Merge branch 'bad_inbox_request' into 'develop'
...
Return a 400 from a bad delivery attempt to the inbox
Closes #2884
See merge request pleroma/pleroma!4009
2023-12-22 11:04:25 +00:00
Haelwenn
bd50892c25
Merge branch 'instance-v2' into 'develop'
...
Implement api/v2/instance route
See merge request pleroma/pleroma!3939
2023-12-21 21:14:46 +00:00
Mark Felder
7e3bbdded5
Elixir 1.13 is the minimum required version
2023-12-20 23:39:12 +00:00
Mark Felder
928bda2e43
Fix invalid string comparison for OTP versions and replace with config
...
Old way was wrong for multiple reasons. If we do this as a config value it fixes :slave.start/3 being picked up as a compile warning on OTP26.
Also if we want to do any real clustering we'll need something like this to support OTP25 and older.
2023-12-20 23:13:33 +00:00
Mark Felder
d9fe41a301
More deprecation fixes
2023-12-20 16:47:58 -05:00
Mark Felder
3c80c86437
Chase deprecations/warnings for Elixir 1.15
2023-12-20 20:17:25 +00:00
Mark Felder
bf57fd82bb
Clarify location of test.secret.exs file
2023-12-20 14:12:06 -05:00
Mark Felder
f43f33e307
Return a 400 from a bad delivery attempt to the inbox
...
This stops the backend from generating 500 errors from these events.
2023-12-19 13:56:17 -05:00
Mark Felder
e2066994b1
Fix Web Push notification delivery
...
Finch does not automatically append header content-type: octet-stream for binary payloads.
2023-12-19 10:56:55 -05:00
Haelwenn (lanodan) Monnier
086ba59d03
HTTPSignaturePlug: Add :authorized_fetch_mode_exceptions
2023-12-16 19:25:51 +01:00
Lain Soykaf
77bb1bb6c8
Actually write changelog
2023-12-16 21:41:28 +04:00
Lain Soykaf
a0f70cf7d0
Add changelog
2023-12-16 20:40:51 +04:00
tusooa
f5559f3aff
Skip changelog for 2.6.1 mergeback
2023-12-15 19:45:23 -05:00
tusooa
453cb6a388
Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1
2023-12-15 19:43:07 -05:00
Yonle
cb1b52d980
ap userview: add outbox field.
...
Signed-off-by: Yonle <yonle@lecturify.net>
2023-12-15 09:55:06 +04:00
tusooa
ad6a6aa07b
Bump version to 2.6.1
2023-12-14 20:14:41 -05:00
Haelwenn (lanodan) Monnier
b1ea63b4c6
changelog.d/system-cflags.fix: New entry
2023-12-14 20:13:25 -05:00
Haelwenn (lanodan) Monnier
35090f6eac
TwitterAPI: Return proper error when healthcheck is disabled
2023-12-14 20:11:01 -05:00
Haelwenn (lanodan) Monnier
1b22f13488
docs: Put a max version on erlang and elixir
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3194
2023-12-14 07:29:54 -05:00
Henry Jameson
e635ee8b39
changelog
2023-12-14 07:28:52 -05:00
Lain Soykaf
40fa1099bf
StatusViewTest: Fix tests.
2023-12-13 11:19:08 +04:00
lain
29d202e1df
Merge branch 'add-opengraph-rich-media-proxy' into 'develop'
...
Add media proxy to opengraph rich media cards
See merge request pleroma/pleroma!3997
2023-12-13 06:23:16 +00:00
Alexander Tumin
e7af2addd8
Add media proxy to opengraph rich media cards
2023-12-12 18:32:02 +03:00
Lain Soykaf
8da1fd329d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into no-async-clear-config
2023-12-12 12:29:22 +04:00
Lain Soykaf
7371e72e6c
Dockerfile: Use platform libvips.
2023-12-12 11:36:34 +04:00
Lain Soykaf
18ab36d70c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into no-async-clear-config
2023-12-12 10:55:19 +04:00
lain
41c02b3d16
Merge branch 'authorize-interaction' into 'develop'
...
Support /authorize-interaction route used by Mastodon
See merge request pleroma/pleroma!3957
2023-12-11 09:31:18 +00:00
Lain Soykaf
7cf65cfeea
Changelog
2023-12-11 12:48:53 +04:00
lain
e7974afd37
Merge branch 'optimistic-inbox' into 'develop'
...
Optimistic Inbox
See merge request pleroma/pleroma!3989
2023-12-11 07:32:42 +00:00
Lain Soykaf
221f18dc33
Tests: Don't run tests that use clear_config asynchronously.
2023-12-10 16:27:23 +04:00
lain
a7f82ff82e
Merge branch 'scrubbers-html4-GtS' into 'develop'
...
scrubbers/default: Add more formatting elements from HTML4 / GoToSocial
See merge request pleroma/pleroma!3979
2023-12-10 12:18:22 +00:00
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
1b5964979f
Optimistic Inbox
2023-12-08 18:13:43 -05: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