Haelwenn b536e57124 Merge branch '1866-last-status-stuff' into 'develop' ...

Resolve "/api/v1/conversations returns the wrong `last_status`"

Closes #1866

See merge request pleroma/pleroma!2647

2020-06-16 18:10:00 +00:00

..

activity_pub

Conversations: Return last dm for conversation, not last message.

2020-06-15 12:27:13 +02:00

admin_api

Mogrify args as custom tuples

2020-06-16 15:53:28 +03:00

api_spec

Merge branch '1851-favorites-pagination' into 'develop'

2020-06-13 17:20:43 +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

Conversations: Return last dm for conversation, not last message.

2020-06-15 12:27:13 +02:00

media_proxy

…

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

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

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

translation_helpers.ex

…

uploader_controller.ex

…

web.ex

…