Haelwenn f918b6f86d Merge branch '1937-renaming' into 'develop' ...

ActivityPub: Don't rename a clashing nickname with the same ap id.

Closes #1937

See merge request pleroma/pleroma!2748

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

..

activity_pub

Merge branch '1937-renaming' into 'develop'

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

admin_api

Admin API: fix GET /api/pleroma/admin/users/:nickname/credentials returning 404 when getting the credentials of a remote user while :instance, :limit_to_local_content is set to :unauthenticated

2020-07-09 14:57:40 +03:00

api_spec

…

auth

…

common_api

ActivityPub: Remove follow and fix issues.

2020-07-08 17:07:24 +02:00

feed

…

instances

…

mastodon_api

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information

2020-07-10 12:26:53 +02:00

media_proxy

fix test

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

metadata

…

mongooseim

…

oauth

…

ostatus

…

pleroma_api

AccountController: Remove unused update_? routes.

2020-07-07 16:53:20 +02:00

plugs

…

preload

Preloaders: Remove status_net preloader

2020-07-06 12:24:45 +02:00

push

WebPush: Don't break on contentless chat messages.

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

rich_media

Fix tests

2020-06-15 16:20:05 +04:00

static_fe

StaticFE: Prioritize json in requests.

2020-06-26 16:27:39 +02:00

streamer

Streamer: Don't filter out announce notifications.

2020-07-04 17:11:37 +02:00

twitter_api

…

views

…

web_finger

…

chat_channel_test.exs

…

fallback_test.exs

…

federator_test.exs

moving mrf settings from instance to separate group

2020-06-16 18:32:18 +03:00

masto_fe_controller_test.exs

Rename user.settings column

2020-06-30 11:50:53 -05:00

node_info_test.exs

Nodeinfo: Add chat information back in.

2020-06-26 13:04:15 +02:00

rel_me_test.exs

…

uploader_controller_test.exs

…