summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-01Merge remote-tracking branch 'upstream/develop' into ↵kPherox
fix-prameter-name-of-accounts-update-credentials
2019-09-30Merge branch 'compact-undos' into 'develop'kaniini
Transmogrifier: Handle compact objects in undos. See merge request pleroma/pleroma!1752
2019-09-30Transmogrifier: Handle compact objects in undos.lain
2019-09-30Merge branch 'ci/build-otp-maint' into 'develop'kaniini
CI: Enable OTP release building for maint/* branches See merge request pleroma/pleroma!1749
2019-09-30CI: Enable OTP release building for maint/* branchesrinpatch
2019-09-30[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-09-30Merge branch 'split-masto-api/mascots' into 'develop'kaniini
Extract mascot actions from `MastodonAPIController` to MascotController See merge request pleroma/pleroma!1745
2019-09-30Merge branch 'update/admin-fe-20190930' into 'develop'kaniini
update admin fe See merge request pleroma/pleroma!1747
2019-09-30update admin feAriadne Conill
2019-09-30Extract mascot actions from `MastodonAPIController` to MascotControllerEgor Kislitsyn
2019-09-30Merge branch 'split-masto-api/accounts' into 'develop'kaniini
Extract account actions from `MastodonAPIController` to `AccountController` See merge request pleroma/pleroma!1731
2019-09-30Fix warning in TransmogrifierTestEgor Kislitsyn
2019-09-30Move update_credentials to MastodonAPI.AccountControllerEgor Kislitsyn
2019-09-30Move account_register, relationships and verify_credentials to ↵Egor Kislitsyn
MastodonAPI.AccountController
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]
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 21:38:09 +0000