Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock		2018-12-06 19:55:58 +07:00
..
activity_pub	MRF: add user allowlist module	2018-11-26 23:51:58 +00:00
admin_api	Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit	2018-11-17 22:12:14 +01:00
channels	Various runtime configuration fixes	2018-11-19 10:09:24 +01:00
common_api	common api: utils: flip to/cc for mentions	2018-11-08 19:17:01 +00:00
federator	Merge branch 'runtime-fixes' into 'develop'	2018-11-20 22:25:35 +00:00
http_signatures	Rename id helper method.	2018-05-26 13:57:11 +02:00
mastodon_api	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
media_proxy	mediaproxy: fix empty url & add some tests	2018-11-20 17:50:03 +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	Various runtime configuration fixes	2018-11-19 10:09:24 +01:00
push	Add web push support	2018-12-06 19:29:04 +07:00
salmon	Probably better way of handling non-follow undos in ostatus	2018-05-11 11:59:53 -04: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 19:55:58 +07:00
views	Format the code.	2018-03-30 15:01:53 +02:00
web_finger	Runtime configured router	2018-11-05 15:19:03 +01:00
websub	Federator: add retry queue.	2018-11-18 17:46:29 +02: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	Various runtime configuration fixes	2018-11-19 10:09:24 +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 19:55:58 +07:00
streamer.ex	Streamer: Don't send unwanted DMs to list streams	2018-11-27 20:50:19 +01:00
web.ex	Format the code.	2018-03-30 15:01:53 +02:00