squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
c6fdfbc4f1
pleroma/test/web
History
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
..
activity_pub Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
admin_api Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
auth
common_api [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
feed Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
instances Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02: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 Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
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 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
plugs Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
push Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
rich_media
streamer [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
twitter_api [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
views Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
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 Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00