aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-09-30Merge branch 'features/apc2s-media-upload' into 'develop'kaniini
2019-09-30Merge branch 'split-masto-api/reports' into 'develop'kaniini
2019-09-30Merge branch 'split-masto-api/conversations' into 'develop'kaniini
2019-09-30Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop'kaniini
2019-09-30Merge branch 'feature/scrobbling' into 'develop'kaniini
2019-09-30Extract report actions from `MastodonAPIController` to `ReportController`Egor Kislitsyn
2019-09-30change new scrobble endpointAriadne Conill
2019-09-30test: fix scrobble controller testsAriadne Conill
2019-09-30split scrobble functions into their own controllerAriadne Conill
2019-09-30router: change scrobble timeline route from now-playing to scrobblesAriadne Conill
2019-09-30common api: add some missing IR bits for listen activities' childrenAriadne Conill
2019-09-30activitypub: object view: include child object for Listen activitiesAriadne Conill
2019-09-30common api: make sure the generated IR is actually federatableAriadne Conill
2019-09-30test: transmogrifier: add test proving that transmogrifier can handle outgoin...Ariadne Conill
2019-09-30update changelogAriadne Conill
2019-09-30pleroma api: hook up scrobbler controllerAriadne Conill
2019-09-30common api: implement scrobblingAriadne Conill
2019-09-30activitypub: transmogrifier: implement support for Listen activitiesAriadne Conill
2019-09-30activitypub: implement IR-level considerations for Listen activitiesAriadne Conill
2019-09-30mastodon api: implement rendering of listen activitiesAriadne Conill
2019-09-30test: factory: implement support for generating mock audio and listen objectsAriadne Conill
2019-09-30docs: add scrobble API descriptionAriadne Conill
2019-09-30Extract conversation actions from `MastodonAPIController` to ConversationCont...Egor Kislitsyn
2019-09-30Merge branch 'develop' into cleanup/drop-subscription-table-if-existsrinpatch
2019-09-29Remove subscription_notifications table if it existedrinpatch
2019-09-29Merge branch 'revert/subscription-refactoring' into 'develop'rinpatch
2019-09-29Revert subscription refactoring.rinpatch
2019-09-29Merge branch 'feature/follow-requests-count' into 'develop'kaniini
2019-09-29Merge branch 'chores/1691-breaking-change' into 'develop'Haelwenn
2019-09-29CHANGELOG.md: Sorting, colon after breakingHaelwenn (lanodan) Monnier
2019-09-29admin_api.md: Put data-type info as the valuesHaelwenn (lanodan) Monnier
2019-09-29CHANGELOG.md: !1691 is a breaking changeHaelwenn (lanodan) Monnier
2019-09-28Merge branch 'chore/update-docs' into 'develop'Haelwenn
2019-09-29Update admin_api.mdMaxim Filippov
2019-09-28Merge branch 'tests/mastodon_api_controller.ex' into 'develop'Haelwenn
2019-09-28Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-28Merge branch 'bugfix/post-empty-status' into 'develop'Haelwenn
2019-09-28status_controller.ex: Posting media status without content definedHaelwenn (lanodan) Monnier
2019-09-27Merge branch 'fix/empty-attachment-statuses' into 'develop'rinpatch
2019-09-28Fix not being able to post empty statuses with attachmentsrinpatch
2019-09-27Merge branch 'remote-ip' into 'develop'Haelwenn
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