|
|
0bf8a2e38c
|
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-27 20:26:16 +02:00 |
|
lain
|
50af909c01
|
Merge branch 'pleroma-card-image-description' into 'develop'
Include image description in status media cards
See merge request pleroma/pleroma!4101
|
2024-04-19 07:39:05 +00:00 |
|
|
|
6f6bede900
|
Include image description in status media cards
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-19 10:20:31 +04:00 |
|
lain
|
87b8ac3ce6
|
Merge branch 'receiverworker-error-handling' into 'develop'
ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}
See merge request pleroma/pleroma!4100
|
2024-04-19 06:04:44 +00:00 |
|
Haelwenn
|
71a0373232
|
Merge branch 'ffmpeg-limiter' into 'develop'
Prevent Media Helper from respawning ffmpeg for bad media
See merge request pleroma/pleroma!4086
|
2024-04-17 05:47:54 +00:00 |
|
Haelwenn (lanodan) Monnier
|
a299ddb10e
|
ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}
Otherwise an error like `{:signature, {:error, {:error, :not_found}}}` ends up considered a success.
|
2024-04-17 07:43:47 +02:00 |
|
|
|
4f5c4d79c4
|
FEP-2c59, add "webfinger" to user actor
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-11 17:50:11 +02:00 |
|
|
|
5a6be1dd6e
|
Merge remote-tracking branch 'origin/develop' into fork
|
2024-03-21 00:00:28 +01:00 |
|
lain
|
987f44d811
|
Merge branch 'bookmark-folders' into 'develop'
Fix BookmarkFolderView, add test
See merge request pleroma/pleroma!4096
|
2024-03-20 13:26:47 +00:00 |
|
|
|
9f4829695b
|
Merge branch 'bookmark-folders' into HEAD
|
2024-03-20 13:25:30 +01:00 |
|
|
|
37ec645ff2
|
Fix BookmarkFolderView, add test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-20 13:24:43 +01:00 |
|
Mark Felder
|
741f22bfe0
|
MediaHelper: cache failed URLs for 15 minutes to prevent excessive retries
|
2024-03-19 12:14:03 -04:00 |
|
Lain Soykaf
|
4e8a1b40cb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into transient-validators-defaults
|
2024-03-19 16:26:02 +04:00 |
|
lain
|
8a14fdbe47
|
Update transient-validators-defaults.change
|
2024-03-19 12:03:43 +00:00 |
|
Lain Soykaf
|
040a980277
|
Add changelog
|
2024-03-19 15:03:16 +04:00 |
|
lain
|
8e37f19883
|
Merge branch 'test-improvements' into 'develop'
Tests: Explicitly set db pool size and max cases to the same value.
See merge request pleroma/pleroma!4094
|
2024-03-19 07:44:05 +00:00 |
|
Lain Soykaf
|
3cc8414c2e
|
Add changelog
|
2024-03-19 10:38:29 +04:00 |
|
|
|
8b92459345
|
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-18 22:00:35 +01:00 |
|
Mark Felder
|
7f97fbc1ae
|
Update minimum Postgres version to 11.0; disable JIT
This release is where JIT was introduced and it should be disabled. Pleroma's queries do not benefit from JIT, but it can increase latency of queries.
|
2024-03-18 15:36:26 -04:00 |
|
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 |
|
|
|
0fb0d081cc
|
Merge branch 'backups-chats' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:48:54 +01:00 |
|
|
|
51edd70319
|
Merge branch 'bookmark-folders' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:32:16 +01:00 |
|
|
|
0e6c94f857
|
Merge branch 'backups' into fork
|
2024-03-14 23:30:57 +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 |
|
|
|
bf2a10331e
|
Allow to specify post language
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:18:17 +01:00 |
|
|
|
e9e2b18650
|
Merge branch 'webhooks_' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:06:25 +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 |
|
|
|
3c21a33656
|
Backup chats and chat messages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-12 10:57:59 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
9cfa4e67b1
|
Add ForceMention mrf
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-01 18:16:09 +01:00 |
|
|
|
d415686bb9
|
Allow to group bookmarks in folders
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-01 11:04:01 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
