kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay' ... # Conflicts: # lib/pleroma/web/activity_pub/utils.ex		2018-08-26 21:06:15 +00:00
..
activity_pub	Merge branch 'develop' into 'feature/relay'	2018-08-26 21:06:15 +00:00
channels	Clean up unused aliases and imports	2018-05-04 21:25:31 +00:00
common_api	fix test for converting bio \r\n to <br>.	2018-08-21 14:51:27 +01:00
federator	relay: do not relay in test mode	2018-08-06 08:35:56 +00:00
http_signatures	Rename id helper method.	2018-05-26 13:57:11 +02:00
mastodon_api	debug	2018-08-23 11:52:18 +09:00
media_proxy	Format the code.	2018-03-30 15:01:53 +02:00
nodeinfo	add suggestions/web config	2018-08-02 18:03:35 +09:00
oauth	Merge branch 'bugfix/oauth2-param-name' into 'develop'	2018-06-14 07:14:18 +00:00
ostatus	ostatus: return AS2 objects on /notice and /activities URLs like with /objects.	2018-07-12 17:15:47 +00:00
salmon	Probably better way of handling non-follow undos in ostatus	2018-05-11 11:59:53 -04:00
templates	/web/* template: Add class system-font	2018-07-03 17:26:47 +02:00
twitter_api	remove unused settings from /api/statusnet/config	2018-08-26 17:40:15 +09:00
views	Format the code.	2018-03-30 15:01:53 +02:00
web_finger	webfinger: refactor webfinger() functions	2018-06-13 06:42:27 +00:00
websub	Format the code.	2018-03-30 15:01:53 +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	activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header	2018-07-31 23:24:30 +00:00
gettext.ex
router.ex	Merge branch 'develop' into 'feature/relay'	2018-08-26 21:06:15 +00:00
streamer.ex	streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.	2018-06-27 13:07:23 +00:00
web.ex	Format the code.	2018-03-30 15:01:53 +02:00