66b60f1ee2
move result into with guard
3 years ago
2ac3d341b0
Fix benchmarks
3 years ago
0fab887eee
make linter happy
3 years ago
429407ba0a
Make deactivated user check into a subquery
...
Fixes #2792
3 years ago
6a6260f64e
re-enable deactivated check
3 years ago
b63dd6a5a2
don't track vmargs
3 years ago
f8d97a07b9
remove vmargs
3 years ago
ca2bd8b72b
remove deactivated_users call
3 years ago
6f86baf491
update adminfe
3 years ago
bb54720778
add debug
3 years ago
c85b278f1e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
5c573a8a28
Merge branch 'password-reset' into 'develop'
...
Restore POST /auth/password, fixes #2789
Closes #2789
See merge request pleroma/pleroma!3550
3 years ago
ba2ed3c255
Fix frontend_status_plug_test.exs
3 years ago
8286ceb465
Merge remote-tracking branch 'origin/develop' into password-reset
3 years ago
5da4f33bf1
Restore POST /auth/password
3 years ago
235c4139d7
Merge branch 'fix/2782-nodeinfo-active-users' into 'develop'
...
nodeinfo: report activeMonth and activeHalfyear users fields
Closes #2782
See merge request pleroma/pleroma!3536
3 years ago
aaed93db27
Merge branch 'update-hackney' into 'develop'
...
Mix: upgrade Hackney to 1.18.0
Closes #2753
See merge request pleroma/pleroma!3549
3 years ago
d486d7d09e
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
3 years ago
182c563ed0
Force pinned_objects to be empty, not null
3 years ago
809503011f
Mix: upgrade Hackney to 1.18.0
3 years ago
a61207cf8f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
efc28812b8
Add changelog entry
3 years ago
c97f99ccf2
Merge branch 'bugfix/markdown-newlines' into 'develop'
...
mix: Update earmark
See merge request pleroma/pleroma!3538
3 years ago
5e15ceb49d
mix: Update earmark
...
This should fix the presence of extraneous newlines in markdown output.
Related: https://github.com/pragdave/earmark/issues/406
3 years ago
add2b9cd8d
Merge branch 'update-elixir' into 'develop'
...
CI: Upload the image for all platforms
See merge request pleroma/pleroma!3537
3 years ago
f78cb6ab9a
CI: Upload the image for all platforms
...
For some reason the other platforms started failing, too. This
fixes it. Why? Don't know.
3 years ago
04aca335aa
nodeinfo: report activeMonth and activeHalfyear users fields
3 years ago
4d341f51e1
Merge branch 'fix-tests' into 'develop'
...
Test fixes
See merge request pleroma/pleroma!3532
3 years ago
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
3 years ago
6e3df11693
Merge branch 'instance-deletion' into 'develop'
...
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
3 years ago
6aff3d3204
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
3 years ago
838da53ea7
Merge branch 'bump/http_signatures-0.1.1' into 'develop'
...
mix: Update http_signatures to 0.1.1
See merge request pleroma/pleroma!3530
3 years ago
bd77243981
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
3 years ago
d058e1c978
Merge branch 'fix-releases' into 'develop'
...
CI: Conservatively update release images so they keep building.
See merge request pleroma/pleroma!3534
3 years ago
5c7aa4a1e9
CI: Conservatively update release images so they keep building.
3 years ago
0f8b10ff5a
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
3 years ago
eb0f7620f2
Merge branch 'update-crypt' into 'develop'
...
Mix: Update crypt to fix musl builds.
See merge request pleroma/pleroma!3533
3 years ago
7dcc73f294
Mix: Update crypt to fix musl builds.
3 years ago
871936b3ca
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.
3 years ago
2dea4a8c04
StealEmojiPolicyTest: Make mocks explicit.
3 years ago
26450a0be3
Mix: Upgrade mogrify library
...
The old library would modify a file on reading it, the new one
doesn't have this issue.
3 years ago
23e91ec8dd
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback
3 years ago
e4ad4f0bd6
mix: Update http_signatures to 0.1.1
3 years ago
eb1c7d75f4
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
6b5c2d5f86
Merge branch 'refactor/group_validator_fields' into 'develop'
...
object_validators: Group common fields in CommonValidations
See merge request pleroma/pleroma!3384
3 years ago
23161526d4
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)
3 years ago
d8d819ddc7
Merge branch 'typo' into 'develop'
...
Fix typo
See merge request pleroma/pleroma!3528
3 years ago
3af7db9fd7
Fix typo
3 years ago
fee2260633
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3513
3 years ago
5f2aefee1b
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/
3 years ago
Finn Behrens