Roger Braun 1d3d66a841 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

2017-11-10 17:37:54 +01:00

..

activity_pub

Add actor column to activities.

2017-11-09 10:41:19 +01:00

channels

Phoenix skeleton

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

common_api

Allow self-rt.

2017-11-07 16:45:27 +01:00

federator

Handle subscriptions in queue.

2017-08-02 12:34:48 +02:00

mastodon_api

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

2017-11-10 17:37:54 +01:00

oauth

Fix tootdon logins.

2017-11-06 21:51:31 +02:00

ostatus

Re-fetch user data on salmon decode error.

2017-11-09 08:32:54 +01:00

salmon

Ignore padding for salmon public keys.

2017-08-25 15:09:05 +02:00

templates

Add password reset.

2017-10-19 17:37:24 +02:00

twitter_api

Merge branch 'following-you-in-user-view' into 'develop'

2017-11-08 17:57:13 +00:00

views

Add very basic oauth and mastodon api support.

2017-09-06 19:06:25 +02:00

web_finger

Revert "Longer timeouts for user fetching."

2017-11-07 09:41:35 +01:00

websub

Revert "Longer timeouts for user fetching."

2017-11-07 09:41:35 +01:00

xml

More resilient xml parsing.

2017-06-24 14:35:32 +02:00

endpoint.ex

Make emoji configurable in files.

2017-09-16 16:49:46 +02:00

gettext.ex

Phoenix skeleton

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

router.ex

TwitterAPI: Add blocks.

2017-11-08 00:04:53 +02:00

web.ex

Merge branch 'develop' into dtluna/pleroma-refactor/1

2017-05-05 11:46:59 +02:00