aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
stats-genserver-fix
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/expire-mutes
2020-11-04Merge branch 'ejabberd-pleroma-auth' into 'develop'lain
Add ejabberd auth document See merge request pleroma/pleroma!3074
2020-11-04Merge branch 'features/federation-status' into 'develop'lain
Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
View a remote server's timeline See merge request pleroma/pleroma!2713
2020-11-04Merge branch '2284-voters-count' into 'develop'Haelwenn
Always return voters_count in polls See merge request pleroma/pleroma!3120
2020-11-04Changelog: Add info about federation status endpointlain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/federation-status
2020-11-04TopicsTest: Small addition.lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-restrict-domain
2020-11-04Merge branch 'hide-muted-chats' into 'develop'lain
Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116
2020-11-04Add `with_muted` param to ChatController.index/2Egor Kislitsyn
2020-11-04Poll Schema: Update and fix.lain
2020-11-04Changelog: Add info about poll view changeslain
2020-11-04Poll View: Always return `voters_count`.lain
2020-11-03Merge branch 'chores/pleroma-favicon-logo' into 'develop'lain
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social Closes #2270 See merge request pleroma/pleroma!3115
2020-11-03Merge branch 'patch-4' into 'develop'lain
ConversationView: add current user to conversations, according to Mastodon behaviour, fix last_status.account being not filled Closes #2217 See merge request pleroma/pleroma!3089
2020-11-03Conversations: A few refactorslain
2020-11-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
a1batross/pleroma-patch-4
2020-11-03favicon: Update to pleroma logo, provided by @shpuldHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270
2020-11-03Merge branch 'fix/get_report_with_notes' into 'develop'Haelwenn
Permit fetching individual reports with notes preloaded See merge request pleroma/pleroma!3118
2020-11-02Merge branch 'chore/deps-from-git' into 'develop'feld
Ensure URLs for git repos end in .git for older git clients like on CentOS 7 See merge request pleroma/pleroma!3119
2020-11-02Ensure URLs for git repos end in .git for older git clients like on CentOS 7Mark Felder
2020-11-02Test the note is returned when fetching a single reportMark Felder
2020-11-02Permit fetching individual reports with notes preloadedMark Felder
2020-11-02Hide chats from muted usersEgor Kislitsyn
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-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-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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 00:29:05 +0000