kaniini 74135e1318 Merge branch 'feature/omit-relay-user' into 'develop' ...

AdminAPI: Omit relay user from users list

Closes #1349

See merge request pleroma/pleroma!1924

2019-11-03 16:19:27 +00:00

..

activity_pub

Merge branch 'develop' into feature/fast_sanitize

2019-10-30 17:51:15 -05:00

admin_api

AdminAPI: Omit relay user from users list

2019-10-31 02:26:02 +03:00

auth

…

common_api

Switch from HtmlSanitizeEx to FastSanitize

2019-10-29 01:18:08 +03:00

feed

Extract RSS Feed functionality from OStatus

2019-10-07 12:20:41 +00:00

instances

…

mastodon_api

Merge branch 'develop' into feature/fast_sanitize

2019-10-30 17:51:15 -05:00

media_proxy

…

metadata

Extract RSS Feed functionality from OStatus

2019-10-07 12:20:41 +00:00

mongooseim

…

oauth

[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.

2019-10-16 21:59:21 +03:00

ostatus

tests: ostatus controller tests: fix sporadic compilation failure

2019-10-19 23:16:15 +00:00

pleroma_api/controllers

[#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

plugs

…

push

Spelling

2019-10-21 18:35:43 -05:00

rich_media

…

streamer

Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships

2019-10-24 14:55:36 +07:00

twitter_api

Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships

2019-10-24 14:55:36 +07:00

views

…

web_finger

kill almost all of the OStatus module

2019-10-18 14:50:09 +00:00

fallback_test.exs

…

federator_test.exs

Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation

2019-10-20 20:43:18 +03:00

masto_fe_controller_test.exs

[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.

2019-10-16 21:59:21 +03:00

node_info_test.exs

[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.

2019-10-16 21:59:21 +03:00

rel_me_test.exs

…

uploader_controller_test.exs

…