summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-06activitypub: help ecto build a better query for thread mute filteringAriadne Conill
using an indexed value in thread_mute table helps ecto build a better query.
2019-09-06tests for mastodon_api_controller.exMaksim Pechnikov
2019-09-06generating remote usersAlex S
2019-09-06Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop'rinpatch
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog See merge request pleroma/pleroma!1638
2019-09-06Prioritize the removal of TwitterAPI and :accept_blocks in the changelogrinpatch
2019-09-06docs fixesAlex S
2019-09-06Merge branch 'develop' into issue/1218Maksim Pechnikov
2019-09-06[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06Refactor `add_link_headers/7` -> `add_link_headers/3`Egor Kislitsyn
2019-09-06Merge branch 'so-long-twitterapi' into 'develop'rinpatch
Removing TwitterAPI See merge request pleroma/pleroma!1605
2019-09-06Merge branch 'update-frontend-e75ac9dd' into 'develop'rinpatch
Update frontend bundle to e75ac9dd See merge request pleroma/pleroma!1635
2019-09-06Update frontend bundle to e75ac9ddrinpatch
2019-09-05Merge branch 'hotifx/emoji-trailing' into 'develop'rinpatch
Call TrailingFormatPlug for /api/pleroma/emoji See merge request pleroma/pleroma!1634
2019-09-05Call TrailingFormatPlug for /api/pleroma/emojirinpatch
Apparently Pleroma-FE still calls it with trailing '.json'
2019-09-05Reverse reports listMaxim Filippov
2019-09-05generatoin and fetchingAlex S
2019-09-05one more temp commitAlex S
2019-09-05temp commitAlex S
2019-09-05Merge branch 'feature/mastoapi-accounts-external' into 'develop'Haelwenn
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id` See merge request pleroma/pleroma!1622
2019-09-05Move checking for restrict_local to User.get_cached_by_id_or_nicknamerinpatch
2019-09-05Merge branch 'fix/endless-poll-handling' into 'develop'rinpatch
Mastodon API Poll view: Fix handling of polls without an end date See merge request pleroma/pleroma!1631
2019-09-05Mastodon API Poll view: Fix handling of polls without an end daterinpatch
2019-09-05Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov
2019-09-05Merge branch 'fix/safe-render-notifications' into 'develop'rinpatch
Do not crash if one notification failed to render See merge request pleroma/pleroma!1630
2019-09-05Do not crash if one notification failed to renderrinpatch
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-04fix formattingMaksim Pechnikov
2019-09-04Apply suggestion to lib/pleroma/web/activity_pub/utils.exMaksim
2019-09-04Apply suggestion to lib/pleroma/web/activity_pub/utils.exMaksim
2019-09-04PleromaAPIController: Add emoji reactions.lain
2019-09-04Return total for reportsMaxim Filippov
2019-09-04Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov
2019-09-04don't try to truncate non-stringsSadposter
2019-09-04truncate remote user bio/display nameSadposter
2019-09-04fetch_announcements -> take_announcementsMaksim Pechnikov
2019-09-04add tests for activity_pub/utils.exMaksim Pechnikov
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-03ActivityPub: Save emoji reactions in object.lain
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-03[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # CHANGELOG.md
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 00:51:13 +0000