summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-02Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'kaniini
Send an identifier alongside with error message in OAuthController See merge request pleroma/pleroma!1765
2019-10-02Merge branch 'split-masto-api/auth' into 'develop'kaniini
Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759
2019-10-02Merge branch 'features/private-reblogs' into 'develop'kaniini
Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766
2019-10-02Merge branch 'update/admin-fe-20191001' into 'develop'kaniini
Update AdminFE bundle See merge request pleroma/pleroma!1767
2019-10-01Update AdminFE bundleMark Felder
2019-10-01Merge branch 'feature/expose-attachment-size' into 'develop'feld
Add upload limits to /api/v1/instance See merge request pleroma/pleroma!1614
2019-10-01Revert "Add upload limits to /api/v1/instance"feld
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01Store private announcements in object.data["announcements"], filter them on ↵Thibaut Girka
display
2019-10-01Merge branch 'feature/track-reverse-proxy-failures' into 'develop'feld
Track failed proxy urls and don't request them again Closes #1197 See merge request pleroma/pleroma!1618
2019-10-01Track failed proxy urls and don't request them againSergey Suprunenko
2019-10-01Fix returned visibility of announces in MastodonAPIThibaut Girka
2019-10-01Add tests for privately announcing statuses via APIThibaut Girka
2019-10-01Allow users to announce privately, including own private notesThibaut Girka
2019-10-01Discard identifier, if emptyMaxim Filippov
2019-10-01Add testsThibaut Girka
2019-10-01Ensure self-announces do not widen the audience of the original postThibaut Girka
2019-10-01Make activity announceable by its author.KokaKiwi
2019-10-01Send an identifier alongside with error message in OAuthControllerMaxim Filippov
2019-10-01Extract auth actions from `MastodonAPIController` to `AuthController`Egor Kislitsyn
2019-10-01Merge branch 'split-masto-api/apps' into 'develop'kaniini
Extract apps actions from `MastodonAPIController` to `AppController` See merge request pleroma/pleroma!1758
2019-10-01Extract apps actions from `MastodonAPIController` to `AppController`Egor Kislitsyn
2019-10-01Merge branch 'split-masto-api/suggestions' into 'develop'kaniini
Extract suggestions actions from `MastodonAPIController` to `SuggestionController` See merge request pleroma/pleroma!1757
2019-10-01Extract suggestions actions from `MastodonAPIController` to ↵Egor Kislitsyn
`SuggestionController`
2019-10-01Merge branch 'split-masto-api/media' into 'develop'kaniini
Extract media actions from `MastodonAPIController` to `MediaController` See merge request pleroma/pleroma!1756
2019-10-01Extract media actions from `MastodonAPIController` to `MediaController`Egor Kislitsyn
2019-10-01Merge branch 'split-masto-api/polls' into 'develop'kaniini
Extract poll actions from `MastodonAPIController` to `PollController` See merge request pleroma/pleroma!1755
2019-10-01Extract poll actions from `MastodonAPIController` to `PollController`Egor Kislitsyn
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-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 22:53:06 +0000