Maksim Pechnikov 29a98b86b7 Merge branch 'develop' into issue/1383

2019-12-04 09:34:44 +03:00

..

activity_pub

Merge branch 'feature/move-activity' into 'develop'

2019-12-02 16:26:19 +00:00

admin_api

Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance

2019-11-25 01:46:18 +09:00

auth

…

channels

…

common_api

Merge branch 'feature/move-activity' into 'develop'

2019-12-02 16:26:19 +00:00

federator

kill almost all of the OStatus module

2019-10-18 14:50:09 +00:00

feed

add subject to atom feed

2019-11-10 11:10:20 +03:00

mailer

…

mastodon_api

Merge branch 'develop' into issue/1383

2019-12-04 09:34:44 +03:00

media_proxy

…

metadata

Extract RSS Feed functionality from OStatus

2019-10-07 12:20:41 +00:00

mongooseim

New rate limiter

2019-11-11 12:13:06 +00:00

nodeinfo

Add fieldsLimit to metadata of nodeinfo

2019-11-15 18:52:31 +09:00

oauth

moved OAuth.Token.CleanWorker to Oban Periodic jobs

2019-11-25 14:32:20 +03:00

ostatus

OStatus controller: don't serve json at /notice/, redirect instead

2019-11-25 17:55:17 +03:00

pleroma_api/controllers

Merge branch 'reactions' into 'develop'

2019-11-14 08:47:10 +00:00

push

Merge branch 'feature/move-activity' into 'develop'

2019-12-02 16:26:19 +00:00

rich_media

…

static_fe

Support redirecting by activity UUID in static FE as well.

2019-11-13 08:22:11 -08:00

streamer

streamer: use direct object for filter checks when there is no valid child object in an activity

2019-11-03 09:05:12 -06:00

templates

Merge branch 'feature/static-fe' into 'develop'

2019-11-11 19:10:44 +00:00

twitter_api

[#1304] Moved remaining fields from User.Info to User.

2019-10-20 13:42:42 +03:00

views

Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation

2019-10-20 20:43:18 +03:00

web_finger

webfinger: stop pulling Salmon data out of WebFinger

2019-10-18 14:50:09 +00:00

xml

…

chat_channel.ex

Fix merge

2019-09-30 19:10:54 +07:00

controller_helper.ex

Extract poll actions from MastodonAPIController to PollController

2019-10-01 11:44:34 +07:00

endpoint.ex

Set better Cache-Control header for static content

2019-11-06 16:41:19 +03:00

fallback_redirect_controller.ex

…

gettext.ex

…

masto_fe_controller.ex

Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation

2019-10-20 20:43:18 +03:00

metadata.ex

…

oauth.ex

…

rel_me.ex

add missing tesla mocks

2019-11-04 15:18:32 +00:00

router.ex

Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance

2019-11-25 01:46:18 +09:00

translation_helpers.ex

Discard identifier, if empty

2019-10-01 19:43:22 +03:00

uploader_controller.ex

…

web.ex

…