|
|
3d1828f43b
|
Merge branch 'oban-timeouts' into 'develop'
Define sane Oban Worker timeouts
See merge request pleroma/pleroma!3777
|
2022-11-12 22:13:28 +00:00 |
|
tusooa
|
f38cb4ccac
|
Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
Lint
See merge request pleroma/pleroma!3778
|
2022-11-12 19:48:26 +00:00 |
|
tusooa
|
14871fecd4
|
Lint
|
2022-11-12 14:16:52 -05:00 |
|
tusooa
|
1b0e47b79b
|
Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
Give admin the choice to not strip reported statuses
Closes #2887
See merge request pleroma/pleroma!3773
|
2022-11-12 17:55:50 +00:00 |
|
tusooa
|
e3e68b9377
|
Update config cheatsheet
|
2022-11-12 12:55:02 -05:00 |
|
Haelwenn
|
c2cfe0c690
|
Clarify config description
|
2022-11-12 17:44:31 +00:00 |
|
|
|
a977e1ef96
|
Document Oban workers getting timeouts defined
|
2022-11-12 11:12:00 -05:00 |
|
Haelwenn
|
7c8618dc9a
|
Merge branch 'no-ducks' into 'develop'
Remove Quack logging backend
See merge request pleroma/pleroma!3776
|
2022-11-12 05:40:07 +00:00 |
|
tusooa
|
7991364380
|
Lint
|
2022-11-11 18:32:08 -05:00 |
|
|
|
8be7f87e1f
|
Define sane Oban Worker timeouts
|
2022-11-11 13:46:27 -05:00 |
|
|
|
572751bec7
|
Clean up stale entries in mix.lock
mix deps.clean --unlock --unused
|
2022-11-11 12:48:13 -05:00 |
|
|
|
ceb07772d0
|
Merge branch 'custom-db-port' into 'develop'
allow custom db port
Closes #2981
See merge request pleroma/pleroma!3775
|
2022-11-11 17:38:51 +00:00 |
|
|
|
7d0175dc3a
|
Document removal of Quack
|
2022-11-11 12:36:38 -05:00 |
|
|
|
8a3b450397
|
Add migration to remove Quack from ConfigDB
|
2022-11-11 12:36:34 -05:00 |
|
|
|
6b87b3f2ea
|
Remove Quack logging backend
|
2022-11-11 12:36:29 -05:00 |
|
lain
|
e7c40c2509
|
fix envvar
|
2022-11-11 15:40:32 +00:00 |
|
Iván Raskovsky
|
36519bdbee
|
allow custom db port
|
2022-11-11 12:22:21 -03:00 |
|
lain
|
39a96876ef
|
Merge branch 'soapbox-ref' into 'develop'
Update links to Soapbox
See merge request pleroma/pleroma!3774
|
2022-11-11 12:04:47 +00:00 |
|
marcin mikołajczak
|
eb70676931
|
Update links to Soapbox
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-11 12:13:30 +01:00 |
|
tusooa
|
717c5901f8
|
Render a generated reported activity properly
|
2022-11-09 23:02:27 -05:00 |
|
tusooa
|
6f047cc308
|
Do not strip reported statuses when configured not to
|
2022-11-09 22:36:57 -05:00 |
|
tusooa
|
481f50bcfd
|
Merge branch 'docs/object_age-strip_followers' into 'develop'
ObjectAgePolicy: Make strip_followers behavior for followers-only explicit
See merge request pleroma/pleroma!3770
|
2022-11-07 14:07:30 +00:00 |
|
Haelwenn (lanodan) Monnier
|
648e012022
|
ObjectAgePolicy: Make strip_followers behavior for followers-only explicit
|
2022-11-07 14:58:47 +01:00 |
|
tusooa
|
8d704d384d
|
Merge branch 'ci-coverage' into 'develop'
Test coverage: Switch to covertool to get cobertura output
See merge request pleroma/pleroma!3745
|
2022-11-06 02:19:27 +00:00 |
|
|
|
9f708037d7
|
Merge branch 'tusooa/caveats-webfinger' into 'develop'
Document some caveats of webfinger domain setting
See merge request pleroma/pleroma!3767
|
2022-11-03 22:24:38 +00:00 |
|
tusooa
|
f2e4b425e1
|
Document some caveats of webfinger domain setting
|
2022-11-03 21:13:00 +00:00 |
|
Haelwenn
|
127e7b8ff9
|
Merge branch 'feature/1469-webfinger-expanding' into 'develop'
Feature/1469 webfinger expanding
Closes #1469 and #2517
See merge request pleroma/pleroma!3361
|
2022-11-03 15:03:50 +00:00 |
|
Alexander Strizhakov
|
8407e26b0c
|
rebase fix
|
2022-11-03 10:06:36 -04:00 |
|
Alexander Strizhakov
|
a57c025594
|
docs update
|
2022-11-03 09:48:59 -04:00 |
|
Alexander Strizhakov
|
5a9ea98baf
|
XML WebFinger user representation correct domain
|
2022-11-03 09:48:59 -04:00 |
|
Alexander Strizhakov
|
30ded8876a
|
docs & changelog
|
2022-11-03 09:48:57 -04:00 |
|
Alexander Strizhakov
|
4121bca895
|
expanding WebFinger
|
2022-11-03 09:48:24 -04:00 |
|
Haelwenn
|
da0ef154a6
|
Merge branch 'from/upstream-develop/tusooa/2930-get-or-fetch' into 'develop'
Fix User.get_or_fetch/1 with usernames starting with http
Closes #2930
See merge request pleroma/pleroma!3751
|
2022-10-30 00:38:21 +00:00 |
|
tusooa
|
9fbf01f7a9
|
Merge branch 'push-updates' into 'develop'
Push.Impl: support edits
See merge request pleroma/pleroma!3760
|
2022-10-27 12:51:29 +00:00 |
|
|
|
7a519b6a66
|
Merge branch 'fix-deprecation-text' into 'develop'
Fix deprecation warning for Gun timeout
See merge request pleroma/pleroma!3759
|
2022-10-24 14:22:49 +00:00 |
|
Haelwenn
|
705ba6d615
|
Merge branch 'security/PleromaAPI-delete' into 'develop'
CommonAPI: generate ModerationLog for all admin/moderator deletes
See merge request pleroma/pleroma!3765
|
2022-10-15 12:54:20 +00:00 |
|
Haelwenn (lanodan) Monnier
|
16b06160ac
|
CommonAPI: generate ModerationLog for all admin/moderator deletes
As a side-effect it also changes the ChatMessage delete ID to an
Activity.id rather than MessageReference.id
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2958
|
2022-10-14 18:51:08 +02:00 |
|
tusooa
|
c830282628
|
Merge branch 'weblate-extract' into 'develop'
Extract translatable strings
See merge request pleroma/pleroma!3752
|
2022-10-11 21:21:36 +00:00 |
|
weblate-extractor
|
1ac9bd0b4c
|
Extract translatable strings
|
2022-10-11 06:13:00 +00:00 |
|
tusooa
|
8042e0ebe1
|
Merge branch 'mergeback/2.4.4' into 'develop'
mergeback: 2.4.4
See merge request pleroma/pleroma!3762
|
2022-10-09 04:29:09 +00:00 |
|
Tusooa Zhu
|
dd82fd234f
|
Merge branch 'release/2.4.4' into mergeback/2.4.4
|
2022-10-08 22:15:09 -04:00 |
|
marcin mikołajczak
|
1b238a4fad
|
Push.Impl: support edits
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-01 23:28:02 +02:00 |
|
|
|
1958f23fe7
|
Fix deprecation warning for Gun timeout
|
2022-09-30 12:22:06 -04:00 |
|
Haelwenn
|
3f1c31b7cd
|
Merge branch 'fix/exclude-deactivated-in-search' into 'develop'
User: search: exclude inactive users from user search
See merge request pleroma/pleroma!3755
|
2022-09-27 23:58:45 +00:00 |
|
Haelwenn
|
d43d02bf41
|
Merge branch 'from/upstream-develop/tusooa/fix-static-tests' into 'develop'
Make instance document controller test sync
Closes #2940
See merge request pleroma/pleroma!3757
|
2022-09-27 21:50:43 +00:00 |
|
Haelwenn
|
757a21554f
|
Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop'
Reduce incoming and outgoing federation queue sizes to 5
Closes #2169
See merge request pleroma/pleroma!3756
|
2022-09-27 21:50:06 +00:00 |
|
Haelwenn
|
5d7d623390
|
Merge branch 'bugfix/elixir-1.14' into 'develop'
Bugfix: Elixir 1.14
See merge request pleroma/pleroma!3740
|
2022-09-27 21:46:03 +00:00 |
|
Tusooa Zhu
|
e66c02b775
|
Make instance document controller test sync
|
2022-09-20 12:34:10 -04:00 |
|
tusooa
|
ac95b8b4f3
|
Merge branch 'websocketex' into 'develop'
Use Websockex to replace websocket_client
See merge request pleroma/pleroma!3743
|
2022-09-18 17:09:12 +00:00 |
|
Tusooa Zhu
|
467b6cad6f
|
Reduce incoming and outgoing federation queue sizes to 5
|
2022-09-17 16:34:33 -04:00 |
|
