Ivan Tashkinov 0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ...

# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex

2020-04-22 18:51:59 +03:00

..

activity_pub

Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.

2020-04-21 16:29:19 +03:00

admin_api

Merge branch 'feature/1584-client-captcha-options' into 'develop'

2020-04-17 09:19:35 +00:00

api_spec

Add OpenAPI

2020-04-01 23:13:08 +04:00

auth

[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.

2020-04-17 21:21:10 +03:00

common_api

Merge branch 'develop' into features/remove-user-source_data

2020-04-16 21:28:52 +03:00

feed

fix for use of published from different entities

2020-04-16 18:05:36 +03:00

instances

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

mastodon_api

Merge branch 'bugfix/following-fix-status-code' into 'develop'

2020-04-22 15:33:04 +00:00

media_proxy

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

metadata

restrict remote users from indexing

2020-04-01 09:57:12 +03:00

mongooseim

Update Copyrights

2020-03-03 16:44:49 -06:00

oauth

Merge branch 'feature/funkwhale-audio' into 'develop'

2020-03-29 19:18:22 +00:00

ostatus

Merge branch 'remake-remodel-2' into 'develop'

2020-04-06 11:59:01 +00:00

pleroma_api/controllers

Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.

2020-04-21 16:29:19 +03:00

plugs

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

push

WebPush: Return proper values for jobs.

2020-04-22 13:28:34 +02:00

rich_media

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

static_fe

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

streamer

Streamer: Stream boosts to the boosting user.

2020-04-22 17:21:13 +02:00

twitter_api

Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks

2020-04-22 18:51:59 +03:00

views

Update Copyrights

2020-03-03 16:44:49 -06:00

web_finger

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

chat_channel_test.exs

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

fallback_test.exs

Update Copyrights

2020-03-03 16:44:49 -06:00

federator_test.exs

Federator: Return proper values for jobs

2020-04-22 13:28:52 +02:00

masto_fe_controller_test.exs

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

node_info_test.exs

test for default features and changelog entry

2020-03-31 18:22:25 +03:00

rel_me_test.exs

Update Copyrights

2020-03-03 16:44:49 -06:00

uploader_controller_test.exs

Update Copyrights

2020-03-03 16:44:49 -06:00