aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
2020-11-04Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov
2020-11-04Merge branch '2284-voters-count' into 'develop'Haelwenn
2020-11-04Changelog: Add info about federation status endpointlain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/fe...lain
2020-11-04TopicsTest: Small addition.lain
2020-11-04Merge branch '2257-self-chat' into 'develop'rinpatch
2020-11-04Merge branch 'chore/elixir-1.11' into 'develop'feld
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason...lain
2020-11-04Merge branch 'instance-docs' into 'develop'feld
2020-11-04Merge branch 'tesla-get-to-pleroma' into 'develop'feld
2020-11-04Merge branch 'hide-muted-chats' into 'develop'lain
2020-11-04Add `with_muted` param to ChatController.index/2Egor Kislitsyn
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-ad...lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/loc...lain
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
2020-11-03Merge branch 'patch-4' into 'develop'lain
2020-11-03Conversations: A few refactorslain
2020-11-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/p...lain
2020-11-03favicon: Update to pleroma logo, provided by @shpuldHaelwenn (lanodan) Monnier
2020-11-03Merge branch 'fix/get_report_with_notes' into 'develop'Haelwenn
2020-11-02Merge branch 'chore/deps-from-git' into 'develop'feld
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
2020-11-02Merge branch 'develop' into 'frontend-admin-api'minibikini
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
2020-11-01Use Pleroma.HTTP instead of TeslaEkaterina Vaartis
2020-10-31Merge branch 'feature/account-export' into 'develop'feld
2020-10-31Merge branch 'idempotency-key-optimistic-posting' into 'develop'feld
2020-10-31Auth subsystem refactoring and tweaks.Ivan Tashkinov
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
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 being...Alibek Omarov
2020-10-30ConversationViewTest: fix test #2Alibek Omarov
2020-10-30ConversationViewTest: fix testAlibek Omarov