summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-29Remove subscription_notifications table if it existedrinpatch
Followup to !1741
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
2019-09-27Merge branch 'split-masto-api/scheduled-statuses' into 'develop'kaniini
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController` See merge request pleroma/pleroma!1728
2019-09-27Merge branch 'split-masto-api/filters' into 'develop'kaniini
Extract filter actions from `MastodonAPIController` to `FilterController` See merge request pleroma/pleroma!1725
2019-09-27Extract domain blocks actions from `MastodonAPIController` to ↵Egor Kislitsyn
`DomainBlockController`
2019-09-27Extract follow requests actions from `MastodonAPIController` to ↵Egor Kislitsyn
`FollowRequestController`
2019-09-27Cleanup ScheduledActivityViewEgor Kislitsyn
2019-09-27Extract scheduled statuses actions from `MastodonAPIController` to ↵Egor Kislitsyn
`ScheduledActivityController`
2019-09-27Merge branch 'fix/subscription-notification-view' into 'develop'kaniini
Fix SubscriptionNotificationView See merge request pleroma/pleroma!1727
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
Extract status actions from `MastodonAPIController` to `StatusController` See merge request pleroma/pleroma!1719
2019-09-27changelogAriadne Conill
2019-09-27mastodon api: implement follow_requests_countAriadne Conill
2019-09-27Move view logic from StatusController.context to StatusView and add a testEgor Kislitsyn
2019-09-27Move StatusController tests from MastodonAPIControllerTest to ↵Egor Kislitsyn
StatusControllerTest
2019-09-27Merge branch 'refactor/subscription' into 'develop'kaniini
Refactor subscription functionality Closes #1130 See merge request pleroma/pleroma!1664
2019-09-27Extract status actions from `MastodonAPIController` into `StatusController`Egor Kislitsyn
2019-09-27Merge branch 'patch-2' into 'develop'kaniini
Minor corrections and clarification for Alpine standard v.3.10 See merge request pleroma/pleroma!1594
2019-09-27Merge branch 'update/docs-jp' into 'develop'kaniini
Update Japanese document to follow English document See merge request pleroma/pleroma!1615
2019-09-27Merge branch 'list-packs-docs' into 'develop'kaniini
Add list_from endpoint to the pleroma_api docs See merge request pleroma/pleroma!1720
2019-09-27Merge branch 'patch-1' into 'develop'kaniini
Fix code block for admin api document See merge request pleroma/pleroma!1722
2019-09-27Merge branch 'refactor/common_api' into 'develop'kaniini
Refactor `CommonAPI.post/2` See merge request pleroma/pleroma!1713
2019-09-27Merge branch 'refactor/timeline-controller' into 'develop'kaniini
Extract timeline actions from `MastodonAPIController` into `TimelineController` See merge request pleroma/pleroma!1648
2019-09-26Merge branch 'chore/changelog-sync' into 'develop'rinpatch
Sync changelogs between master and develop See merge request pleroma/pleroma!1724
2019-09-27Sync changelogs between master and developrinpatch
2019-09-26add deprecated tagMaksim Pechnikov
2019-09-26Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-26Merge branch 'feature/moderation-log-filters' into 'develop'feld
Moderation log filters See merge request pleroma/pleroma!1607
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-26Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-26Update CHANGELOGRoman Chvanikov
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 14:40:25 +0000