| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | 1149-oban-job-queue
# Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs | 
|  | Removing TwitterAPI
See merge request pleroma/pleroma!1605 | 
|  | Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622 | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | Needed for pleroma-fe!941 | 
|  | as read and make it respond with Mastoapi entities | 
|  | `/api/v1/accounts/:id` | 
|  | 1149-oban-job-queue
# Conflicts:
#	CHANGELOG.md | 
|  |  | 
|  |  | 
|  | moved to helper. | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	config/config.exs | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604 | 
|  | Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600 | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | and test/web/mastodon_api/views | 
|  | MastodonAPI.ListController; Add more tests | 
|  |  |