Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions ...

# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex

2018-12-06 20:15:16 +07:00

..

activity_pub

Merge branch '210_twitter_api_uploads_alt_text' into 'develop'

2018-12-06 07:36:21 +00:00

admin_api

Fix admin api.

2018-12-01 09:03:16 +01:00

channels

Various runtime configuration fixes

2018-11-19 10:09:24 +01:00

common_api

Fix most mastodon api bugs.

2018-11-20 20:12:39 +01:00

federator

Make retry queue optional.

2018-12-04 19:54:42 +01:00

http_signatures

HTTP sig fixes.

2018-11-27 17:42:45 +01:00

mastodon_api

Merge branch 'develop' into feature/compat/push-subscriptions

2018-12-06 20:15:16 +07:00

media_proxy

Fix media proxy config defaults

2018-12-02 11:24:02 +01:00

nodeinfo

nodeinfo: add mrf_user_allowlist data

2018-11-26 23:52:19 +00:00

oauth

oauth: fix token decode regression

2018-11-11 05:26:39 +00:00

ostatus

status_code -> status

2018-12-04 14:04:06 +03:00

push

show warning if VAPID is not set

2018-12-06 19:56:56 +07:00

salmon

fix http request in Salmon

2018-12-04 14:04:06 +03:00

templates

Replace this hardcoded <title>

2018-11-26 22:51:25 +00:00

twitter_api

Merge branch 'develop' into feature/compat/push-subscriptions

2018-12-06 20:15:16 +07:00

views

Format the code.

2018-03-30 15:01:53 +02:00

web_finger

status_code -> status

2018-12-04 14:04:06 +03:00

websub

status_code -> status

2018-12-04 14:04:06 +03:00

xml

XML: handle erlang errors too

2018-06-06 16:27:13 +00:00

chat_channel.ex

Format the code.

2018-03-30 15:01:53 +02:00

endpoint.ex

reverse proxy / uploads

2018-11-30 18:00:47 +01:00

gettext.ex

Phoenix skeleton

2017-03-17 17:09:58 +01:00

router.ex

Merge branch 'develop' into feature/compat/push-subscriptions

2018-12-06 20:15:16 +07:00

streamer.ex

Merge remote-tracking branch 'origin' into validate-user-info

2018-11-30 17:34:20 +01:00

web.ex

Format the code.

2018-03-30 15:01:53 +02:00