Ivan Tashkinov bb5d0eafa4 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md		2020-04-21 08:20:50 +03:00
..
activity/ir
bbs
config	fix for logger configuration	2020-04-17 08:42:48 +03:00
conversation
docs
emails
emoji	profile emojis in User.emoji instead of source_data	2020-04-10 06:20:02 +02:00
federation
fixtures	tests for emoji mix task	2020-04-06 11:13:59 +03:00
http	updating clear_config	2020-03-20 20:58:47 +03:00
instance_static/emoji
integration
object
plugs	[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.	2020-04-17 21:21:10 +03:00
pool
reverse_proxy
support	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
tasks	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
upload
uploaders
user
web	Merge remote-tracking branch 'upstream/develop' into accept-deletes	2020-04-20 10:15:40 -05:00
workers
activity_expiration_test.exs
activity_test.exs
bookmark_test.exs
captcha_test.exs
config_test.exs
conversation_test.exs
earmark_renderer_test.exs
emoji_test.exs
filter_test.exs
following_relationship_test.exs	FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).	2020-03-28 18:49:03 +03:00
formatter_test.exs	formatter: Use user.uri instead of user.source_data.uri	2020-04-10 06:20:02 +02:00
healthcheck_test.exs
html_test.exs
http_test.exs
job_queue_monitor_test.exs
keys_test.exs
list_test.exs
marker_test.exs	Revert "Merge branch 'issue/1276' into 'develop'"	2020-04-14 16:32:22 +00:00
moderation_log_test.exs
notification_test.exs	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users	2020-04-21 08:20:50 +03:00
object_test.exs	Merge branch 'remake-remodel-2' into 'develop'	2020-04-06 11:59:01 +00:00
otp_version_test.exs
pagination_test.exs
registration_test.exs
repo_test.exs
runtime_test.exs
safe_jsonb_set_test.exs
scheduled_activity_test.exs
signature_test.exs	User: Move public_key from source_data to own field	2020-04-10 06:16:18 +02:00
stat_test.exs
test_helper.exs
upload_test.exs
user_invite_token_test.exs
user_relationship_test.exs
user_search_test.exs
user_test.exs	Merge branch 'develop' into features/remove-user-source_data	2020-04-16 21:28:52 +03:00
xml_builder_test.exs