aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limite...Ivan Tashkinov
2019-10-06Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'Haelwenn
2019-10-05Merge branch 'split-masto-api/leftovers' into 'develop'kaniini
2019-10-05Merge branch 'accept-embedded-announce-object' into 'develop'kaniini
2019-10-05Merge branch 'unread-conversation-count' into 'develop'kaniini
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Merge branch 'update-activity-fixes' into 'develop'kaniini
2019-10-05CommonAPI: Create profile updates as public.lain
2019-10-05ActivityPub / Transmogrifier: Correctly store incoming Update id.lain
2019-10-05Add test for handling Announces with inlined object from different originThibaut Girka
2019-10-05Make credo happyThibaut Girka
2019-10-05Import object from self-Announce whenever possibleThibaut Girka
2019-10-05Merge branch 'revert-5c04e817' into 'develop'kaniini
2019-10-05Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"kaniini
2019-10-04Merge branch 'issue/1296' into 'develop'kaniini
2019-10-04removed legacy api: "/objects/:uuid/likes"Maksim Pechnikov
2019-10-04Merge branch 'bugfix/widen-streamer-blocks' into 'develop'kaniini
2019-10-04Merge branch 'user-info-unread-direct-conversation' into 'develop'kaniini
2019-10-04Merge branch 'fix/extended-nickname-format-default-config' into 'develop'kaniini
2019-10-04Merge branch 'undo-fixes' into 'develop'kaniini
2019-10-04update changelogAriadne Conill
2019-10-04streamer: worker: actually use should_send? consistentlyAriadne Conill
2019-10-04streamer: worker: check for lack of intersectionality between a user's blockl...Ariadne Conill
2019-10-04streamer: add missing copyright headersAriadne Conill
2019-10-04tests: streamer: add a test for blocked transitive activitiesAriadne Conill
2019-10-04ActivityPub.Utils: Fix undo test.lain
2019-10-04ActivityPub: Change addressing of Undo.lain
2019-10-04Merge branch 'develop' into 'fix/extended-nickname-format-default-config'feld
2019-10-04Merge branch 'featrue/job-monitor' into 'develop'lain
2019-10-04Merge branch 'fix/nickname-fail' into 'develop'lain
2019-10-04Fix get_cached_by_nickname_or_id not allowing to get local users byrinpatch
2019-10-04Merge branch 'bugfix/notification-nil-actor' into 'develop'lain
2019-10-04Merge branch 'fix/oauth-controller' into 'develop'lain
2019-10-04Fix OAuthControllerEgor Kislitsyn
2019-10-04notification_view.ex: Make sure `account` isn’t emptyHaelwenn (lanodan) Monnier
2019-10-03Merge branch 'docs/frontend_configuration' into 'develop'rinpatch
2019-10-04cheatsheet.md: link to pleroma-fe docs for :frontend_configurationsHaelwenn (lanodan) Monnier
2019-10-04Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-03Merge branch 'mkdocs-migration-prep' into 'develop'rinpatch
2019-10-03Remove a test branch from CIrinpatch
2019-10-03Add missing extended_nickname_format setting to the default configMark Felder
2019-10-03Add a missing language specificationrinpatch
2019-10-03Change docs build/deploy to just trigger a pipeline in the docs reporinpatch
2019-10-03Move config task docs to a separate file and mark it as WIPrinpatch
2019-10-03Mix tasks: derive moduledoc from doc filesrinpatch
2019-10-03Move database maintenance tasks docs to a separate filerinpatch
2019-10-03MkDocs does not like if a paragraph doesn't have a newline after itrinpatch
2019-10-03Remove silent mode note as it's no longer relevantrinpatch
2019-10-03Cheatsheet: Use note/warning blocks instead of bold textrinpatch
2019-10-03Fix a typo in activity expirationsrinpatch