Commit Graph

11838 Commits (4e4f77108207157a49a627edb03951e2f15b62f1)
 

Author SHA1 Message Date
feld 6c052bd5b6 Merge branch 'media-preview-proxy-nostream' into 'develop'
4 years ago
lain 91ddd47e51 Merge branch 'fix/fedsocket-log-spam' into 'develop'
4 years ago
rinpatch 26c571df33 FedSockets: fix log spam on cached rejects
4 years ago
lain 7e02f4ed3b Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
4 years ago
lain 875b6654ec Merge branch 'websocket-data-fed' into 'develop'
4 years ago
Steven Fuchs f2ef9735c5 Federate data through persistent websocket connections
4 years ago
Maksim Pechnikov 2159daa9af update changelog
4 years ago
Maksim Pechnikov 2ec0dcf001 Merge branch 'develop' into issue/2099
4 years ago
Sergey Suprunenko 226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
4 years ago
rinpatch 49584a9928 Merge branch 'stable-sync/2.1.2' into 'develop'
4 years ago
Ivan Tashkinov a428800405 Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
rinpatch 065a4dddfd Merge branch 'stable' into stable-sync/2.1.2
4 years ago
rinpatch a0f5e8b27e Merge branch 'release/2.1.2' into 'stable'
4 years ago
Haelwenn (lanodan) Monnier 7bf269fe83 Fix MRF reject for ChatMessage
4 years ago
Haelwenn (lanodan) Monnier abf25e5d52 Create MRF.filter_pipeline to inject :object_data when present
4 years ago
Haelwenn (lanodan) Monnier 3a0f99ed35 KeywordPolicy: Still match when fields are absent
4 years ago
rinpatch 34afc2b074 pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
4 years ago
rinpatch b751c5babc CHANGELOG.md: Add 2.1.2 entry
4 years ago
Haelwenn beefc022dd Merge branch 'omit-nondiscoverable-from-search' into 'develop'
4 years ago
feld 608824b97e Merge branch 'instance-docs' into 'develop'
4 years ago
rinpatch a5d6c9aa8e mix.exs: bump version to 2.1.2
4 years ago
rinpatch 6bbd65fb09 Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
4 years ago
rinpatch 608017b7df Merge branch 'fix/streaming-termination-errors' into 'develop'
4 years ago
Haelwenn 0465bdbd49 Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
4 years ago
lain bb70b231d0 Merge branch 'reply-visibility-user-guard' into 'develop'
4 years ago
rinpatch 22d49993d9 Merge branch 'bugfix/mrf-ingestion' into 'develop'
4 years ago
stwf 9d77f4abf8 adapt to new user factory behavior
4 years ago
stwf dfc621a529 add test and changelog entry
4 years ago
stwf 41939e3175 User search respect discoverable flag
4 years ago
rinpatch eff7f9892d Merge branch 'hotfix/rich-media-compile-error' into 'develop'
4 years ago
rinpatch dee4639dbb Merge branch 'feat/rich-media-head' into 'develop'
4 years ago
feld 6b9bfc9e86 Merge branch 'fix/configdb-migration-with-deprecated' into 'develop'
4 years ago
Mark Felder f7e40f7ef1 Deny ConfigDB migration when deprecated settings found
4 years ago
lain 2a7c9ac147 Merge branch 'nondiscoverable-user-metadata' into 'develop'
4 years ago
Ivan Tashkinov d9fb5bc08a Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
Ivan Tashkinov 7cdbd91d83 [#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
4 years ago
rinpatch cd93aa2aed Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop'
4 years ago
lain 7c60789ba5 Merge branch 'develop' into 'nondiscoverable-user-metadata'
4 years ago
rinpatch db80b9d630 RichMedia: Fix log spam on failures and resetting TTL on cached errors
4 years ago
eugenijm c711a2b157 Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
4 years ago
stwf f58262c673 add description to changelog
4 years ago
eugenijm 582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
4 years ago
lain 5426eb5997 Merge branch 'chat-moderation' into 'develop'
4 years ago
lain 5e3c70afa5 AdminAPI Chat tests: Remove factory.
4 years ago
lain e39ff2616b Admin chat api tests: Small additions.
4 years ago
lain 7a73850928 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
4 years ago
Maksim Pechnikov 5a8ea0a5b0 small refactoring
4 years ago
Maksim Pechnikov b867f9d7ae Merge branch 'develop' into issue/2099
4 years ago
Ivan Tashkinov a781f41f96 [#2497] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.
4 years ago
feld c5acbf8a1b Merge branch 'chore/unused-import' into 'develop'
4 years ago