aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2019-09-03Return "total" optionallyMaxim Filippov
2019-09-02Return total from pagination + testsMaxim Filippov
2019-09-02[#1149] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` ↵Ivan Tashkinov
moved to helper.
2019-09-02add mandatory fields for user updateSadposter
2019-09-02use atom key for fieldsSadposter
2019-09-02mix formatSadposter
2019-09-02truncate fields for remote users insteadSadposter
2019-09-01Fix testsMaxim Filippov
2019-09-01Changelog entryMaxim Filippov
2019-09-01Add pagination to logsMaxim Filippov
2019-08-31[#1149] Refactored Oban workers API (introduced `enqueue/3`).Ivan Tashkinov
2019-08-31[#1149] Addressed code review comments (code style, jobs pruning etc.).Ivan Tashkinov
2019-08-31[#1149] Added Oban job for "activity_expiration". Merged remote-tracking ↵Ivan Tashkinov
branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts: # config/config.exs
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-31Update Japanese document to follow English documentAkiraFukushima
2019-08-31Remove most of Pleroma.Web.TwitterAPI.TwitterAPIrinpatch
2019-08-31added Emoji structMaksim Pechnikov
2019-08-31StyleMaxim Filippov
2019-08-31Add ability to search moderation logsMaxim Filippov
2019-08-30minor: Fix version dotultem
2019-08-30added Emoji.FormatterMaksim Pechnikov
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-30Apply suggestion to lib/pleroma/emoji/loader.exMaksim
2019-08-30added code\path fields without html tags in etsMaksim Pechnikov
2019-08-30division emoji.ex on loader.ex and emoji.exMaksim Pechnikov