Alex Gleason [Thu, 23 Dec 2021 16:00:16 +0000 (16:00 +0000)]
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
Alex Gleason [Wed, 22 Dec 2021 16:37:35 +0000 (16:37 +0000)]
Merge branch 'moderators' into 'develop'
AdminAPI: let moderators actually do things
Closes #2490
See merge request pleroma/pleroma!3480
Alex Gleason [Wed, 22 Dec 2021 04:14:31 +0000 (04:14 +0000)]
Merge branch 'erratic-tests' into 'develop'
Skip erratic tests
See merge request pleroma/pleroma!3572
Alex Gleason [Wed, 22 Dec 2021 04:04:15 +0000 (22:04 -0600)]
Skip erratic tests
Alex Gleason [Sun, 19 Dec 2021 18:55:36 +0000 (12:55 -0600)]
Merge remote-tracking branch 'origin/develop' into moderators
Alex Gleason [Sun, 19 Dec 2021 18:51:41 +0000 (18:51 +0000)]
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
Alex Gleason [Sun, 19 Dec 2021 18:18:59 +0000 (18:18 +0000)]
Merge branch 'manifest' into 'develop'
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
Alex Gleason [Sun, 19 Dec 2021 17:36:25 +0000 (17:36 +0000)]
Merge branch 'replies-count' into 'develop'
Fix replies count for remote replies
See merge request pleroma/pleroma!3541
Alex Gleason [Sun, 19 Dec 2021 17:35:50 +0000 (17:35 +0000)]
Merge branch 'link-headers-chats' into 'develop'
Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562
Alex Gleason [Sun, 19 Dec 2021 17:35:14 +0000 (17:35 +0000)]
Merge branch 'live-dashboard' into 'develop'
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
Alex Gleason [Sun, 19 Dec 2021 17:33:10 +0000 (11:33 -0600)]
Merge remote-tracking branch 'origin/develop' into manifest
Alex Gleason [Sun, 19 Dec 2021 17:31:17 +0000 (17:31 +0000)]
Merge branch 'v2-suggestions' into 'develop'
V2 suggestions
See merge request pleroma/pleroma!3547
Alex Gleason [Sun, 19 Dec 2021 17:30:52 +0000 (17:30 +0000)]
Merge branch 'fix-search-dos' into 'develop'
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
lain [Sat, 18 Dec 2021 15:04:55 +0000 (15:04 +0000)]
Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
Bump alpine to 3.14
See merge request pleroma/pleroma!3569
Tusooa Zhu [Fri, 17 Dec 2021 23:00:29 +0000 (18:00 -0500)]
Bump alpine to 3.14
Tusooa Zhu [Fri, 17 Dec 2021 21:52:50 +0000 (16:52 -0500)]
Lint
Tusooa Zhu [Fri, 17 Dec 2021 21:47:48 +0000 (16:47 -0500)]
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
Tusooa Zhu [Fri, 17 Dec 2021 21:44:22 +0000 (16:44 -0500)]
Add test to ensure removed follower cease to have relationship with ex-followee
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
Tusooa Zhu [Fri, 17 Dec 2021 19:42:45 +0000 (14:42 -0500)]
Add test to ensure the blocked cease to have follow relationship to the blocker
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
Tusooa Zhu [Fri, 17 Dec 2021 19:17:51 +0000 (14:17 -0500)]
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
lain [Fri, 17 Dec 2021 14:35:01 +0000 (14:35 +0000)]
Merge branch 'verbose-emoji-loader' into 'develop'
emoji/loader.ex: be more verbose about which emoji pack config is loading now
See merge request pleroma/pleroma!3567
a1batross [Fri, 17 Dec 2021 14:15:44 +0000 (14:15 +0000)]
emoji/loader.ex: be more verbose about which emoji pack config is loading now
To avoid issue when one of the hundred JSON files is malformed and
administrator don't know which one
Alex Gleason [Thu, 16 Dec 2021 00:05:36 +0000 (19:05 -0500)]
Merge remote-tracking branch 'origin/develop' into live-dashboard
Alex Gleason [Wed, 15 Dec 2021 21:17:11 +0000 (16:17 -0500)]
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
lain [Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)]
Merge branch 'delete-account-fix' into 'develop'
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
Alex Gleason [Mon, 13 Dec 2021 21:15:33 +0000 (16:15 -0500)]
TwitterAPI: allow deleting one's own account with request body
Alex Gleason [Mon, 13 Dec 2021 04:50:07 +0000 (22:50 -0600)]
Search: limit number of results
marcin mikołajczak [Sun, 12 Dec 2021 16:43:18 +0000 (17:43 +0100)]
Add link headers in ChatController.index2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
lain [Thu, 9 Dec 2021 16:05:06 +0000 (16:05 +0000)]
Merge branch 'fix-attachment-dimensions' into 'develop'
Fix attachment dimensions
Closes #2794
See merge request pleroma/pleroma!3559
lain [Thu, 9 Dec 2021 15:38:26 +0000 (15:38 +0000)]
Merge branch 'benchmark-fixes' into 'develop'
Benchmarks: fix user timeline and tags benchmarks
See merge request pleroma/pleroma!3560
Alex Gleason [Wed, 8 Dec 2021 17:54:41 +0000 (11:54 -0600)]
Benchmarks: fix user timeline and tags benchmarks
Alex Gleason [Wed, 8 Dec 2021 02:55:54 +0000 (21:55 -0500)]
VideoHandlingTest: remove nil values
Haelwenn [Tue, 7 Dec 2021 22:53:36 +0000 (22:53 +0000)]
Apply alexgleason's suggestion(s) to 1 file(s)
Alex Gleason [Tue, 7 Dec 2021 18:41:54 +0000 (13:41 -0500)]
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
Alex Gleason [Tue, 7 Dec 2021 18:35:34 +0000 (13:35 -0500)]
Fix VideoHandlingTest
lain [Tue, 7 Dec 2021 18:19:43 +0000 (18:19 +0000)]
Merge branch 'fixyfix' into 'develop'
Linting.
See merge request pleroma/pleroma!3558
Alex Gleason [Tue, 7 Dec 2021 17:59:03 +0000 (12:59 -0500)]
AttachmentValidator: ingest width and height
Lain Soykaf [Tue, 7 Dec 2021 17:12:23 +0000 (12:12 -0500)]
Linting.
lain [Tue, 7 Dec 2021 16:55:01 +0000 (16:55 +0000)]
Merge branch 'pleroma-result-1_13' into 'develop'
move result into with guard
See merge request pleroma/pleroma!3557
lain [Tue, 7 Dec 2021 16:45:03 +0000 (16:45 +0000)]
Merge branch 'mix-lock' into 'develop'
Run `mix deps.get`
See merge request pleroma/pleroma!3556
Alex Gleason [Tue, 7 Dec 2021 15:03:31 +0000 (10:03 -0500)]
Run `mix deps.get`
Finn Behrens [Tue, 7 Dec 2021 08:18:53 +0000 (09:18 +0100)]
move result into with guard
Alex Gleason [Tue, 7 Dec 2021 06:10:47 +0000 (01:10 -0500)]
Transmogrifier: test fix_attachments/1
lain [Mon, 6 Dec 2021 21:16:30 +0000 (21:16 +0000)]
Merge branch 'benchmark' into 'develop'
Fix benchmarks
See merge request pleroma/pleroma!3551
lain [Mon, 6 Dec 2021 19:55:52 +0000 (19:55 +0000)]
Merge branch 'optimisation/deactivated-subquery' into 'develop'
Make deactivated user check into a subquery
Closes #2792
See merge request pleroma/pleroma!3554
FloatingGhost [Mon, 6 Dec 2021 11:50:51 +0000 (11:50 +0000)]
make linter happy
FloatingGhost [Mon, 6 Dec 2021 11:44:17 +0000 (11:44 +0000)]
Make deactivated user check into a subquery
Fixes #2792
Alex Gleason [Fri, 3 Dec 2021 21:20:54 +0000 (16:20 -0500)]
Fix benchmarks
lain [Fri, 3 Dec 2021 15:13:10 +0000 (15:13 +0000)]
Merge branch 'password-reset' into 'develop'
Restore POST /auth/password, fixes #2789
Closes #2789
See merge request pleroma/pleroma!3550
Alex Gleason [Fri, 3 Dec 2021 13:56:26 +0000 (07:56 -0600)]
Fix frontend_status_plug_test.exs
Alex Gleason [Fri, 3 Dec 2021 06:11:38 +0000 (00:11 -0600)]
Merge remote-tracking branch 'origin/develop' into password-reset
Alex Gleason [Fri, 3 Dec 2021 06:02:49 +0000 (00:02 -0600)]
Restore POST /auth/password
lain [Thu, 2 Dec 2021 16:54:28 +0000 (16:54 +0000)]
Merge branch 'fix/2782-nodeinfo-active-users' into 'develop'
nodeinfo: report activeMonth and activeHalfyear users fields
Closes #2782
See merge request pleroma/pleroma!3536
lain [Wed, 1 Dec 2021 15:49:57 +0000 (15:49 +0000)]
Merge branch 'update-hackney' into 'develop'
Mix: upgrade Hackney to 1.18.0
Closes #2753
See merge request pleroma/pleroma!3549
lain [Mon, 29 Nov 2021 18:08:10 +0000 (18:08 +0000)]
Merge branch 'force_pinned_objects_to_be_empty' into 'develop'
Force pinned_objects to be empty, not null
Closes #2788
See merge request pleroma/pleroma!3548
NEETzsche [Mon, 29 Nov 2021 18:08:09 +0000 (18:08 +0000)]
Force pinned_objects to be empty, not null
a1batross [Mon, 29 Nov 2021 17:28:10 +0000 (17:28 +0000)]
Mix: upgrade Hackney to 1.18.0
Alex Gleason [Sat, 27 Nov 2021 05:10:01 +0000 (23:10 -0600)]
v2 Suggestions: return `is_suggested` through the API
Alex Gleason [Sat, 27 Nov 2021 04:45:49 +0000 (22:45 -0600)]
Instance: add v2_suggestions feature
Alex Gleason [Sat, 27 Nov 2021 03:42:28 +0000 (21:42 -0600)]
v2 Suggestions: also filter out users you follow
Alex Gleason [Sat, 27 Nov 2021 03:02:14 +0000 (21:02 -0600)]
v2 Suggestions: actually flter out dismissed suggestions
Alex Gleason [Sat, 27 Nov 2021 02:19:29 +0000 (20:19 -0600)]
v2 Suggestions: dismiss a suggestion
Alex Gleason [Fri, 26 Nov 2021 21:32:01 +0000 (15:32 -0600)]
v2 Suggestions: add index on is_suggested column
Alex Gleason [Fri, 26 Nov 2021 21:19:01 +0000 (15:19 -0600)]
AdminAPI: suggest a user through the API
Alex Gleason [Fri, 26 Nov 2021 20:46:29 +0000 (14:46 -0600)]
v2 Suggestions: don't skip visibility check
Alex Gleason [Fri, 26 Nov 2021 20:33:27 +0000 (14:33 -0600)]
v2 Suggestions: rudimentary API response
Alex Gleason [Thu, 25 Nov 2021 20:57:36 +0000 (14:57 -0600)]
v2 Suggestions: return empty array
Alex Gleason [Wed, 24 Nov 2021 23:58:58 +0000 (17:58 -0600)]
Merge remote-tracking branch 'pleroma/develop' into manifest
Alex Gleason [Wed, 24 Nov 2021 22:45:05 +0000 (16:45 -0600)]
Expose /manifest.json for PWA
marcin mikołajczak [Tue, 23 Nov 2021 10:31:09 +0000 (11:31 +0100)]
Fix replies count for remote replies
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Alibek Omarov [Tue, 16 Nov 2021 23:39:10 +0000 (00:39 +0100)]
Add changelog entry
Haelwenn [Tue, 16 Nov 2021 13:54:34 +0000 (13:54 +0000)]
Merge branch 'bugfix/markdown-newlines' into 'develop'
mix: Update earmark
See merge request pleroma/pleroma!3538
Haelwenn (lanodan) Monnier [Tue, 16 Nov 2021 13:32:49 +0000 (14:32 +0100)]
mix: Update earmark
This should fix the presence of extraneous newlines in markdown output.
Related: https://github.com/pragdave/earmark/issues/406
lain [Mon, 15 Nov 2021 20:17:38 +0000 (20:17 +0000)]
Merge branch 'update-elixir' into 'develop'
CI: Upload the image for all platforms
See merge request pleroma/pleroma!3537
Lain Soykaf [Mon, 15 Nov 2021 20:04:43 +0000 (21:04 +0100)]
CI: Upload the image for all platforms
For some reason the other platforms started failing, too. This
fixes it. Why? Don't know.
Alibek Omarov [Mon, 15 Nov 2021 15:58:25 +0000 (16:58 +0100)]
nodeinfo: report activeMonth and activeHalfyear users fields
lain [Mon, 15 Nov 2021 14:31:27 +0000 (14:31 +0000)]
Merge branch 'fix-tests' into 'develop'
Test fixes
See merge request pleroma/pleroma!3532
lain [Mon, 15 Nov 2021 14:27:59 +0000 (14:27 +0000)]
Merge branch 'block-behavior' into 'develop'
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
lain [Mon, 15 Nov 2021 14:24:13 +0000 (14:24 +0000)]
Merge branch 'instance-deletion' into 'develop'
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
lain [Mon, 15 Nov 2021 13:21:42 +0000 (13:21 +0000)]
Merge branch 'fix-object-deletion-timeout' into 'develop'
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
Closes #2704
See merge request pleroma/pleroma!3479
lain [Mon, 15 Nov 2021 11:58:49 +0000 (11:58 +0000)]
Merge branch 'bump/http_signatures-0.1.1' into 'develop'
mix: Update http_signatures to 0.1.1
See merge request pleroma/pleroma!3530
lain [Mon, 15 Nov 2021 10:48:56 +0000 (10:48 +0000)]
Merge branch 'userfeed-fe-fallback' into 'develop'
UserController: fall back to frontend when user isn't found
Closes #2730
See merge request pleroma/pleroma!3515
lain [Sun, 14 Nov 2021 20:35:10 +0000 (20:35 +0000)]
Merge branch 'fix-releases' into 'develop'
CI: Conservatively update release images so they keep building.
See merge request pleroma/pleroma!3534
Lain Soykaf [Sun, 14 Nov 2021 19:37:32 +0000 (20:37 +0100)]
CI: Conservatively update release images so they keep building.
lain [Sun, 14 Nov 2021 16:14:09 +0000 (16:14 +0000)]
Merge branch 'bugfix/inbox-misleading-warning' into 'develop'
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback
See merge request pleroma/pleroma!3531
lain [Sun, 14 Nov 2021 16:00:01 +0000 (16:00 +0000)]
Merge branch 'update-crypt' into 'develop'
Mix: Update crypt to fix musl builds.
See merge request pleroma/pleroma!3533
Lain Soykaf [Sun, 14 Nov 2021 15:04:08 +0000 (16:04 +0100)]
Mix: Update crypt to fix musl builds.
Lain Soykaf [Sun, 14 Nov 2021 10:45:38 +0000 (11:45 +0100)]
MediaProxyCacheControllerTest: Fix unstable tests.
Cachex order isn't stable, so we can not depend on the order in
tests. This adds some sorting to make the tests stable.
Lain Soykaf [Sun, 14 Nov 2021 10:44:24 +0000 (11:44 +0100)]
StealEmojiPolicyTest: Make mocks explicit.
Lain Soykaf [Sun, 14 Nov 2021 10:43:39 +0000 (11:43 +0100)]
Mix: Upgrade mogrify library
The old library would modify a file on reading it, the new one
doesn't have this issue.
Haelwenn (lanodan) Monnier [Tue, 9 Nov 2021 23:37:27 +0000 (00:37 +0100)]
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback
Haelwenn (lanodan) Monnier [Tue, 9 Nov 2021 23:53:32 +0000 (00:53 +0100)]
mix: Update http_signatures to 0.1.1
Haelwenn [Sun, 10 Oct 2021 08:57:11 +0000 (08:57 +0000)]
Merge branch 'refactor/group_validator_fields' into 'develop'
object_validators: Group common fields in CommonValidations
See merge request pleroma/pleroma!3384
Haelwenn (lanodan) Monnier [Thu, 1 Apr 2021 11:26:32 +0000 (13:26 +0200)]
object_validators: Group common fields in CommonValidations
Notes:
- QuestionValidator didn't have a :name field but that seems like a mistake
- `_fields` functions can't inherit others because of some Validators
- bto/bcc fields were absent in activities, also seems like a mistake
(Well IIRC we don't or barely support bto/bcc anyway)
feld [Thu, 7 Oct 2021 20:02:41 +0000 (20:02 +0000)]
Merge branch 'typo' into 'develop'
Fix typo
See merge request pleroma/pleroma!3528
Mark Felder [Wed, 6 Oct 2021 15:49:25 +0000 (10:49 -0500)]
Fix typo
Haelwenn [Wed, 6 Oct 2021 06:26:55 +0000 (06:26 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3513
Ryo Ueno [Sat, 18 Sep 2021 09:24:15 +0000 (09:24 +0000)]
Translated using Weblate (Japanese)
Currently translated at 21.6% (23 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/ja/
Ryo Ueno [Sat, 18 Sep 2021 09:07:55 +0000 (09:07 +0000)]
Added translation using Weblate (Japanese)
Hồ Nhất Duy [Mon, 6 Sep 2021 11:13:59 +0000 (11:13 +0000)]
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/vi/
projects / akkoma / log