aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-09-17Merge branch 'instance-docs' into 'develop'feld
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API Closes #1516 See merge request pleroma/pleroma!2931
2020-09-17Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch
Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982
2020-09-17Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn
Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992
2020-09-17Merge branch 'reply-visibility-user-guard' into 'develop'lain
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user See merge request pleroma/pleroma!2999
2020-09-17Merge branch 'bugfix/mrf-ingestion' into 'develop'rinpatch
Bugfix: MRF and Pipeline Ingestion See merge request pleroma/secteam/pleroma!15
2020-09-17adapt to new user factory behaviorstwf
2020-09-17add test and changelog entrystwf
2020-09-17User search respect discoverable flagstwf
2020-09-17Merge branch 'feat/rich-media-head' into 'develop'rinpatch
RichMedia: Do a HEAD request to check content type/length See merge request pleroma/pleroma!2995
2020-09-17Deny ConfigDB migration when deprecated settings foundMark Felder
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream
2020-09-17[#2497] Configurability of :min_content_length (preview proxy). Refactoring, ↵Ivan Tashkinov
documentation, tests.
2020-09-17Merge branch 'develop' into 'nondiscoverable-user-metadata'lain
# Conflicts: # CHANGELOG.md
2020-09-17Return the file content for `GET ↵eugenijm
/api/pleroma/admin/instance_document/:document_name`
2020-09-17AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin APIeugenijm
2020-09-17AdminAPI Chat tests: Remove factory.lain
The factory system doesn't work too well with how the chats are done. Instead of tempting people to use it, let's rather use the CommonAPI system for now.
2020-09-17Admin chat api tests: Small additions.lain
2020-09-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-chat-moderation
2020-09-17Merge branch 'develop' into issue/2099Maksim Pechnikov
2020-09-16Remove unused importMark Felder
2020-09-16User: Remote users don't need to be confirmed or approvedlain
2020-09-16Merge branch 'chores/mrf-loglevel' into 'develop'rinpatch
Fetcher: Correctly return MRF reject reason See merge request pleroma/pleroma!2990
2020-09-16Merge branch 'features/validators-video' into 'develop'rinpatch
Pipeline Ingestion: Video and Article See merge request pleroma/pleroma!2908
2020-09-16Merge branch 'issue/2089' into 'develop'lain
[#2089] fix notifications See merge request pleroma/pleroma!3000
2020-09-16RepoStreamer.chunk_stream -> Repo.chunk_streamMaksim Pechnikov
2020-09-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream
2020-09-15fixed testsMaksim Pechnikov
2020-09-15Mastodon API: fix the public timeline returning an error when the ↵eugenijm
`reply_visibility` parameter is set to `self` for an unauthenticated user
2020-09-15Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn
Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992
2020-09-14fix credo warningstwf
2020-09-14search indexing metadata respects discoverable flagstwf
2020-09-14Validate Welcome Chat message works with Simple policy applied to local instanceMark Felder
2020-09-14Apply 1 suggestion(s) to 1 file(s)rinpatch
2020-09-14RichMedia: Do a HEAD request to check content type/lengthrinpatch
This shouldn't be too expensive, since the connections are pooled, but it should save us some bandwidth since we won't fetch non-html files and files that are too large for us to process (especially since you can't cancel a request without closing the connection with HTTP1).
2020-09-11Merge branch 'chat-moderation-stable' into chat-moderationAlex Gleason
2020-09-11Chat moderation: fix formattingAlex Gleason
2020-09-11Merge remote-tracking branch 'upstream/develop' into chat-moderationAlex Gleason
2020-09-11Chat moderation: add tests for unauthorized accessAlex Gleason
2020-09-11Chat Moderation: use explicit `sender` and `recipient` fieldsAlex Gleason
2020-09-11Credo fixAlex Gleason
2020-09-11AdminAPI: fix delete chat messageAlex Gleason
2020-09-11AdminAPI: show chatAlex Gleason
2020-09-11AdminAPI: list messages in a chatAlex Gleason
2020-09-11AdminAPI: list chats for a userAlex Gleason
2020-09-11AdminAPI: delete a chat messageAlex Gleason
2020-09-11MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1Alex Gleason
2020-09-11Fetcher: Correctly return MRF reject reasonHaelwenn (lanodan) Monnier
2020-09-11Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxyIvan Tashkinov
# Conflicts: # lib/pleroma/instances/instance.ex
2020-09-11instance: Handle not getting a faviconHaelwenn (lanodan) Monnier
2020-09-11Pipeline Ingestion: ArticleHaelwenn (lanodan) Monnier