lain e1a1c8e7de Merge branch 'develop' into 'cleanup/masto_fe-default_settings' ... # Conflicts: # lib/pleroma/web/views/masto_fe_view.ex		2020-07-27 16:35:47 +00:00
..
activity_pub	Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'	2020-07-23 12:52:02 +00:00
admin_api	Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'	2020-07-23 12:52:02 +00:00
api_spec	OpenAPI: remove accidentally pasted buffer data	2020-07-26 13:59:46 +00:00
auth
channels
common_api	Use the Pleroma.Config alias	2020-07-09 10:53:51 -05: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 'unblock-domain-via-query' into 'develop'	2020-07-23 20:06:11 +00: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	Credo fixes.	2020-06-29 14:09:03 +02:00
ostatus
pleroma_api	[#2791] AccountView: renamed :force option to :skip_visibility_check.	2020-07-23 15:08:30 +03:00
preload	Preloaders: Remove status_net preloader	2020-07-06 12:24:45 +02:00
push	Rename notification "privacy_option" setting	2020-06-26 12:45:46 -05:00
rich_media	Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"	2020-07-21 22:18:17 +00:00
static_fe	Use atoms as keys in ActivityPub.fetch_* functions options	2020-06-04 21:36:26 +04:00
streamer	Streamer: Don't filter out announce notifications.	2020-07-04 17:11:37 +02:00
templates	TOTP length is configurable, so we can't hardcode this here.	2020-07-17 08:19:49 -05:00
twitter_api	Use the Pleroma.Config alias	2020-07-09 10:53:51 -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	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 '1918-avatar-background-header-reset-2' into 'develop'	2020-07-08 03:25:30 +00:00
translation_helpers.ex
uploader_controller.ex
web.ex