aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-10Merge branch 'chore/should-document-that' into 'develop'feld
Probably worth documenting the MediaProxy fix See merge request pleroma/pleroma!2750
2020-07-10Merge branch 'develop' into issue/1790-updated-obanMark Felder
2020-07-10Switch to the official Oban 2.0.0 releaseMark Felder
2020-07-10Probably worth documenting the MediaProxy fixMark Felder
2020-07-10Merge branch 'proxy-range-and-chunk' into 'develop'feld
ReverseProxy: Streaming and disable encoding if Range Closes #1860 and #1823 See merge request pleroma/pleroma!2749
2020-07-10Credo line length complaintMark Felder
2020-07-10ReverseProxy: Streaming and disable encoding if Rangehref
Fixes #1823 Fixes #1860
2020-07-10ActivityPub: Don't rename a clashing nickname with the same ap id.lain
2020-07-10Merge branch 'chat-federation-information' into 'develop'lain
Add an `accepts_chat_messages` to user, expose in api and federation See merge request pleroma/pleroma!2716
2020-07-10Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
chat-federation-information
2020-07-10Merge branch 'bump-fe-2020-07-10' into 'develop'lain
Update frontend See merge request pleroma/pleroma!2747
2020-07-10Update frontendlain
2020-07-10Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'Haelwenn
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated` Closes admin-fe#107 and #1788 See merge request pleroma/pleroma!2554
2020-07-10Merge branch 'mix-tasks-improvement' into 'develop'lain
Mix tasks improvement See merge request pleroma/pleroma!2723
2020-07-10Merge branch 'cluster-test-ci' into 'develop'lain
RE-enable cluster tests on CI See merge request pleroma/pleroma!2743
2020-07-10Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'Haelwenn
# Conflicts: # CHANGELOG.md
2020-07-10Merge branch 'user-search-nickname-rank-boost' into 'develop'Haelwenn
Improved search results for localized nickname match See merge request pleroma/pleroma!2733
2020-07-10Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!2739
2020-07-10Translated using Weblate (Italian)Ben Is
Currently translated at 100.0% (106 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
2020-07-10Translated using Weblate (Polish)Ben Is
Currently translated at 66.0% (70 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-07-10Merge branch 'prometheus-update' into 'develop'Haelwenn
prometheus update for OTP 23 See merge request pleroma/pleroma!2746
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
Add AdminFE reports URL to report emails Closes #1926 See merge request pleroma/pleroma!2742
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
Use the Pleroma.Config alias See merge request pleroma/pleroma!2740
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
Add Captcha endpoint to CSP headers when MediaProxy is enabled. See merge request pleroma/pleroma!2718
2020-07-09Merge branch 'develop' into fix/csp-for-captchaMark Felder
2020-07-09Merge branch '1723-token-fixes' into 'develop'lain
AccountController: Return scope in proper format. Closes #1723 See merge request pleroma/pleroma!2694
2020-07-09Merge branch 'features/favicons' into 'develop'lain
Add support for remote favicons See merge request pleroma/pleroma!2261
2020-07-09Merge branch '1925-muting-reblogs' into 'develop'Haelwenn
AccountController: Fix muting / unmuting reblogs. Closes #1925 See merge request pleroma/pleroma!2732
2020-07-09Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` ↵eugenijm
returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
2020-07-09Merge branch 'follow-pipeline' into 'develop'Haelwenn
Handle `Follow` activities with the pipeline See merge request pleroma/pleroma!2734
2020-07-09Merge branch 'patch-2' into 'develop'Haelwenn
fix wide2x emojis within nicknames See merge request pleroma/pleroma!2737
2020-07-09Merge branch 'patch-1' into 'develop'lain
added link to changelog, removed repetition See merge request pleroma/pleroma!2736
2020-07-09Merge branch 'bugfix/status-deletion' into 'develop'lain
#1920 fix activity deletion See merge request pleroma/pleroma!2721
2020-07-09[static-fe] limit according to- and within- existing rulesetDym Sohin
2020-07-09Merge branch 'issue/1880' into 'develop'lain
[#1880] fixed delete `Like` activity in remove user See merge request pleroma/pleroma!2725
2020-07-09Update static-fe.csslain
2020-07-09Merge branch 'patch-3' into 'develop'lain
missed `:` (colon) before mrf_steal_emoji See merge request pleroma/pleroma!2738
2020-07-09missed `:` (colon) before mrf_steal_emojiDym Sohin
2020-07-09fix wide2x emojis within nicknamesDym Sohin
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:12:23 +0000