aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-20Added translation using Weblate (Chinese (Simplified))Kana
2020-09-20Merge branch 'fix/openapi-errors' into 'develop'rinpatch
OpenAPI: fix various errors pointed out by editor.swagger.io See merge request pleroma/pleroma!3011
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-18Merge branch 'fix/fedsocket-log-spam' into 'develop'lain
FedSockets: fix log spam on cached rejects See merge request pleroma/pleroma!3009
2020-09-18FedSockets: fix log spam on cached rejectsrinpatch
2020-09-18Merge branch 'feature/2118-web-push-encryption-http' into 'develop'lain
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter Closes #2118 See merge request pleroma/pleroma!3008
2020-09-18Merge branch 'websocket-data-fed' into 'develop'lain
Federate data through persistent websocket connections See merge request pleroma/pleroma!2408
2020-09-18Federate data through persistent websocket connectionsSteven Fuchs
2020-09-18update changelogMaksim Pechnikov
2020-09-18Merge branch 'develop' into issue/2099Maksim Pechnikov
2020-09-17Make WebPushEncryption use Pleroma.HTTP as an HTTP adapterSergey Suprunenko
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 09:06:37 +0000