lain fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id ... If we get a new user (identified by ap_id) that would have the same nickname as an existing user, give the existing user a nickname that is prepended with the user id, as this will never clash. This can happen when a user switches server software and that soft- ware generates ap ids in a different way.		2020-07-01 12:26:07 +02:00
..
activity_pub	ActivityPub: Handle clashing nicknames for the same ap id	2020-07-01 12:26:07 +02:00
admin_api	Merge develop	2020-06-23 20:56:55 +03:00
api_spec	Fix CastAndValidate plug	2020-06-29 17:33:00 +04:00
auth	copyright update	2020-05-18 15:15:51 +03:00
channels
common_api	AccountController: Extract blocking to CommonAPI.	2020-06-25 11:44:04 +02: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	Merge branch '1031-parent-visible' into 'develop'	2020-06-29 08:39:51 +00:00
media_proxy	fix test	2020-06-18 05:06:28 +03:00
metadata
mongooseim	Pbkdf2.verify_pass --> AuthenticationPlug.checkpw	2020-05-14 08:57:38 -05:00
nodeinfo	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
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	adding overall count for packs and files	2020-06-19 10:17:24 +03:00
preload	Credo fixes	2020-06-30 11:55:58 +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	add status_net/config	2020-06-03 16:34:03 -04:00
views	Rename user.settings column	2020-06-30 11:50:53 -05:00
web_finger	Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'	2020-05-06 08:46:45 +00:00
xml
api_spec.ex	Add OpenAPI spec for SubscriptionController	2020-05-05 16:43:00 +04:00
chat_channel.ex	[#2456] Removed support for embedded relationships in account view.	2020-05-10 09:16:48 +03:00
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	encode data properly	2020-06-03 16:34:03 -04:00
gettext.ex
masto_fe_controller.ex	Add warning against parsing/reusing MastoFE settings blob	2020-06-22 23:45:29 +02:00
metadata.ex
oauth.ex
preload.ex	add status_net/config	2020-06-03 16:34:03 -04:00
rel_me.ex
router.ex	Merge branch 'preload-data' into 'develop'	2020-06-25 21:35:39 +00:00
translation_helpers.ex
uploader_controller.ex
web.ex