aboutsummaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
AgeCommit message (Collapse)Author
2020-07-31[#1985] Prevented force login on registration if account approval and/or ↵Ivan Tashkinov
email confirmation needed. Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-30Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn
AccountController: Don't explicitly ask to keep users unconfirmed. Closes #1993 See merge request pleroma/pleroma!2809
2020-07-29:show_reactions, refactor the other testAlex Gleason
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1993-confirm-users-on-registration
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
Confirmation is set in User.register_changeset based on the config settings.
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-27Fix User.registration_reason HTML sanitizing issuesAlex Gleason
2020-07-27Lint, fix testAlex Gleason
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-23Merge branch 'unblock-domain-via-query' into 'develop'feld
Allow unblocking a domain via query params Closes #1971 See merge request pleroma/pleroma!2783
2020-07-23Support blocking via query parameters as well and document the change.Mark Felder
2020-07-23Merge branch '1976-status-view-fixes' into 'develop'Haelwenn
StatusView: Handle badly formatted emoji reactions. Closes #1976 See merge request pleroma/pleroma!2788
2020-07-23[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.Ivan Tashkinov
2020-07-22[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish ↵Ivan Tashkinov
:restrict_unauthenticated. Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22StatusView: Handle badly formatted emoji reactions.Lain Soykaf
2020-07-21Allow unblocking a domain via query paramsEgor Kislitsyn
2020-07-17OpenAPI: Add :id to follower/following endpoints, fixes #1958Alex Gleason
2020-07-15Use `approval_required` in /api/v1/instanceAlex Gleason
2020-07-15Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-07-15Merge branch 'features/mrf-reasons' into 'develop'rinpatch
Add rejection reason to our MRFs See merge request pleroma/pleroma!2759
2020-07-15MastoAPI: fix & test giving MRF reject reasonsHaelwenn (lanodan) Monnier
2020-07-14Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-14Accept `reason` in POST /api/v1/accounts and store in DBAlex Gleason
2020-07-13Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-07-13Merge branch 'features/profile-fields-emojo' into 'develop'feld
user: Add support for custom emojis in profile fields See merge request pleroma/pleroma!2741
2020-07-12Add `account_approval_required` instance settingAlex Gleason
2020-07-10Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
chat-federation-information
2020-07-09user: Add support for custom emojis in profile fieldsHaelwenn (lanodan) Monnier
2020-07-09Merge branch '1723-token-fixes' into 'develop'lain
AccountController: Return scope in proper format. Closes #1723 See merge request pleroma/pleroma!2694
2020-07-09Merge branch 'features/favicons' into 'develop'lain
Add support for remote favicons See merge request pleroma/pleroma!2261
2020-07-09Merge branch '1925-muting-reblogs' into 'develop'Haelwenn
AccountController: Fix muting / unmuting reblogs. Closes #1925 See merge request pleroma/pleroma!2732
2020-07-08ActivityPub: Remove `follow` and fix issues.lain
2020-07-08CommonAPI: Switch to pipeline for following.lain
2020-07-08Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'lain
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731
2020-07-08AccountController: Fix muting / unmuting reblogs.lain
2020-07-08Add [:instances_favicons, :enabled] setting, defaults to falseHaelwenn (lanodan) Monnier
2020-07-08Move get_favicon to Pleroma.Instances, use /Haelwenn (lanodan) Monnier
2020-07-08Add support for remote faviconsHaelwenn (lanodan) Monnier
2020-07-07[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance ↵Ivan Tashkinov
setting.
2020-07-07AccountController: Allow removal / reset of user images.lain
2020-07-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
chat-federation-information
2020-07-06InstanceView: Add chat limit, description limitlain
2020-07-03Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'lain
MastoAPI 2.9.0: status text on deletion See merge request pleroma/pleroma!2690
2020-07-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/mastoapi-2.9.0-status_text
2020-07-03SearchController: Trim query.lain
2020-07-03AccountController: Make setting accepts_chat_messages possible.lain
2020-07-03AccountViewTest: Fix test.lain
2020-07-03AccountView: Add 'accepts_chat_messages' to view.lain
2020-07-02Merge branch 'develop' into activation-metaMark Felder