aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2019-09-30Extract conversation actions from `MastodonAPIController` to ↵Egor Kislitsyn
ConversationController
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-28Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-28status_controller.ex: Posting media status without content definedHaelwenn (lanodan) Monnier
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 '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-27Extract domain blocks actions from `MastodonAPIController` to ↵Egor Kislitsyn
`DomainBlockController`
2019-09-27Extract follow requests actions from `MastodonAPIController` to ↵Egor Kislitsyn
`FollowRequestController`
2019-09-27Extract scheduled statuses actions from `MastodonAPIController` to ↵Egor Kislitsyn
`ScheduledActivityController`
2019-09-27Extract filter actions from `MastodonAPIController` to `FilterController`Egor 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-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 'refactor/timeline-controller' into 'develop'kaniini
Extract timeline actions from `MastodonAPIController` into `TimelineController` See merge request pleroma/pleroma!1648
2019-09-26Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
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-26Merge developRoman Chvanikov
2019-09-26Extract timeline actions from `MastodonAPIController` into `TimelineController`Egor 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-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
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-25Don't embed the first page in inboxes/outboxes and refactor the views torinpatch
follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.
2019-09-25Fix nodeinfo handlingEkaterina Vaartis
2019-09-25Add an API endpoint for listing remote packsEkaterina Vaartis
2019-09-25Allow activities pagination via limit/offsetMaxim Filippov
2019-09-24/api/ap/uploadMedia → /api/ap/upload_mediaHaelwenn (lanodan) Monnier
2019-09-24Add User.change_info/2 and User.update_info/2Egor Kislitsyn
2019-09-24Merge branch 'develop' into feature/return-link-for-password-resetMaxim Filippov
2019-09-24Extract notification actions from `MastodonAPIController` into ↵Egor Kislitsyn
`NotificationController`
2019-09-24Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-23Merge branch 'feature/force-password-reset' into 'develop'kaniini
Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705
2019-09-23Merge branch 'support-rel-ugc' into 'develop'kaniini
Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679
2019-09-23Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'kaniini
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703
2019-09-23Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'kaniini
added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651
2019-09-23Clean up viewsSteven Fuchs
2019-09-23updated testsMaksim Pechnikov
2019-09-23Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-23Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-23Merge branch 'better-emoji-packs' into 'develop'rinpatch
Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551
2019-09-23Emoji API Controller: Follow phoenix directory structurerinpatch