Alex Gleason
|
4f57e85ab9
|
Email blacklist: Update phrasing again
|
4 years ago |
|
Alex Gleason
|
058daf498f
|
Email blacklist: Update response phrasing
|
4 years ago |
|
lain
|
de3bdc63ad
|
AccountControllerTest: Add test for message returned.
|
4 years ago |
|
Ivan Tashkinov
|
27b0a8b155
|
[#1985] Prevented force login on registration if account approval and/or email confirmation needed.
Refactored login code in OAuthController, reused in AccountController. Added tests.
|
4 years ago |
|
Haelwenn
|
87fe31fb5c
|
Merge branch '1993-confirm-users-on-registration' into 'develop'
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
|
4 years ago |
|
Alex Gleason
|
00d090004e
|
:show_reactions, refactor the other test
|
4 years ago |
|
Alex Gleason
|
d8a01c9432
|
Merge remote-tracking branch 'upstream/develop' into hide-reactions
|
4 years ago |
|
lain
|
d9bf2c58df
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
|
4 years ago |
|
lain
|
c25c21dd22
|
AccountController: Don't explicitly ask to keep users unconfirmed.
Confirmation is set in User.register_changeset based on the config
settings.
|
4 years ago |
|
Alex Gleason
|
3b7c454418
|
Let favourites and emoji reactions optionally be hidden
|
4 years ago |
|
Alex Gleason
|
f688c8df82
|
Fix User.registration_reason HTML sanitizing issues
|
4 years ago |
|
Alex Gleason
|
f43518eb74
|
Lint, fix test
|
4 years ago |
|
Alex Gleason
|
6931dbfa58
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
4 years ago |
|
Mark Felder
|
4bfad0b483
|
Support blocking via query parameters as well and document the change.
|
4 years ago |
|
Egor Kislitsyn
|
bdb3375933
|
Allow unblocking a domain via query params
|
4 years ago |
|
Alex Gleason
|
48f8b26c92
|
OpenAPI: Add :id to follower/following endpoints, fixes #1958
|
4 years ago |
|
Alex Gleason
|
9ce95fa68f
|
Use `approval_required` in /api/v1/instance
|
4 years ago |
|
rinpatch
|
0fe36b311c
|
Merge branch 'features/mrf-reasons' into 'develop'
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
d29b8997f4
|
MastoAPI: fix & test giving MRF reject reasons
|
4 years ago |
|
Alex Gleason
|
48983e9421
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
4 years ago |
|
Alex Gleason
|
5ddf0415c4
|
Accept `reason` in POST /api/v1/accounts and store in DB
|
4 years ago |
|
feld
|
8f9ee694ed
|
Merge branch 'features/profile-fields-emojo' into 'develop'
user: Add support for custom emojis in profile fields
See merge request pleroma/pleroma!2741
|
4 years ago |
|
Alex Gleason
|
51ab8d0128
|
Add `account_approval_required` instance setting
|
4 years ago |
|
lain
|
b39eb6ecc5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
cc7153cd82
|
user: Add support for custom emojis in profile fields
|
4 years ago |
|
lain
|
8ca1f3e8c6
|
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
|
4 years ago |
|
Haelwenn
|
bdc7b60610
|
Merge branch '1925-muting-reblogs' into 'develop'
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
|
4 years ago |
|
lain
|
00e54f8fe7
|
ActivityPub: Remove `follow` and fix issues.
|
4 years ago |
|
lain
|
6335b32aa8
|
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
|
4 years ago |
|
lain
|
c0385cf47a
|
AccountController: Fix muting / unmuting reblogs.
|
4 years ago |
|
Ivan Tashkinov
|
3e08e77151
|
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
|
4 years ago |
|
lain
|
59cf78e412
|
AccountController: Allow removal / reset of user images.
|
4 years ago |
|
lain
|
74b88c0a8b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
4 years ago |
|
lain
|
cc8b4e48d9
|
InstanceView: Add chat limit, description limit
|
4 years ago |
|
lain
|
c2a052a346
|
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
|
4 years ago |
|
lain
|
d3efb50262
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
|
4 years ago |
|
lain
|
945e75c8e8
|
SearchController: Trim query.
|
4 years ago |
|
lain
|
e3b5559780
|
AccountController: Make setting accepts_chat_messages possible.
|
4 years ago |
|
Mark Felder
|
8121e46f25
|
Merge branch 'develop' into activation-meta
|
4 years ago |
|
lain
|
691742e62d
|
Revert "Merge branch 'avatar-removing' into 'develop'"
This reverts merge request !2701
|
4 years ago |
|
Mark Felder
|
5a8e0208b1
|
Add fields limits to instance metadata, add tests
|
4 years ago |
|
Egor Kislitsyn
|
3aa04b81c4
|
Test default "content-type" for CastAndValidate
|
4 years ago |
|
lain
|
e64d08439e
|
UpdateCredentialsTest: Add test for removing profile images.
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
244655e884
|
MastoAPI: Show source field when deleting
|
4 years ago |
|
lain
|
f378e93bf4
|
AccountController: Return scope in proper format.
|
4 years ago |
|
lain
|
59bdef0c33
|
Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
|
4 years ago |
|
rinpatch
|
c75ba63bef
|
Merge branch '1865-media-only' into 'develop'
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
|
4 years ago |
|
lain
|
7d542450b1
|
Merge branch 'develop' into '1865-media-only'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Sergey Suprunenko
|
b63646169d
|
Add support for bot field in update_credentials
|
4 years ago |
|
Ivan Tashkinov
|
5237a2df9f
|
[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
|
4 years ago |
