aboutsummaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
AgeCommit message (Collapse)Author
2020-10-13tests consistencyAlexander Strizhakov
2020-09-22Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason
2020-09-21Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> ↵Alex Gleason
empty_json_response()
2020-09-21ActivityPub: Don't block-filter your own postslain
We are filtering out replies to people you block, but that should not include your own posts.
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream # Conflicts: # CHANGELOG.md
2020-09-17User search respect discoverable flagstwf
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream
2020-09-15fixed testsMaksim Pechnikov
2020-09-11Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxyIvan Tashkinov
# Conflicts: # lib/pleroma/instances/instance.ex
2020-09-10configurable lifetime for ephemeral activitiesAlexander Strizhakov
2020-09-10pin/unpin for activities with expires_at optionAlexander Strizhakov
2020-09-10schedule activity expiration in ObanAlexander Strizhakov
2020-09-09[#2497] Added missing alias, removed legacy `:adapter` option specification ↵Ivan Tashkinov
for HTTP.get/_.
2020-09-09Merge branch 'develop' into media-preview-proxyMark Felder
2020-09-08Remove OStatus in testsuiteHaelwenn (lanodan) Monnier
2020-09-08account_view_test: Remove empty testHaelwenn (lanodan) Monnier
2020-09-08Disable favicon scraping in testsrinpatch
2020-09-08Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-07passing adapter options directly without adapter keyAlexander Strizhakov
2020-09-05Rich Media: Do not cache URLs for preview statusesrinpatch
Closes #1987
2020-09-05[#2497] Made media preview proxy fall back to media proxy instead of to ↵Ivan Tashkinov
source url. Adjusted tests. Refactoring.
2020-09-02Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-02Disallow password resets for deactivated accounts.Mark Felder
Ensure all responses to password reset events are identical.
2020-09-01Fix removing an account from a listHaelwenn (lanodan) Monnier
Mastodon (Frontend) changed a different method for deletes, keeping old format as mastodon documentation is too loose
2020-08-26TimelineController: Keys are atoms now.lain
Closes #2078 Closes #2070
2020-08-25Merge branch 'feature/1952-read-muted-notifications' into 'develop'feld
Automatically mark notifications about statuses from muted users and threads as read Closes #1952 See merge request pleroma/pleroma!2893
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier
2020-08-15[#2046] Added test for pleroma/restrict_unauthenticated defaults on private ↵Ivan Tashkinov
instance. Updated docs and changelog.
2020-08-15Mark notifications about statuses from muted users as read automaticallySergey Suprunenko
2020-08-10AccountController: Build the correct update activity.lain
Will fix federation issues.
2020-08-07Merge branch 'features/poll-validation' into 'develop'lain
Poll and votes pipeline ingestion Closes #1362 and #1852 See merge request pleroma/pleroma!2635
2020-08-05changelog for filter whole_word fixMary Kate
2020-08-05update test for whole_word in filterMary Kate
2020-08-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/poll-validation
2020-08-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/poll-validation
2020-08-04MastodonAPITest: Do the needfullain
2020-08-03Email blacklist: Update phrasing againAlex Gleason
2020-08-03Email blacklist: Update response phrasingAlex Gleason
2020-08-03AccountControllerTest: Add test for message returned.lain
2020-07-31Merge remote-tracking branch 'pleroma/develop' into features/poll-validationHaelwenn (lanodan) Monnier
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