eal a938d07df1 Merge branch 'bugfix/mastofe_thread_render' into 'develop' ...

lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads

See merge request pleroma/pleroma!223

2018-06-15 20:43:30 +00:00

..

activity_pub

Merge branch 'bugfix/mrf-orphaning' into 'develop'

2018-06-14 07:20:54 +00:00

channels

Clean up unused aliases and imports

2018-05-04 21:25:31 +00:00

common_api

Better error handling in TwitterApiController.

2018-06-03 19:11:22 +02:00

federator

activitypub: normalize the actor to ensure we have its URI

2018-05-19 03:28:28 -05:00

http_signatures

Rename id helper method.

2018-05-26 13:57:11 +02:00

mastodon_api

Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads

2018-06-15 22:14:17 +02:00

media_proxy

Format the code.

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

nodeinfo

Clean up unused aliases and imports

2018-05-04 21:25:31 +00:00

oauth

Merge branch 'bugfix/oauth2-param-name' into 'develop'

2018-06-14 07:14:18 +00:00

ostatus

Fix users lookup/return type

2018-06-07 23:18:45 -07:00

salmon

Probably better way of handling non-follow undos in ostatus

2018-05-11 11:59:53 -04:00

templates

Fix typo in MastoFE login page.

2018-04-24 21:58:45 +00:00

twitter_api

Merge branch 'feature/twitterapi-unrepeat' into 'develop'

2018-06-14 07:19:36 +00: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

Merge branch 'favicon_tag' into 'develop'

2018-04-24 05:54:28 +00:00

gettext.ex

Phoenix skeleton

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

router.ex

Fix typo

2018-06-15 22:01:17 +02:00

streamer.ex

streamer: don't relay boosts of messages which would otherwise be blocked

2018-06-13 21:59:56 +00:00

web.ex

Format the code.

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