aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-30Move account_lists test to MastodonAPI.AccountControllerTestEgor Kislitsyn
2019-09-30Disable async in DomainBlockControllerTestEgor Kislitsyn
2019-09-30Add PleromaAPI.AccountControllerEgor Kislitsyn
2019-09-30Fix mergeEgor Kislitsyn
2019-09-30Merge branch 'fix/report-controller-test' into 'develop'kaniini
Fix ReportControllerTest See merge request pleroma/pleroma!1746
2019-09-30Fix ReportControllerTestEgor Kislitsyn
2019-09-30Merge branch 'features/apc2s-media-upload' into 'develop'kaniini
AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706
2019-09-30Merge branch 'split-masto-api/reports' into 'develop'kaniini
Extract report actions from `MastodonAPIController` to `ReportController` See merge request pleroma/pleroma!1744
2019-09-30Merge branch 'split-masto-api/conversations' into 'develop'kaniini
Extract conversation actions from `MastodonAPIController` to ConversationController See merge request pleroma/pleroma!1743
2019-09-30Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop'kaniini
Remove subscription_notifications table if it existed See merge request pleroma/pleroma!1742
2019-09-30Merge branch 'feature/scrobbling' into 'develop'kaniini
media scrobbling ("now playing" API) See merge request pleroma/pleroma!1732
2019-09-30Extract report actions from `MastodonAPIController` to `ReportController`Egor Kislitsyn
Update MastodonAPI.ReportView
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 ↵Ariadne Conill
outgoing listens
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 ↵Egor Kislitsyn
ConversationController
2019-09-30Merge branch 'develop' into cleanup/drop-subscription-table-if-existsrinpatch
2019-09-29Remove subscription_notifications table if it existedrinpatch
Followup to !1741
2019-09-29Merge branch 'revert/subscription-refactoring' into 'develop'rinpatch
Revert subscription refactoring. See merge request pleroma/pleroma!1741
2019-09-29Revert subscription refactoring.rinpatch
As discussed in pleroma-meta#2 This reverts commit eb9aa7aa1095de150d036839c78c402019efb4b1, reversing changes made to c4fbb56984d8f86df948cfd9b0f7c081d688c365.
2019-09-29Merge branch 'feature/follow-requests-count' into 'develop'kaniini
Mastodon API: add follow_requests_count See merge request pleroma/pleroma!1726
2019-09-29Merge branch 'chores/1691-breaking-change' into 'develop'Haelwenn
!1691 is a breaking change + documentation fixes See merge request pleroma/pleroma!1739
2019-09-29CHANGELOG.md: Sorting, colon after breakingHaelwenn (lanodan) Monnier
[ci skip]
2019-09-29admin_api.md: Put data-type info as the valuesHaelwenn (lanodan) Monnier
Similar to how the other responses examples are done, this also makes it proper JSON (as it doesn’t have comments).
2019-09-29CHANGELOG.md: !1691 is a breaking changeHaelwenn (lanodan) Monnier
!1691: https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
2019-09-28Merge branch 'chore/update-docs' into 'develop'Haelwenn
Update admin_api.md See merge request pleroma/pleroma!1738
2019-09-29Update admin_api.mdMaxim Filippov
2019-09-28Merge branch 'tests/mastodon_api_controller.ex' into 'develop'Haelwenn
tests for mastodon_api_controller.ex See merge request pleroma/pleroma!1639
2019-09-28Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-28Merge branch 'bugfix/post-empty-status' into 'develop'Haelwenn
status_controller.ex: Posting media status without content defined See merge request pleroma/pleroma!1735
2019-09-28status_controller.ex: Posting media status without content definedHaelwenn (lanodan) Monnier
2019-09-27Merge branch 'fix/empty-attachment-statuses' into 'develop'rinpatch
Fix not being able to post empty statuses with attachments See merge request pleroma/pleroma!1734
2019-09-28Fix not being able to post empty statuses with attachmentsrinpatch
Attachment field was filled in after the empty status check
2019-09-27Merge branch 'remote-ip' into 'develop'Haelwenn
Add `remote_ip` plug See merge request pleroma/pleroma!1608
2019-09-27Add `remote_ip` plugminibikini
2019-09-27Merge branch 'split-masto-api/follow-requests' into 'develop'kaniini
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController` See merge request pleroma/pleroma!1730
2019-09-27Merge branch 'split-masto-api/domain-blocks' into 'develop'kaniini
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController` See merge request pleroma/pleroma!1729
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 11:19:10 +0000