aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-09-17Merge branch 'nondiscoverable-user-metadata' into 'develop'lain
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into media-preview-prox...Ivan Tashkinov
2020-09-17[#2497] Configurability of :min_content_length (preview proxy). Refactoring, ...Ivan Tashkinov
2020-09-17Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop'rinpatch
2020-09-17Merge branch 'develop' into 'nondiscoverable-user-metadata'lain
2020-09-17RichMedia: Fix log spam on failures and resetting TTL on cached errorsrinpatch
2020-09-17Return the file content for `GET /api/pleroma/admin/instance_document/:docume...eugenijm
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
2020-09-17AdminAPI Chat tests: Remove factory.lain
2020-09-17Admin chat api tests: Small additions.lain
2020-09-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason...lain
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, dyna...Ivan Tashkinov
2020-09-16Merge branch 'chore/unused-import' into 'develop'feld
2020-09-16Remove unused importMark Felder
2020-09-16Merge branch '2144-empty-users' into 'develop'rinpatch
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
2020-09-16ConnectionPool Worker: use monitor flush instead of checking refrinpatch
2020-09-16Merge branch 'chores/mrf-loglevel' into 'develop'rinpatch
2020-09-16Merge branch 'features/validators-video' into 'develop'rinpatch
2020-09-16Merge branch 'issue/2089' into 'develop'lain
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 media-preview-prox...Ivan Tashkinov
2020-09-15fixed testsMaksim Pechnikov
2020-09-15Merge branch 'reply-visibility-user-guard' into 'develop'lain
2020-09-15Mastodon API: fix the public timeline returning an error when the `reply_visi...eugenijm
2020-09-15Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn
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
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
2020-09-14Remove `:managed_config` option.rinpatch
2020-09-14Merge branch 'hotfix/rich-media-compile-error' into 'develop'rinpatch
2020-09-14RichMedia: fix a compilation error due to nonexistent variablerinpatch
2020-09-14Merge branch 'feat/rich-media-head' into 'develop'rinpatch
2020-09-14Apply 1 suggestion(s) to 1 file(s)rinpatch
2020-09-14RichMedia: Do a HEAD request to check content type/lengthrinpatch
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
2020-09-13Apply 1 suggestion(s) to 1 file(s)Maksim