Ivan Tashkinov 1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock		2020-08-07 09:38:05 +03:00
..
activity_pub	Merge branch 'deactivated-user-posts' into 'develop'	2020-08-04 19:17:30 +00:00
admin_api	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-26 15:46:14 -05:00
api_spec	[#1985] Prevented force login on registration if account approval and/or email confirmation needed.	2020-07-31 14:13:38 +03:00
auth
channels
common_api	Use the Pleroma.Config alias	2020-07-09 10:53:51 -05:00
federator
feed	feed/user_controller: Return 404 when the user is remote	2020-07-29 14:02:02 +02:00
mailer
mastodon_api	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-08-07 09:38:05 +03:00
media_proxy	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-19 20:05:37 +03:00
metadata
mongooseim
nodeinfo
oauth	[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.	2020-08-06 16:00:00 +03:00
ostatus
pleroma_api	ChatMessageReferenceView: Display preview cards.	2020-07-30 19:57:26 +02:00
preload	Preloaders: Remove status_net preloader	2020-07-06 12:24:45 +02:00
push
rich_media	Consolidate construction of Rich Media Parser HTTP requests	2020-08-03 12:37:31 -05:00
static_fe
streamer
templates	templates/layout/app.html.eex: fix link color	2020-08-05 00:01:30 +02:00
twitter_api	Fix User.registration_reason HTML sanitizing issues	2020-07-27 20:36:31 -05:00
views	Merge branch 'develop' into 'cleanup/masto_fe-default_settings'	2020-07-27 16:35:47 +00:00
web_finger
xml
api_spec.ex
chat_channel.ex	[#2791] AccountView: renamed :force option to :skip_visibility_check.	2020-07-23 15:08:30 +03:00
controller_helper.ex
embed_controller.ex
endpoint.ex	FrontendStatic: Add plug to serve frontends based on configuration.	2020-07-28 17:35:16 +02:00
fallback_redirect_controller.ex
gettext.ex
masto_fe_controller.ex
metadata.ex
oauth.ex
preload.ex
rel_me.ex
router.ex	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-08-07 09:38:05 +03:00
translation_helpers.ex
uploader_controller.ex
web.ex