Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ...

# Conflicts:
#	lib/pleroma/user.ex

2019-12-04 18:56:31 +03:00

..

account_controller.ex

Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

2019-12-04 18:56:31 +03:00

app_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

auth_controller.ex

New rate limiter

2019-11-11 12:13:06 +00:00

conversation_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-02 20:42:40 +03:00

custom_emoji_controller.ex

Add CustomEmojiController

2019-10-02 19:16:34 +07:00

domain_block_controller.ex

[#1304] Moved remaining fields from User.Info to User.

2019-10-20 13:42:42 +03:00

fallback_controller.ex

Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController

2019-08-26 19:16:40 +07:00

filter_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-02 20:42:40 +03:00

follow_request_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

instance_controller.ex

Extract instance actions from MastodonAPIController to InstanceController

2019-10-02 14:13:52 +07:00

list_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-02 20:42:40 +03:00

marker_controller.ex

add Markers /api/v1/markers

2019-10-17 15:26:59 +03:00

mastodon_api_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

media_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

notification_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

poll_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

report_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

scheduled_activity_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-02 20:42:40 +03:00

search_controller.ex

New rate limiter

2019-11-11 12:13:06 +00:00

status_controller.ex

New rate limiter

2019-11-11 12:13:06 +00:00

subscription_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

suggestion_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

timeline_controller.ex

add subject to atom feed

2019-11-10 11:10:20 +03:00