summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-31Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-30Merge branch 'remove-unused-aliases' into 'develop'feld
Remove unused aliases See merge request pleroma/pleroma!3111
2020-10-30Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-30Remove unused aliasesEgor Kislitsyn
2020-10-30ConversationViewTest: fix testAlibek Omarov
2020-10-30ConversationView: fix formattingAlibek Omarov
2020-10-30ConversationControllerTest: fix test, fix formattingAlibek Omarov
2020-10-30Add entry in changelogAlibek Omarov
2020-10-30ConversationView: fix last_status.account being empty, fix current user ↵Alibek Omarov
being included in group conversations
2020-10-30ConversationViewTest: fix test #2Alibek Omarov
2020-10-30ConversationViewTest: fix testAlibek Omarov
2020-10-30ConversationControllerTest: fix testAlibek Omarov
2020-10-30ConversationView: add current user to conversations, according to Mastodon ↵Alibek Omarov
behaviour
2020-10-30Merge branch 'develop' into 'feature/local-only-scope'minibikini
# Conflicts: # CHANGELOG.md
2020-10-29Merge branch 'issue/2069' into 'develop'Haelwenn
[#2069] unread_conversation_count See merge request pleroma/pleroma!2939
2020-10-29Merge branch 'fix/frontend-cli-docs' into 'develop'feld
Fix formatting and typos in "Managing frontends" guide See merge request pleroma/pleroma!3098
2020-10-29Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'feld
[#2137] admin/users filters See merge request pleroma/pleroma!3016
2020-10-29Merge branch 'mutes-blocks-pagination' into 'develop'feld
Support pagination of blocks and mutes Closes #642 See merge request pleroma/pleroma!3080
2020-10-29Merge branch 'fix/mrf-keyword-description' into 'develop'feld
Improve Keyword descriptions for AdminFE See merge request pleroma/pleroma!3110
2020-10-29Improve Keyword descriptions for AdminFEMark Felder
2020-10-29Add documentation and update CHANGELOGEgor Kislitsyn
2020-10-29Add support for install via `file` and `build_url` paramsEgor Kislitsyn
2020-10-29Merge remote-tracking branch 'origin/develop' into mutes-blocks-paginationEgor Kislitsyn
2020-10-29Merge remote-tracking branch 'origin/develop' into feature/local-only-scopeEgor Kislitsyn
2020-10-29Merge branch 'bugfix/admin-api-account-view-is-discoverable-fix' into 'develop'feld
Fix: User.is_discoverable attribute rendering in Admin API User view See merge request pleroma/pleroma!3107
2020-10-28Fixed User.is_discoverable attribute rendering in Admin API User view.Ivan Tashkinov
2020-10-28Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' ↵feld
into 'develop' OStatus / Static FE access control fixes See merge request pleroma/pleroma!3053
2020-10-28@doc fix.Ivan Tashkinov
2020-10-28Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
ostatus-controller-no-auth-check-on-non-federating-instances # Conflicts: # CHANGELOG.md
2020-10-28Merge branch 'issue/2261' into 'develop'feld
[#2261] FrontStatic plug: excluded invalid url See merge request pleroma/pleroma!3106
2020-10-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261Mark Felder
2020-10-28Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-28Fix warningEgor Kislitsyn
2020-10-27Merge branch 'feature/autofollowing' into 'develop'feld
autofollowing_nicknames See merge request pleroma/pleroma!3087
2020-10-27Merge branch '2236-no-name' into 'develop'Haelwenn
Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27Merge branch 'fix/prometheus-test' into 'develop'feld
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+ See merge request pleroma/pleroma!3105
2020-10-27FrontStatic plug: excluded invalid urlMaksim Pechnikov
2020-10-27phoenix_controller_render_duration is no longer available in telemetry of ↵Mark Felder
Phoenix 1.5+
2020-10-27Merge branch 'develop' into 'feature/local-only-scope'minibikini
# Conflicts: # CHANGELOG.md
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27Merge branch '1668-prometheus-access-restrictions' into 'develop'feld
[#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
2020-10-27Add an API endpoint to install a new frontendEgor Kislitsyn
2020-10-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-block-behavior
2020-10-26Merge branch 'docs/clients-apc2s' into 'develop'lain
clients.md: Add AndStatus, note supported protocols See merge request pleroma/pleroma!3104
2020-10-26ActivityPub: Add back debug call + explanation.lain
2020-10-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-namelain
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 22:12:40 +0000