distraction.party/lib/pleroma/web
Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
..
activity_pub Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-11 13:54:21 +07:00
admin_api Merge branch 'cleanup/admin-api-useless-if' into 'develop' 2019-01-01 13:48:59 +00:00
channels update copyright years to 2019 2018-12-31 15:41:47 +00:00
common_api de-group alias/es 2019-02-09 16:31:17 +01:00
federator Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-11 13:54:21 +07:00
http_signatures de-group alias/es 2019-02-09 16:31:17 +01:00
mastodon_api de-group alias/es 2019-02-09 16:31:17 +01:00
media_proxy Make credo happy 2019-02-09 14:59:20 +01:00
metadata de-group alias/es 2019-02-09 16:31:17 +01:00
nodeinfo Merge branch 'fix/credo-issues' into 'develop' 2019-02-10 20:54:21 +00:00
oauth de-group import/s 2019-02-09 16:31:17 +01:00
ostatus Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-11 13:54:21 +07:00
push de-group alias/es 2019-02-09 16:31:17 +01:00
rich_media de-group alias/es 2019-02-09 16:31:17 +01:00
salmon Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-11 13:54:21 +07:00
templates Add responsive features to layout 2019-02-02 13:40:34 +03:00
twitter_api Merge branch 'fix/credo-issues' into 'develop' 2019-02-10 20:54:21 +00:00
views update copyright years to 2019 2018-12-31 15:41:47 +00:00
web_finger de-group alias/es 2019-02-09 16:31:17 +01:00
websub Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-11 13:54:21 +07:00
xml update copyright years to 2019 2018-12-31 15:41:47 +00:00
chat_channel.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
controller_helper.ex [#534] Refactoring / tweaks per MR review. 2019-01-28 11:03:52 +03:00
endpoint.ex Use url() instead of static_url in Endpoint.websocket_url() 2019-02-01 22:35:19 +03:00
gettext.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
metadata.ex Use object instead of activity for metadata 2019-01-18 09:32:52 +03:00
router.ex activitypub: c2s: add /api/ap/whoami endpoint for andstatus 2019-02-04 22:58:29 +00:00
streamer.ex de-group alias/es 2019-02-09 16:31:17 +01:00
uploader_controller.ex Make credo happy 2019-02-09 14:59:20 +01:00
web.ex de-group import/s 2019-02-09 16:31:17 +01:00