11ea7d98bb
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-09-06 14:52:04 -05:00
453a66f8c2
Merge branch 'weblate-extract' into 'develop'
...
Extract translatable strings
See merge request pleroma/pleroma!3748
2022-09-06 17:17:40 +00:00
3d32c92b37
Extract translatable strings
2022-09-06 16:45:08 +00:00
c0b265b404
Merge branch 'birthday-config-description' into 'develop'
...
Clarify `birthday_min_age` config description
See merge request pleroma/pleroma!3747
2022-09-06 12:40:02 +00:00
c6bc523914
Clarify `birthday_min_age` config description
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 20:25:01 +02:00
b8d6cb5845
Merge branch 'from/upstream-develop/tusooa/2892-backup-scope' into 'develop'
...
Make backups require its own scope
Closes #2892
See merge request pleroma/pleroma!3721
2022-09-05 15:42:02 +00:00
346c130ddc
Merge branch 'fix/user-private-key-generation' into 'develop'
...
User: generate private keys on user creation
See merge request pleroma/pleroma!3737
2022-09-05 15:38:15 +00:00
f7c2073103
Merge branch 'bump/min-elixir-1.10' into 'develop'
...
Bump minimum Elixir version to 1.10
See merge request pleroma/pleroma!3741
2022-09-05 15:19:34 +00:00
9874b4c985
Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope'
...
# Conflicts:
# CHANGELOG.md
2022-09-05 15:00:19 +00:00
cfb1bc967f
Migrations: generate unset user keys
...
User keys are now generated on user creation instead of "when needed",
to prevent race conditions in federation and a few other issues. This
migration will generate keys missing for local users.
2022-09-05 03:51:35 +02:00
cd237d22f1
User: generate private keys on user creation
...
This fixes a race condition bug where keys could be regenerated
post-federation, causing activities and HTTP signatures from an user to
be dropped due to key differences.
2022-09-05 03:51:17 +02:00
f8afba95b2
Merge branch 'fix/gts-federation' into 'develop'
...
GoToSocial federation fixes
See merge request pleroma/pleroma!3725
2022-09-05 01:10:34 +00:00
20347898e2
Merge branch 'fix/federation-context-issues' into 'develop'
...
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects
See merge request pleroma/pleroma!3717
2022-09-04 18:43:36 +00:00
c63cf954de
Merge branch 'from/upstream-develop/tusooa/streaming-fix' into 'develop'
...
Streaming fix
Closes #2796
See merge request pleroma/pleroma!3738
2022-09-03 18:24:28 +00:00
71839cb890
Merge branch 'changes/embed-metadata' into 'develop'
...
Metadata/Utils: use summary as description if set
Closes #2491
See merge request pleroma/pleroma!3733
2022-09-03 16:21:08 +00:00
80a2528fd1
ci-base: Document building and pushing a new image
2022-09-03 18:19:58 +02:00
4477c6baff
Metadata/Utils: use summary as description if set
...
When generating OpenGraph and TwitterCard metadata for a post, the
summary field will be used first if it is set to generate the post
description.
2022-09-03 17:17:48 +02:00
257601d67d
Merge branch 'ssh-bbs-improvements' into 'develop'
...
BBS: add functionnalities and readability
See merge request pleroma/pleroma!3675
2022-09-03 11:15:07 +00:00
be411ad3bc
Test coverage: Switch to covertool to get cobertura output
...
This allows to have coverage information integrated into Gitlab
2022-09-03 05:03:50 +02:00
d19696cf60
Lint
2022-09-02 22:58:35 -04:00
299255b9bb
Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop'
...
Add function to calculate associated object id
Closes #2307
See merge request pleroma/pleroma!3692
2022-09-03 02:50:40 +00:00
e40c221c31
Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
...
Editing
Closes #1429 , #2859 , and #2288
See merge request pleroma/pleroma!3678
2022-09-03 02:16:42 +00:00
07ef72f493
Merge branch 'from/develop/tusooa/2807-remote-xact-post' into 'develop'
...
Remote interaction with posts
Closes #2807 and #978
See merge request pleroma/pleroma!3587
2022-09-03 02:03:48 +00:00
ec80a1e405
Bump minimum Elixir version to 1.10
...
1.9 being end-of-life
2022-09-03 03:58:22 +02:00
24af2e1c58
script_test: Fix %ErlangError for Elixir 1.14
2022-09-03 03:58:22 +02:00
e124776d14
Elixir 1.14 formatting
2022-09-03 03:58:22 +02:00
93ed6da4a3
mix: Switch prometheus_ex to fix/elixir-1.14 branch
2022-09-03 03:58:22 +02:00
2f301bbb87
timeline_controller_test: Fix test name for elixir 1.14
2022-09-03 03:58:22 +02:00
6d148b6637
Use Websockex to replace websocket_client
2022-09-03 02:13:00 +02:00
0a05ebf789
Merge branch 'revert-01239456' into 'develop'
...
Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'"
See merge request pleroma/pleroma!3742
2022-09-02 23:58:02 +00:00
b439e91f57
Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'"
...
This reverts merge request !3649
2022-09-02 22:35:40 +00:00
e22a772240
Merge branch 'weblate' into 'develop'
...
Translations update from Pleroma Weblate
See merge request pleroma/pleroma!3735
2022-09-02 22:10:44 +00:00
21ab7369ca
Bump minimum Elixir version to 1.10
...
With the release of Elixir 1.14, Elixir 1.9 is now end-of-life.
Elixir 1.10 Release Notes:
https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
2022-09-02 22:53:54 +02:00
0d8c6b0488
Translated using Weblate (Dutch)
...
Currently translated at 63.8% (30 of 47 strings)
Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/nl/
2022-09-02 19:18:40 +00:00
9af5da6666
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (83 of 83 strings)
Translation: Pleroma/Pleroma Backend (domain static_pages)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-static_pages/nl/
2022-09-02 19:18:40 +00:00
425fbce7be
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/nl/
2022-09-02 19:18:40 +00:00
a6195c7127
Added translation using Weblate (Dutch)
2022-09-02 19:18:40 +00:00
e949378476
Added translation using Weblate (Dutch)
2022-09-02 19:18:40 +00:00
01239456a1
Merge branch 'rewrite/integration-test-websocket-client' into 'develop'
...
Rewrite integration-test websocket client with Mint.WebSocket, closes #2812
Closes #2812
See merge request pleroma/pleroma!3649
2022-09-02 19:18:22 +00:00
c32e28e1b0
Fix SideEffectsTest
2022-09-01 07:33:58 -04:00
20a0dd6516
Exclude Announce instead of restricting to Create in visibility_tags
2022-08-31 22:14:54 -04:00
ffd379456b
Do not stream out Announces to public timelines
2022-08-31 15:57:06 -04:00
f9b86c3c22
Make local-only posts stream in local timeline
2022-08-27 19:34:56 -04:00
3afa1903ee
Do not stream out Create of ChatMessage
2022-08-27 17:51:41 -04:00
f2b433f5e0
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-08-27 11:32:59 -05:00
497cd5d5da
Merge branch 'fix/fedi-fe-build-url' into 'develop'
...
Fix fedi-fe build URL, addresses #2920
See merge request pleroma/pleroma!3736
2022-08-27 01:13:03 +00:00
a546e6f042
Merge branch 'feature/emoji-15-support' into 'develop'
...
emoji-test: update to latest 15.0 draft
See merge request pleroma/pleroma!3726
2022-08-27 00:59:22 +00:00
780fb4514d
Merge branch 'from/upstream-develop/tusooa/static-page-styles' into 'develop'
...
Improve static page style
See merge request pleroma/pleroma!3729
2022-08-27 00:58:18 +00:00
6e488c0fcc
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-08-25 22:45:03 -05:00
84a573877a
Merge branch 'fix_erratic_tests' into 'develop'
...
Fix flaky rate_limiter_test.exs test "it restricts based on config values"
See merge request pleroma/pleroma!3688
2022-08-25 18:39:38 +00:00
Your New SJW Waifu
Haelwenn
weblate-extractor
tusooa
marcin mikołajczak
Hélène
Haelwenn (lanodan) Monnier
Fristi