Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
features/mastoapi/2.6.0-conversations
|
|
|
|
|
|
|
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
|
|
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
|
|
|
|
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
|
|
|
|
|
twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
|
# Conflicts:
# config/config.exs
# docs/config.md
|
|
Scheduled activities
See merge request pleroma/pleroma!989
|
|
keyword style change
|
|
|
|
|
|
code style and little renamings
|
|
settings refactoring.
|
|
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Also adds a quick error case on the subscription endpoints
to avoid 500s
|
|
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
|
|
|
|
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
|
|
|
|
|
fix for twitter api tests
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Added in pleroma extensions, but can be moved whenever
|
|
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
|
|
|
|
|
|
|
|
|
|
|
|
correct terminology and fix summaries in mastoapi
|