lain 7d542450b1 Merge branch 'develop' into '1865-media-only' ...

# Conflicts:
#   CHANGELOG.md

2020-06-20 09:33:18 +00:00

..

activity_pub

Merge branch 'develop' into '1865-media-only'

2020-06-20 09:33:18 +00:00

admin_api

Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url

2020-06-17 13:13:55 -05:00

api_spec

Merge branch 'issue/1855' into 'develop'

2020-06-19 20:38:22 +00:00

auth

…

channels

…

common_api

Merge branch 'global-status-expiration' into 'develop'

2020-06-12 14:14:09 +00:00

federator

…

feed

Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys

2020-06-05 23:15:10 +04:00

mailer

…

mastodon_api

[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.

2020-06-19 16:14:06 +03:00

media_proxy

fix test

2020-06-18 05:06:28 +03:00

metadata

…

mongooseim

…

nodeinfo

…

oauth

Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})

2020-06-05 14:48:02 +00:00

ostatus

OStatusController: Add Mastodon activity compat route.

2020-05-22 17:11:59 +02:00

pleroma_api

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

2020-06-08 11:19:18 +02:00

push

WebPush: Don't break on contentless chat messages.

2020-06-06 09:46:07 +02:00

rich_media

Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers

2020-06-15 16:03:40 +04:00

static_fe

Use atoms as keys in ActivityPub.fetch_* functions options

2020-06-04 21:36:26 +04:00

streamer

ChatMessageReference -> Chat.MessageReference

2020-06-06 11:51:10 +02:00

templates

Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts

2020-06-01 17:38:57 +04:00

twitter_api

…

views

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

2020-06-05 16:53:56 +02:00

web_finger

…

xml

…

api_spec.ex

…

chat_channel.ex

…

controller_helper.ex

ControllerHelper: Always return id field.

2020-06-13 13:12:43 +02:00

embed_controller.ex

…

endpoint.ex

…

fallback_redirect_controller.ex

…

gettext.ex

…

masto_fe_controller.ex

…

metadata.ex

…

oauth.ex

…

rel_me.ex

…

router.ex

added admin api for MediaProxy cache invalidation

2020-06-12 14:49:54 +03:00

translation_helpers.ex

…

uploader_controller.ex

…

web.ex

…