aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-17small refactoringMaksim Pechnikov
2020-09-17Merge branch 'develop' into issue/2099Maksim Pechnikov
2020-09-16[#2497] Media preview proxy: misc. improvements (`static` param support, ↵Ivan Tashkinov
dynamic fifo pipe path), refactoring.
2020-09-16Merge branch 'chore/unused-import' into 'develop'feld
Remove unused import See merge request pleroma/pleroma!3004
2020-09-16Remove unused importMark Felder
2020-09-16Merge branch '2144-empty-users' into 'develop'rinpatch
User: Remote users don't need to be confirmed or approved Closes #2144 See merge request pleroma/pleroma!3003
2020-09-16User: Remote users don't need to be confirmed or approvedlain
2020-09-16Merge branch 'feat/connection-worker-monitor-flush' into 'develop'rinpatch
ConnectionPool Worker: use monitor flush instead of checking ref See merge request pleroma/pleroma!3002
2020-09-16ConnectionPool Worker: use monitor flush instead of checking refrinpatch
`:flush` removes the DOWN message if one had arrived, so this check should no longer be necessary.
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-16Apply 1 suggestion(s) to 1 file(s)Maksim
2020-09-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream
2020-09-15fixed testsMaksim Pechnikov
2020-09-15Merge 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-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-14Move changelog entry to next patchMark Felder
2020-09-14Ensure SimplePolicy's tags in string representation don't trip up the object ↵Mark Felder
validator
2020-09-14fix credo warningstwf
2020-09-14search indexing metadata respects discoverable flagstwf
2020-09-14Fixed Welcome chats with MRF Simple applied locallyMark Felder
2020-09-14Merge duplicate Changed sectionsMark Felder
2020-09-14Validate Welcome Chat message works with Simple policy applied to local instanceMark Felder
2020-09-14Merge branch 'remove/managed-config-option' into 'develop'rinpatch
Remove `:managed_config` option. Closes #2086 See merge request pleroma/pleroma!2983
2020-09-14Remove `:managed_config` option.rinpatch
In practice, it was already removed half a year ago, but the description and cheatsheet entries were still there. The migration intentionally does not use ConfigDB.get_by_params, since this will break migration code as soon as we add a new field is added to ConfigDB. Closes #2086
2020-09-14Merge branch 'hotfix/rich-media-compile-error' into 'develop'rinpatch
RichMedia: fix a compilation error due to nonexistent variable See merge request pleroma/pleroma!2996
2020-09-14RichMedia: fix a compilation error due to nonexistent variablerinpatch
No idea why this passed Gitlab CI
2020-09-14Merge 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-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-14RichMedia parser: do not set a cache TTL for unchanging errorsrinpatch
2020-09-14added notification constraintsMaksim Pechnikov
2020-09-14Merge branch 'fix/2139-oban-migration' into 'develop'rinpatch
Remove old workers in oban migrations Closes #2139 See merge request pleroma/pleroma!2994
2020-09-13Apply 1 suggestion(s) to 1 file(s)Maksim
2020-09-13remove old workers in oban migrationsAlexander Strizhakov
2020-09-12Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!2991
2020-09-12[#2497] Media preview proxy: preview bypass for small imagesIvan Tashkinov
(basing on Content-Length and Content-Type).
2020-09-12[#2497] Media preview proxy: redirecting to media proxy url in case of ↵Ivan Tashkinov
preview error or unsupported content type.
2020-09-11Ensure we only apply NSFW Simple policy on parsable objectsMark Felder
2020-09-11Translated using Weblate (Spanish)tarteka
Currently translated at 20.7% (22 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
2020-09-11Merge branch 'chore/docs-spelling' into 'develop'feld
Spelling nit See merge request pleroma/pleroma!2993
2020-09-11SpellingMark Felder
Reported by: trevoke
2020-09-11Merge branch 'chat-moderation-stable' into chat-moderationAlex Gleason
2020-09-11Chat moderation: fix formattingAlex Gleason