aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-17Merge branch 'stable-sync/2.1.2' into 'develop'rinpatch
Sync develop with 2.1.2 Closes #2133, #2131, and #2130 See merge request pleroma/pleroma!3007
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream # Conflicts: # CHANGELOG.md
2020-09-17Merge branch 'stable' into stable-sync/2.1.2rinpatch
2020-09-17Merge branch 'release/2.1.2' into 'stable'v2.1.2rinpatch
Release/2.1.2 See merge request pleroma/secteam/pleroma!17
2020-09-17Fix MRF reject for ChatMessageHaelwenn (lanodan) Monnier
2020-09-17Create MRF.filter_pipeline to inject :object_data when presentHaelwenn (lanodan) Monnier
2020-09-17KeywordPolicy: Still match when fields are absentHaelwenn (lanodan) Monnier
2020-09-17pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7drinpatch
2020-09-17CHANGELOG.md: Add 2.1.2 entryrinpatch
2020-09-17Merge branch 'omit-nondiscoverable-from-search' into 'develop'Haelwenn
User search should respect discoverable flag See merge request pleroma/pleroma!2997
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-17mix.exs: bump version to 2.1.2rinpatch
2020-09-17Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'rinpatch
[#2130] Fixed OAuth OOB authentication for users with enabled MFA Closes #2130 See merge request pleroma/pleroma!2979
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 '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-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-17Merge branch 'fix/configdb-migration-with-deprecated' into 'develop'feld
Deny ConfigDB migration when deprecated settings found Closes #2148 See merge request pleroma/pleroma!3005
2020-09-17Deny ConfigDB migration when deprecated settings foundMark Felder
2020-09-17Merge branch 'nondiscoverable-user-metadata' into 'develop'lain
search indexing metadata should respect discoverable flag See merge request pleroma/pleroma!2998
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 'fix/rich-media-log-spam-and-ttl-reset' into 'develop'rinpatch
RichMedia: Fix log spam on failures and resetting TTL on cached errors See merge request pleroma/pleroma!3006
2020-09-17Merge branch 'develop' into 'nondiscoverable-user-metadata'lain
# Conflicts: # CHANGELOG.md
2020-09-17RichMedia: Fix log spam on failures and resetting TTL on cached errorsrinpatch
2020-09-17Return the file content for `GET ↵eugenijm
/api/pleroma/admin/instance_document/:document_name`
2020-09-17add description to changelogstwf
2020-09-17AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin APIeugenijm
2020-09-17Merge branch 'chat-moderation' into 'develop'lain
Chat moderation MVP See merge request pleroma/pleroma!2937
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 12:18:43 +0000