aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-09-27Add `remote_ip` plugminibikini
2019-09-27Merge branch 'split-masto-api/follow-requests' into 'develop'kaniini
2019-09-27Merge branch 'split-masto-api/domain-blocks' into 'develop'kaniini
2019-09-27Merge branch 'split-masto-api/scheduled-statuses' into 'develop'kaniini
2019-09-27Merge branch 'split-masto-api/filters' into 'develop'kaniini
2019-09-27Extract domain blocks actions from `MastodonAPIController` to `DomainBlockCon...Egor Kislitsyn
2019-09-27Extract follow requests actions from `MastodonAPIController` to `FollowReques...Egor Kislitsyn
2019-09-27Cleanup ScheduledActivityViewEgor Kislitsyn
2019-09-27Extract scheduled statuses actions from `MastodonAPIController` to `Scheduled...Egor Kislitsyn
2019-09-27Merge branch 'fix/subscription-notification-view' into 'develop'kaniini
2019-09-27Extract filter actions from `MastodonAPIController` to `FilterController`Egor Kislitsyn
2019-09-27Fix SubscriptionNotificationViewEgor Kislitsyn
2019-09-27Merge branch 'refactor/status-controller' into 'develop'kaniini
2019-09-27Move view logic from StatusController.context to StatusView and add a testEgor Kislitsyn
2019-09-27Move StatusController tests from MastodonAPIControllerTest to StatusControlle...Egor Kislitsyn
2019-09-27Merge branch 'refactor/subscription' into 'develop'kaniini
2019-09-27Extract status actions from `MastodonAPIController` into `StatusController`Egor Kislitsyn
2019-09-27Merge branch 'patch-2' into 'develop'kaniini
2019-09-27Merge branch 'update/docs-jp' into 'develop'kaniini
2019-09-27Merge branch 'list-packs-docs' into 'develop'kaniini
2019-09-27Merge branch 'patch-1' into 'develop'kaniini
2019-09-27Merge branch 'refactor/common_api' into 'develop'kaniini
2019-09-27Merge branch 'refactor/timeline-controller' into 'develop'kaniini
2019-09-26Merge branch 'chore/changelog-sync' into 'develop'rinpatch
2019-09-27Sync changelogs between master and developrinpatch
2019-09-26Merge branch 'feature/moderation-log-filters' into 'develop'feld
2019-09-26Add docsMaxim Filippov
2019-09-26Fix code block for admin api documentkPherox
2019-09-26Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov
2019-09-26Update CHANGELOGRoman Chvanikov
2019-09-26Add list_from endpoint to the pleroma_api docsEkaterina Vaartis
2019-09-26Merge developRoman Chvanikov
2019-09-26Extract timeline actions from `MastodonAPIController` into `TimelineController`Egor Kislitsyn
2019-09-26Cleanup CommonAPIEgor Kislitsyn
2019-09-26Add ActivityDraft.with_valid/2Egor Kislitsyn
2019-09-26Add CommonAPI.ActivityDraftEgor Kislitsyn
2019-09-26Merge branch 'refactor/notification-controller' into 'develop'kaniini
2019-09-26Merge branch 'feature/return-link-for-password-reset' into 'develop'kaniini
2019-09-26Merge branch 'refactor/user' into 'develop'kaniini
2019-09-26Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' in...kaniini
2019-09-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
2019-09-26Merge branch 'hex-flake-id' into 'develop'kaniini
2019-09-26Merge branch 'feature/activities-pagination-by-offset' into 'develop'kaniini
2019-09-26Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'kaniini
2019-09-25Merge branch 'hotfix/hackney-1.15.2' into 'develop'rinpatch
2019-09-25mix.lock: Bump hackney to 1.15.2Haelwenn (lanodan) Monnier
2019-09-25Merge branch 'support/test' into 'develop'rinpatch
2019-09-25Apply suggestion to test/tasks/instance_test.exsMaksim
2019-09-25Merge branch 'emoji-packs-create-dir' into 'develop'rinpatch
2019-09-25Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.exrinpatch