summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into media-preview-prox...Ivan Tashkinov
2020-09-17Merge branch 'stable' into stable-sync/2.1.2rinpatch
2020-09-17Merge branch 'release/2.1.2' into 'stable'v2.1.2rinpatch
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
2020-09-17Merge branch 'instance-docs' into 'develop'feld
2020-09-17mix.exs: bump version to 2.1.2rinpatch
2020-09-17Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'rinpatch
2020-09-17Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch
2020-09-17Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn
2020-09-17Merge branch 'reply-visibility-user-guard' into 'develop'lain
2020-09-17Merge branch 'bugfix/mrf-ingestion' into 'develop'rinpatch
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
2020-09-17Merge branch 'feat/rich-media-head' into 'develop'rinpatch
2020-09-17Merge branch 'fix/configdb-migration-with-deprecated' into 'develop'feld
2020-09-17Deny ConfigDB migration when deprecated settings foundMark Felder
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
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-05 23:07:37 +0000