aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-10fix ecto helpersissue/2205Maksim Pechnikov
2020-11-05fix testMaksim Pechnikov
2020-11-05fix messages errors for user registrationsMaksim Pechnikov
2020-11-02Merge branch 'develop' into issue/2205Maksim Pechnikov
2020-11-02Merge branch 'bugfix/poll_replies_count' into 'develop'lain
side_effects: Don’t increase_replies_count when it’s an Answer Closes #2274 See merge request pleroma/pleroma!3114
2020-11-02side_effects: Don’t increase_replies_count when it’s an AnswerHaelwenn (lanodan) Monnier
2020-11-01Merge branch 'tesla-get-to-pleroma' into 'develop'feld
Use Pleroma.HTTP instead of Tesla Closes #2275 See merge request pleroma/pleroma!3113
2020-11-01Use Pleroma.HTTP instead of TeslaEkaterina Vaartis
Closes #2275 As discovered in the issue, captcha used Tesla.get instead of Pleroma.HTTP. I've also grep'ed the repo and changed the other place where this was used.
2020-10-31Merge branch 'feature/account-export' into 'develop'feld
Add account export Closes #847 See merge request pleroma/pleroma!2918
2020-10-31Merge branch 'idempotency-key-optimistic-posting' into 'develop'feld
Add `idempotency_key` to the chat message entity Closes #2126 See merge request pleroma/pleroma!3015
2020-10-31Add idempotency_key to the chat_message entity.eugenijm
2020-10-31Fix credo warningEgor Kislitsyn
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-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-29Merge remote-tracking branch 'origin/develop' into mutes-blocks-paginationEgor 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/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-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
2020-10-26Merge branch 'patch-1' into 'develop'rinpatch
Fix link reference See merge request pleroma/pleroma!3103
2020-10-26clients.md: Add AndStatus, note supported protocolsHaelwenn (lanodan) Monnier
2020-10-26Merge branch 'docs/ap_c2s' into 'develop'Haelwenn
AP C2S: Document our additional endpoints See merge request pleroma/pleroma!3056
2020-10-25Fix link referenceKana
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-21 13:57:54 +0000