Age | Commit message (Collapse) | Author |
|
|
|
|
|
1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
|
|
|
|
1149-oban-job-queue
# Conflicts:
# docs/config.md
|
|
|
|
1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
`/api/v1/accounts/:id`
|
|
branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
|
|
|
and test/web/mastodon_api/views
|
|
MastodonAPI.ListController; Add more tests
|
|
|
|
|
|
|
|
|
|
sixohsix/pleroma-post_expiration
|
|
|
|
1149-oban-job-queue
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
|
|
|
|
Add custom profile fields
See merge request pleroma/pleroma!1488
|
|
|
|
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|