aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-07-10Merge branch 'bump-fe-2020-07-10' into 'develop'lain
2020-07-10Update frontendlain
2020-07-10Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'Haelwenn
2020-07-10Merge branch 'mix-tasks-improvement' into 'develop'lain
2020-07-10Merge branch 'cluster-test-ci' into 'develop'lain
2020-07-10Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'Haelwenn
2020-07-10Merge branch 'user-search-nickname-rank-boost' into 'develop'Haelwenn
2020-07-10Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
2020-07-10Translated using Weblate (Italian)Ben Is
2020-07-10Translated using Weblate (Polish)Ben Is
2020-07-10Merge branch 'prometheus-update' into 'develop'Haelwenn
2020-07-10prometheus update for OTP 23Alexander Strizhakov
2020-07-10docs and descriptions for s3 settingsAlexander Strizhakov
2020-07-10Update type for :replace settingsAngelina Filippova
2020-07-10Update type for :groups settingAngelina Filippova
2020-07-09Re-enable the federated tests, increase timeoutstwf
2020-07-09Merge branch 'feature/add-adminfe-url-to-report-mails' into 'develop'feld
2020-07-09user: Add support for custom emojis in profile fieldsHaelwenn (lanodan) Monnier
2020-07-09Add AdminFE reports URL to report emailsMark Felder
2020-07-09cleap upAlexander Strizhakov
2020-07-09Merge branch 'chore/use-the-alias' into 'develop'feld
2020-07-09fix for info after tag/untag userAlexander Strizhakov
2020-07-09fix for user revoke invite taskAlexander Strizhakov
2020-07-09Use the Pleroma.Config aliasMark Felder
2020-07-09Merge branch 'fix/csp-for-captcha' into 'develop'feld
2020-07-09Merge branch 'develop' into fix/csp-for-captchaMark Felder
2020-07-09Merge branch '1723-token-fixes' into 'develop'lain
2020-07-09Merge branch 'features/favicons' into 'develop'lain
2020-07-09Merge branch '1925-muting-reblogs' into 'develop'Haelwenn
2020-07-09Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning...eugenijm
2020-07-09Merge branch 'follow-pipeline' into 'develop'Haelwenn
2020-07-09Merge branch 'patch-2' into 'develop'Haelwenn
2020-07-09Merge branch 'patch-1' into 'develop'lain
2020-07-09Merge branch 'bugfix/status-deletion' into 'develop'lain
2020-07-09[static-fe] limit according to- and within- existing rulesetDym Sohin
2020-07-09Merge branch 'issue/1880' into 'develop'lain
2020-07-09Update static-fe.csslain
2020-07-09Merge branch 'patch-3' into 'develop'lain
2020-07-09missed `:` (colon) before mrf_steal_emojiDym Sohin
2020-07-09fix wide2x emojis within nicknamesDym Sohin
2020-07-09load default config in mix tasksAlexander Strizhakov
2020-07-09fix testMaksim Pechnikov
2020-07-09added link to changelog, removed repetitionDym Sohin
2020-07-09Update types for :headers and :options settings in MediaProxy Invalidation groupAngelina Filippova
2020-07-08Removed unused trigram index on `users`. Fixed `users_fts_index` usage.Ivan Tashkinov
2020-07-08re-enable federation testsstwf
2020-07-08ActivityPub: Remove `follow` and fix issues.lain
2020-07-08CommonAPI: Switch to pipeline for following.lain
2020-07-08don't restart pleroma in mix tasksAlexander Strizhakov
2020-07-08don't fully start pleroma in mix tasksAlexander Strizhakov