spc-pleroma/lib/pleroma/web
Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
..
activity_pub Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-21 11:05:09 +03:00
admin_api [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation 2019-10-20 22:29:56 +03:00
auth constants: add as_public constant and use it everywhere 2019-07-29 02:43:19 +00:00
channels Use `User.get_cached*` everywhere 2019-04-22 07:20:43 +00:00
common_api [#1304] Moved remaining fields from User.Info to User. 2019-10-20 13:42:42 +03:00
federator kill almost all of the OStatus module 2019-10-18 14:50:09 +00:00
feed Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
mailer Fix Credo warnings 2019-04-20 19:57:43 +07:00
mastodon_api Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
media_proxy Fix/mediaproxy whitelist base url 2019-08-02 17:07:09 +00:00
metadata Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
mongooseim [#1260] Rate-limiting for create authentication and related requests. 2019-09-17 16:16:11 +03:00
nodeinfo A feature for shareable emoji packs, use it in download_from & tests 2019-09-19 00:16:33 +03:00
oauth [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
ostatus kill almost all of the OStatus module 2019-10-18 14:50:09 +00:00
pleroma_api/controllers Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
push Revert subscription refactoring. 2019-09-29 18:43:27 +03:00
rich_media added prepare html for RichMedia.Parser 2019-09-15 14:53:58 +03:00
streamer Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
templates MastoFE: Add PWA manifest. 2019-10-19 12:15:14 +02:00
twitter_api [#1304] Moved remaining fields from User.Info to User. 2019-10-20 13:42:42 +03:00
views Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
web_finger webfinger: stop pulling Salmon data out of WebFinger 2019-10-18 14:50:09 +00:00
xml update copyright years to 2019 2018-12-31 15:41:47 +00:00
chat_channel.ex Fix merge 2019-09-30 19:10:54 +07:00
controller_helper.ex Extract poll actions from `MastodonAPIController` to `PollController` 2019-10-01 11:44:34 +07:00
endpoint.ex Add `remote_ip` plug 2019-09-27 21:59:23 +00:00
fallback_redirect_controller.ex [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ 2019-07-26 20:27:38 +00:00
gettext.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
masto_fe_controller.ex Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
metadata.ex Use object instead of activity for metadata 2019-01-18 09:32:52 +03:00
oauth.ex Refactoring functions for dealing with oauth scopes. 2019-05-08 10:52:13 +00:00
rel_me.ex Replace Mix.env with Pleroma.Config.get(:env) 2019-06-06 23:59:51 +03:00
router.ex Merge branch 'feature/mastofe-pwa' into 'develop' 2019-10-19 20:11:58 +00:00
translation_helpers.ex Discard identifier, if empty 2019-10-01 19:43:22 +03:00
uploader_controller.ex tests for Uploader with webhook 2019-07-18 12:30:18 +00:00
web.ex Revert "Parallelize template rendering" 2019-09-10 22:01:45 +03:00