Alex Gleason 48983e9421 Merge remote-tracking branch 'upstream/develop' into by-approval		2020-07-14 18:56:40 -05:00
..
activity_pub	Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'	2020-07-14 15:17:25 +00:00
admin_api	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-14 18:56:40 -05:00
api_spec	[#1940] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations.	2020-07-14 19:31:05 +03:00
auth
channels
common_api	Use the Pleroma.Config alias	2020-07-09 10:53:51 -05:00
federator
feed
mailer
mastodon_api	Add account_approval_required instance setting	2020-07-12 20:27:58 -05:00
media_proxy	MediaProxy whitelist setting now supports hosts with scheme	2020-07-12 12:41:40 +03:00
metadata
mongooseim
nodeinfo	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
oauth	Prevent unapproved users from logging in	2020-07-12 22:55:26 -05:00
ostatus
pleroma_api	AccountController: Remove unused update_? routes.	2020-07-07 16:53:20 +02:00
preload	Preloaders: Remove status_net preloader	2020-07-06 12:24:45 +02:00
push
rich_media	Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.	2020-07-07 11:21:05 -05:00
static_fe
streamer	Streamer: Don't filter out announce notifications.	2020-07-04 17:11:37 +02:00
templates
twitter_api	Accept reason in POST /api/v1/accounts and store in DB	2020-07-14 00:22:12 -05:00
views	Rename user.settings column	2020-06-30 11:50:53 -05: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	Add warning against parsing/reusing MastoFE settings blob	2020-06-22 23:45:29 +02:00
metadata.ex
oauth.ex
preload.ex
rel_me.ex
router.ex	AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint	2020-07-14 18:02:44 -05:00
translation_helpers.ex
uploader_controller.ex
web.ex