aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-07-17user: refactor get_or_create_instance_user() into get_or_create_service_actor...Ariadne Conill
2019-07-17Merge branch 'feature/mention-mrf' into 'develop'kaniini
2019-07-17Add MRF MentionPolicy for dropping posts which mention specific actorsRX14
2019-07-16Merge branch 'feature/1078-password-reset' into 'develop'kaniini
2019-07-16mastoapi password resetAlexander Strizhakov
2019-07-16Merge branch 'tests/upload_filters' into 'develop'kaniini
2019-07-16added tests for Pleroma.Upload.FilterMaksim
2019-07-16Merge branch '1094-relation-actions-rate-limiting' into 'develop'kaniini
2019-07-17add the rich media ttl based on image exp timeSachin Joshi
2019-07-16Apply suggestion to docs/config.mdIvan Tashkinov
2019-07-16[#1094] Rate-limited follow & unfollow actions.Ivan Tashkinov
2019-07-16Merge branch 'add-deactivated-to-account-view' into 'develop'kaniini
2019-07-16Add `pleroma.deactivated` to the Account entity (Mastodon API)Eugenij
2019-07-16Merge branch 'add-blocked-by-to-relationship' into 'develop'kaniini
2019-07-16Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts...Eugenij
2019-07-16Merge branch 'feature/addressable-lists' into 'develop'kaniini
2019-07-16Fix typoEgor Kislitsyn
2019-07-16Merge branch 'bugfix/poll-id-as-string' into 'develop'rinpatch
2019-07-16Mastodon Controller: Fix tests.lain
2019-07-16Status View: Poll ids are strings.lain
2019-07-15Add changelog entry for Mastodon API changeMark Felder
2019-07-15Merge branch 'develop' into feature/matstodon-statuses-by-nameMark Felder
2019-07-15Merge branch 'match-file-name' into 'develop'feld
2019-07-15Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop'feld
2019-07-15Remove dead link from the installation docsEugenij
2019-07-15Merge branch 'tests/mastodon-common-api' into 'develop'kaniini
2019-07-15Add more tests for MastodonAPIController and CommonAPISergey Suprunenko
2019-07-15Merge branch 'fix/1091-notifications-query' into 'develop'kaniini
2019-07-15query fixAlex S
2019-07-15Merge branch 'sha512-crypt' into 'develop'kaniini
2019-07-15Merge branch 'develop' into match-file-nameSachin Joshi
2019-07-15formattingMoonman
2019-07-15Merge branch 'update-tzdata' into 'develop'kaniini
2019-07-15Merge branch 'admin-configure-atom-keys' into 'develop'kaniini
2019-07-15Merge branch 'tests/http_signature' into 'develop'kaniini
2019-07-15tests for Pleroma.SignatureMaksim
2019-07-15Merge branch 'feature/addressable-lists' into 'develop'kaniini
2019-07-15migrating task refactorAlex S
2019-07-15atom keys with leading :Alex S
2019-07-15List messages must be visible for mentioned usersEgor Kislitsyn
2019-07-15Dependencies: Update tzdata and related packages.lain
2019-07-15Add `listMessage` to to the JSON-LD contextEgor Kislitsyn
2019-07-15Update documentationEgor Kislitsyn
2019-07-15Add an explanation comment to Publisher.publish/2Egor Kislitsyn
2019-07-15Merge remote-tracking branch 'pleroma/develop' into feature/addressable-listsEgor Kislitsyn
2019-07-15Support `list` visibility in StatusViewEgor Kislitsyn
2019-07-14Merge branch 'tests/media_proxy' into 'develop'kaniini
2019-07-14added tests for Web.MediaProxyMaksim
2019-07-14Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'kaniini
2019-07-14Unfollow should also unsubscribeSergey Suprunenko