aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-09-26Add Pleroma.JobQueueMonitorEgor Kislitsyn
2019-09-26Add list_from endpoint to the pleroma_api docsEkaterina Vaartis
2019-09-26Merge developRoman Chvanikov
2019-09-26Extract timeline actions from `MastodonAPIController` into `TimelineController`Egor Kislitsyn
2019-09-26Cleanup CommonAPIEgor Kislitsyn
2019-09-26Add ActivityDraft.with_valid/2Egor Kislitsyn
2019-09-26Add CommonAPI.ActivityDraftEgor Kislitsyn
2019-09-26Merge branch 'refactor/notification-controller' into 'develop'kaniini
Extract notification actions from `MastodonAPIController` into `NotificationController` See merge request pleroma/pleroma!1646
2019-09-26Merge branch 'feature/return-link-for-password-reset' into 'develop'kaniini
Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691
2019-09-26Merge branch 'refactor/user' into 'develop'kaniini
Simplify updating user's `info` See merge request pleroma/pleroma!1712
2019-09-26Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' ↵kaniini
into 'develop' Activitypub/Add `discoverable` parameter in ActivityPub actor See merge request pleroma/pleroma!1641
2019-09-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26Merge branch 'hex-flake-id' into 'develop'kaniini
Replace `Pleroma.FlakeId` with `flake_id` hex package See merge request pleroma/pleroma!1692
2019-09-26Merge branch 'feature/activities-pagination-by-offset' into 'develop'kaniini
Allow activities pagination via limit/offset See merge request pleroma/pleroma!1714
2019-09-26Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'kaniini
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern See merge request pleroma/pleroma!1716
2019-09-25Merge branch 'hotfix/hackney-1.15.2' into 'develop'rinpatch
mix.lock: Bump hackney to 1.15.2 Closes #1267 See merge request pleroma/pleroma!1717
2019-09-25mix.lock: Bump hackney to 1.15.2Haelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
2019-09-25Merge branch 'support/test' into 'develop'rinpatch
clears `robot.txt` after tests See merge request pleroma/pleroma!1715
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 14:43:46 +0000