summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/loc...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-02Merge branch 'bugfix/poll_replies_count' into 'develop'lain
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-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
2020-10-30ConversationControllerTest: fix testAlibek Omarov
2020-10-30ConversationView: add current user to conversations, according to Mastodon be...Alibek Omarov
2020-10-30Merge branch 'develop' into 'feature/local-only-scope'minibikini
2020-10-29Merge branch 'issue/2069' into 'develop'Haelwenn
2020-10-29Merge branch 'fix/frontend-cli-docs' into 'develop'feld
2020-10-29Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'feld
2020-10-29Merge branch 'mutes-blocks-pagination' into 'develop'feld
2020-10-29Merge branch 'fix/mrf-keyword-description' into 'develop'feld
2020-10-29Improve Keyword descriptions for AdminFEMark Felder
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
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' i...feld
2020-10-28@doc fix.Ivan Tashkinov
2020-10-28Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller...Ivan Tashkinov
2020-10-28Merge branch 'issue/2261' into 'develop'feld
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 10:48:23 +0000