Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.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 22:29:56 +03:00
..
activity	…
bbs	…
captcha	…
config	…
conversation	Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read	2019-10-19 15:24:06 +03:00
daemons	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
docs	…
emails	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
emoji	…
gopher	…
helpers	…
http	…
instances	…
object	object: containment: simplify the pattern match for OStatus testsuite hack	2019-10-18 15:39:15 +00:00
plugs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
reverse_proxy	Make MediaProxy failure tracking less brutal	2019-10-11 22:52:38 +03:00
upload	…
uploaders	…
user	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
web	[#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
workers	federator: remove OStatus incoming document support	2019-10-18 14:50:09 +00:00
activity.ex	…
activity_expiration.ex	…
application.ex	application: don't start Federator.init/1 anymore	2019-10-18 14:50:09 +00:00
bookmark.ex	…
clippy.ex	…
config.ex	…
constants.ex	…
conversation.ex	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	2019-10-05 20:12:00 +03:00
delivery.ex	…
emoji.ex	…
filter.ex	…
formatter.ex	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
healthcheck.ex	…
html.ex	…
instances.ex	…
job_queue_monitor.ex	Remove `:enqueued` counter	2019-10-02 14:50:25 +07:00
jwt.ex	…
keys.ex	…
list.ex	…
mime.ex	…
moderation_log.ex	DELETE /api/pleroma/admin/users now accepts nicknames array	2019-10-15 17:33:29 +02:00
notification.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
object.ex	Fix a migration wiping user info of users that don't have any mutes	2019-10-18 15:22:07 +03:00
object_tombstone.ex	…
pagination.ex	…
password_reset_token.ex	…
registration.ex	…
release_tasks.ex	…
repo.ex	…
repo_streamer.ex	…
scheduled_activity.ex	…
scheduler.ex	…
signature.ex	Move local keys out of `user.info`	2019-10-06 16:56:36 +03:00
stats.ex	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
thread_mute.ex	…
upload.ex	upload.ex: Remove deprecated configuration	2019-10-18 12:34:09 +02:00
user.ex	[#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
user_invite_token.ex	…