kaniini 76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api' ...

# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex

2018-09-03 14:55:42 +00:00

..

activity_pub

tests: add regression tests

2018-09-01 23:33:10 +00:00

common_api

Revert "Merge branch 'feature/rich-text' into 'develop'"

2018-08-31 09:51:20 +00:00

http_sigs

…

mastodon_api

Merge branch 'feature/mastodon_api_2.4.x' into 'develop'

2018-09-03 12:33:36 +00:00

oauth

Add OAuth controller tests

2018-06-06 03:18:11 +02:00

ostatus

test: ostatus controller: add AS2 fetching tests

2018-07-12 20:32:56 +00:00

salmon

…

twitter_api

Merge branch 'hotfix_broken_likes' into 'develop'

2018-09-02 12:37:00 +00:00

views

…

web_finger

webfinger: fix finding the XRD uri for statusnet instances

2018-05-21 12:41:31 +00:00

websub

…

federator_test.exs

…

node_info_test.exs

tests: add test for staffAccounts presence in nodeinfo

2018-09-03 14:48:36 +00:00

streamer_test.exs

Streamer: Don't send out stream events for blocked users.

2018-05-05 13:40:47 +02:00