aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-04Merge branch 'dockerfile-touchups' into 'develop'rinpatch
Update Dockerfile + some touchups to docker.exs See merge request pleroma/pleroma!1624
2019-09-04Switch to alpine:3.9 to avoid dlsym errorsAshlynn Anderson
2019-09-04Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'Haelwenn
Mastodon API: Add `pleroma.thread_muted` to Status entity See merge request pleroma/pleroma!1626
2019-09-04Mastodon API: Add `pleroma.thread_muted` to Status entityrinpatch
Needed for pleroma-fe!941
2019-09-04Merge branch 'feature/mastoapi-read-notifications' into 'develop'Haelwenn
Extend `/api/pleroma/notifications/read` to mark multiple notifications as read and make it respond with Mastoapi entities See merge request pleroma/pleroma!1625
2019-09-04Clarify that read notifications are returnedrinpatch
2019-09-04Apply suggestion to docs/api/pleroma_api.mdrinpatch
2019-09-04Apply suggestion to lib/pleroma/notification.exrinpatch
2019-09-04Extend `/api/pleroma/notifications/read` to mark multiple notificationsrinpatch
as read and make it respond with Mastoapi entities
2019-09-03Mastdon API: Add ability to get a remote account by nickname torinpatch
`/api/v1/accounts/:id`
2019-09-03Switch to official elixir:1.9-alpine image for buildAshlynn Anderson
2019-09-03Remove dynamic config as default, add healthcheckAshlynn Anderson
2019-09-03Merge branch 'feature/pagination-total' into 'develop'rinpatch
Return total items count from pagination + tests See merge request pleroma/pleroma!1620
2019-09-03Return "total" optionallyMaxim Filippov
2019-09-02Return total from pagination + testsMaxim Filippov
2019-08-31credo fixesrinpatch
2019-08-31Add back /api/qvitter/statuses/notifications/read.jsonrinpatch
2019-08-31Remove a useless importrinpatch
2019-08-31Add a changelog entry for twitterapi removal and fix credo issuesrinpatch
2019-08-31Remove TwitterAPI representersrinpatch
2019-08-31Remove Mention of TwitterAPI in readmerinpatch
2019-08-31Remove Activity, User and Notification views from TwitterAPIrinpatch
2019-08-31Remove most of Pleroma.Web.TwitterAPI.TwitterAPIrinpatch
2019-08-30Merge branch 'iss-930-media' into 'develop'feld
Fix missing changes in pleroma/pleroma!1197 See merge request pleroma/pleroma!1613
2019-08-30Fix missing changes in pleroma/pleroma!1197kPherox
2019-08-30Merge branch 'fix/antifollowbot-and-relays' into 'develop'kaniini
Fix AntiFollowbotPolicy when trying to follow a relay Closes #1231 See merge request pleroma/pleroma!1610
2019-08-30Fix AntiFollowbotPolicy when trying to follow a relayfeld
2019-08-28Merge branch 'fix-osada-follow' into 'develop'Haelwenn
Transmogrifier: Fix follow handling when the actor is an object. Closes #1211 See merge request pleroma/pleroma!1604
2019-08-27Merge branch 'list-controller' into 'develop'lain
Extract list actions from `MastodonAPIController` into `ListController` See merge request pleroma/pleroma!1600
2019-08-27Merge branch 'tests/activity_pub' into 'develop'lain
added tests for ActivityPub.like\unlike See merge request pleroma/pleroma!1606
2019-08-27Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exMaksim
2019-08-27Transmogrifier: Use Containment.get_actor to get actors.lain
2019-08-27added tests for ActivityPub.like\unlikeMaksim Pechnikov
2019-08-27Remove most of TwitterAPIControllerrinpatch
2019-08-26Merge branch 'fix-typo' into 'develop'lain
Fix typo See merge request pleroma/pleroma!1603
2019-08-26Transmogrifier: Fix follow handling when the actor is an object.lain
2019-08-27Fix typoEgor Kislitsyn
2019-08-26Merge branch 'fix/sporadic-test' into 'develop'rinpatch
Fix sporadic test Closes #1221 See merge request pleroma/pleroma!1602
2019-08-26Fix sporadic testMaxim Filippov
2019-08-26Merge branch 'disable-rate-limiter' into 'develop'kaniini
Disable rate limiter by default Closes #1217 See merge request pleroma/pleroma!1601
2019-08-26Disable rate limiter by defaultEgor Kislitsyn
2019-08-26Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers ↵Egor Kislitsyn
and test/web/mastodon_api/views
2019-08-26Move mastodon_api/*_controller.ex to mastodon_api/controllers/Egor Kislitsyn
2019-08-26Extract MastodonAPIController's list actions into ↵Egor Kislitsyn
MastodonAPI.ListController; Add more tests
2019-08-26Extract MastodonAPI.MastodonAPIController.errors/2 to ↵Egor Kislitsyn
MastodonAPI.FallbackController
2019-08-26Add validation in Pleroma.List.create/2Egor Kislitsyn
2019-08-25Merge branch 'issue/1177' into 'develop'kaniini
[#1177] fixed unfollow for relay actor See merge request pleroma/pleroma!1589
2019-08-25Merge branch 'feature/moderation-log' into 'develop'kaniini
Log admin/moderator actions See merge request pleroma/pleroma!1582
2019-08-25Log admin/moderator actionsMaxim Filippov
2019-08-25Merge branch 'fix-all-custom-fields-deleted' into 'develop'kaniini
Fix not to use unupdated attachments when all fields are deleted See merge request pleroma/pleroma!1596
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 12:18:49 +0000