lain 577da132da Merge branch '1031-parent-visible' into 'develop' ... Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679		2020-06-29 08:39:51 +00:00
..
activity_pub	Merge branch '1031-parent-visible' into 'develop'	2020-06-29 08:39:51 +00:00
admin_api	Merge develop	2020-06-23 20:56:55 +03:00
api_spec	Merge branch '1031-parent-visible' into 'develop'	2020-06-29 08:39:51 +00:00
auth	…
channels	…
common_api	AccountController: Extract blocking to CommonAPI.	2020-06-25 11:44:04 +02:00
federator	Federator: Return proper values for jobs	2020-04-22 13:28:52 +02:00
feed	…
mailer	…
mastodon_api	Merge branch '1031-parent-visible' into 'develop'	2020-06-29 08:39:51 +00:00
media_proxy	…
metadata	…
mongooseim	…
nodeinfo	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
oauth	…
ostatus	…
pleroma_api	…
preload	fix tests	2020-06-15 12:25:03 -04:00
push	…
rich_media	…
static_fe	…
streamer	…
templates	…
twitter_api	…
views	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-06-05 16:53:56 +02:00
web_finger	…
xml	Update Copyrights	2020-03-03 16:44:49 -06:00
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	Merge branch 'preload-data' into 'develop'	2020-06-25 21:35:39 +00:00
translation_helpers.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
uploader_controller.ex	…
web.ex	Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.	2020-04-30 18:19:51 +03:00