Alex Gleason
33f1b29b2c
AdminAPI: Filter users by `need_approval`
pirms 4 gadiem
Alex Gleason
b750129da1
AdminAPI: Return `approval_pending` with users
pirms 4 gadiem
Alex Gleason
a1570ba6ad
AdminAPI: Return `registration_reason` with users
pirms 4 gadiem
Alex Gleason
5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
pirms 4 gadiem
Alex Gleason
bcfd38c8f3
Make a user unapproved when registering with `account_approval_required` on
pirms 4 gadiem
Alex Gleason
e4e5577818
Prevent unapproved users from logging in
pirms 4 gadiem
Alex Gleason
51ab8d0128
Add `account_approval_required` instance setting
pirms 4 gadiem
Alex Gleason
a62f17da17
Add `approval_pending` field to User
pirms 4 gadiem
lain
11dd29ef3f
Merge branch 'feature/upload-filter-exiftool' into 'develop'
Add Pleroma.Upload.Filter.Exiftool
Closes #1935
See merge request pleroma/pleroma!2744
pirms 4 gadiem
lain
c409a064ba
Merge branch 'patch-3' into 'develop'
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths
See merge request pleroma/pleroma!2752
pirms 4 gadiem
Alibek Omarov
d885540590
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths
pirms 4 gadiem
Mark Felder
b329f05ed6
Remove unused @types
pirms 4 gadiem
Mark Felder
9e45672674
Add a moduledoc
pirms 4 gadiem
Mark Felder
6167593881
Support Exiftool for stripping EXIF data
We really only want to strip location data anyway, and mogrify strips color profiles.
pirms 4 gadiem
feld
d6f67fa91b
Merge branch 'issue/1790-updated-oban' into 'develop'
[#1790 ] updated oban to 2.0.0
See merge request pleroma/pleroma!2674
pirms 4 gadiem
feld
167a619432
Merge branch 'fix/1924-s3-descriptions' into 'develop'
docs and descriptions for s3 settings
Closes #1924
See merge request pleroma/pleroma!2745
pirms 4 gadiem
feld
76f5f61713
Merge branch 'chore/should-document-that' into 'develop'
Probably worth documenting the MediaProxy fix
See merge request pleroma/pleroma!2750
pirms 4 gadiem
Mark Felder
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
pirms 4 gadiem
Mark Felder
d7a37fddd1
Switch to the official Oban 2.0.0 release
pirms 4 gadiem
Mark Felder
0517d3252e
Probably worth documenting the MediaProxy fix
pirms 4 gadiem
feld
ce9514000d
Merge branch 'proxy-range-and-chunk' into 'develop'
ReverseProxy: Streaming and disable encoding if Range
Closes #1860 and #1823
See merge request pleroma/pleroma!2749
pirms 4 gadiem
Mark Felder
72b3dbf4d1
Credo line length complaint
pirms 4 gadiem
href
a1dace088c
ReverseProxy: Streaming and disable encoding if Range
Fixes #1823
Fixes #1860
pirms 4 gadiem
lain
fba1ee7d7b
Merge branch 'chat-federation-information' into 'develop'
Add an `accepts_chat_messages` to user, expose in api and federation
See merge request pleroma/pleroma!2716
pirms 4 gadiem
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
pirms 4 gadiem
lain
8aa7143f46
Merge branch 'bump-fe-2020-07-10' into 'develop'
Update frontend
See merge request pleroma/pleroma!2747
pirms 4 gadiem
lain
328062308a
Update frontend
pirms 4 gadiem
Haelwenn
31a0ed5d01
Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
Closes admin-fe#107 and #1788
See merge request pleroma/pleroma!2554
pirms 4 gadiem
lain
48f98a2748
Merge branch 'mix-tasks-improvement' into 'develop'
Mix tasks improvement
See merge request pleroma/pleroma!2723
pirms 4 gadiem
lain
4d809144d8
Merge branch 'cluster-test-ci' into 'develop'
RE-enable cluster tests on CI
See merge request pleroma/pleroma!2743
pirms 4 gadiem
Haelwenn
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
pirms 4 gadiem
Haelwenn
5ea6387572
Merge branch 'user-search-nickname-rank-boost' into 'develop'
Improved search results for localized nickname match
See merge request pleroma/pleroma!2733
pirms 4 gadiem
Haelwenn
8743df5193
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2739
pirms 4 gadiem
Ben Is
b6de9b1987
Translated using Weblate (Italian)
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
pirms 4 gadiem
Ben Is
11c9654a32
Translated using Weblate (Polish)
Currently translated at 66.0% (70 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
pirms 4 gadiem
Haelwenn
77c4c60e55
Merge branch 'prometheus-update' into 'develop'
prometheus update for OTP 23
See merge request pleroma/pleroma!2746
pirms 4 gadiem
Alexander Strizhakov
b6688030fa
prometheus update for OTP 23
pirms 4 gadiem
Alexander Strizhakov
b1b8f5f11a
docs and descriptions for s3 settings
pirms 4 gadiem
stwf
08211eff22
Re-enable the federated tests, increase timeout
pirms 4 gadiem
feld
4301ae3861
Merge branch 'feature/add-adminfe-url-to-report-mails' into 'develop'
Add AdminFE reports URL to report emails
Closes #1926
See merge request pleroma/pleroma!2742
pirms 4 gadiem
Mark Felder
2b979cc90c
Add AdminFE reports URL to report emails
pirms 4 gadiem
Alexander Strizhakov
79707e879d
cleap up
pirms 4 gadiem
feld
4db6678429
Merge branch 'chore/use-the-alias' into 'develop'
Use the Pleroma.Config alias
See merge request pleroma/pleroma!2740
pirms 4 gadiem
Alexander Strizhakov
d5fcec8315
fix for info after tag/untag user
pirms 4 gadiem
Alexander Strizhakov
c2edfd16e0
fix for user revoke invite task
pirms 4 gadiem
Mark Felder
d23804f191
Use the Pleroma.Config alias
pirms 4 gadiem
feld
6b14f0c514
Merge branch 'fix/csp-for-captcha' into 'develop'
Add Captcha endpoint to CSP headers when MediaProxy is enabled.
See merge request pleroma/pleroma!2718
pirms 4 gadiem
Mark Felder
49c4e24953
Merge branch 'develop' into fix/csp-for-captcha
pirms 4 gadiem
lain
8ca1f3e8c6
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
pirms 4 gadiem
lain
f4469dc741
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
pirms 4 gadiem