Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock		2019-11-29 10:17:59 +03:00
..
activity	…
bbs	…
captcha	…
config	…
conversation	…
daemons	…
docs	fix for migrate task	2019-11-10 22:54:37 +03:00
emails	…
emoji	…
gopher	…
helpers	…
http	…
instances	…
object	fetcher: move local object checking into a reusable function	2019-11-23 22:55:41 +03:00
plugs	Support authentication via `x-admin-token` HTTP header	2019-11-19 15:58:20 +07:00
reverse_proxy	…
upload	…
uploaders	…
user	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-21 16:47:52 +03:00
web	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-29 10:17:59 +03:00
workers	…
activity.ex	Add `direct_conversation_id` to web push payload	2019-11-26 19:53:43 +07:00
activity_expiration.ex	…
application.ex	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
bookmark.ex	…
clippy.ex	…
config.ex	…
constants.ex	…
conversation.ex	…
delivery.ex	…
ecto_enums.ex	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
emoji-data.txt	…
emoji.ex	…
filter.ex	…
following_relationship.ex	…
formatter.ex	…
healthcheck.ex	…
html.ex	…
instances.ex	…
job_queue_monitor.ex	…
jwt.ex	…
keys.ex	…
list.ex	…
marker.ex	…
mime.ex	…
moderation_log.ex	AdminAPI: Confirm user account, resend confirmation email	2019-11-19 20:14:02 +09:00
notification.ex	[#1335] User AP ID relations fetching performance optimizations.	2019-11-20 12:19:07 +03:00
object.ex	fetcher: move local object checking into a reusable function	2019-11-23 22:55:41 +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	…
stats.ex	…
thread_mute.ex	…
upload.ex	…
user.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-29 10:17:59 +03:00
user_invite_token.ex	…
user_relationship.ex	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00