aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-09-23Merge branch 'user-query/filter-out-internal' into 'develop'lain
Filter out internal users by default Closes #2147 See merge request pleroma/pleroma!3024
2020-09-23Merge branch 'develop' into 'issue/2115'lain
# Conflicts: # CHANGELOG.md
2020-09-23transmogrifier: Drop incoming create early if it already existsHaelwenn (lanodan) Monnier
2020-09-23Merge branch 'develop' into 'issue/1975'lain
# Conflicts: # CHANGELOG.md
2020-09-22Merge branch 'develop' into issue/1975Maksim Pechnikov
2020-09-22Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason
2020-09-22Fix gun_pool_options deprecation warning messageMark Felder
2020-09-22Remove deprecation warning. We were supposed to remove backwards compat for ↵Mark Felder
this in 2.1.
2020-09-22Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115lain
2020-09-22Filter out internal users by defaultEgor Kislitsyn
2020-09-22ActivityPub: Return Announces when filtering by `following`.lain
2020-09-21Fix deprecation warning for welcome messageMark Felder
2020-09-21Merge branch 'fix/fedsocket-useragent' into 'develop'feld
Minor Fedsocket improvements See merge request pleroma/pleroma!3012
2020-09-21Fix #2172 HTTP error on password resetAlex Gleason
2020-09-21Allow emails to be sent again, #2101 #2172Alex Gleason
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
2020-09-21Merge branch 'bugfix/federator-actor-error' into 'develop'lain
federator: normalize only actor, catch actor error See merge request pleroma/pleroma!2986
2020-09-21Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'lain
[#2074] OAuth scope checking in Streaming API Closes #2074 See merge request pleroma/pleroma!3013
2020-09-21Merge branch 'issue/2099' into 'develop'lain
[#2099] Import/export mutes [BE] See merge request pleroma/pleroma!2965
2020-09-21Force HTTP for fedsocketsMark Felder
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-19[#2074] OAuth scope checking in Streaming API.Ivan Tashkinov
2020-09-19OpenAPI: make it possible to generate a spec without starting the apprinpatch
Needed for api docs generation on pleroma.social that will come later
2020-09-19OpenAPI: fix various errors pointed out by editor.swagger.iorinpatch
2020-09-19Add user agent to fedsocket requestsMark Felder
2020-09-18Merge branch 'develop' into issue/2099Maksim Pechnikov
2020-09-18Merge branch 'media-preview-proxy-nostream' into 'develop'feld
Media preview proxy See merge request pleroma/pleroma!3001
2020-09-18FedSockets: fix log spam on cached rejectsrinpatch
2020-09-18Federate data through persistent websocket connectionsSteven Fuchs
2020-09-18Merge branch 'develop' into issue/2099Maksim Pechnikov
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream # Conflicts: # CHANGELOG.md
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-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-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-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-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 '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`
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 16:26:23 +0000