Ivan Tashkinov 0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex		2020-04-22 18:51:59 +03:00
..
activity
bbs
captcha
config	don't restart postgrex	2020-04-17 12:45:13 +03:00
conversation
docs
emails
emoji	profile emojis in User.emoji instead of source_data	2020-04-10 06:20:02 +02:00
gopher
gun	fix for gun connections pool	2020-04-08 18:46:01 +03:00
helpers
http
instances
object
plugs	Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.	2020-04-22 18:50:25 +03:00
pool	Fix spelling	2020-04-13 17:04:43 -05:00
reverse_proxy
tests	[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.	2020-04-15 21:19:16 +03:00
upload
uploaders
user
web	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks	2020-04-22 18:51:59 +03:00
workers	Fix Oban warning	2020-04-22 19:27:28 +04:00
activity.ex	[#1559] Addressed code review requests.	2020-04-09 15:13:37 +03:00
activity_expiration.ex
application.ex
bookmark.ex
clippy.ex
config.ex
constants.ex
conversation.ex
counter_cache.ex
delivery.ex
earmark_renderer.ex
ecto_enums.ex
emoji-data.txt
emoji.ex
filter.ex
following_relationship.ex
formatter.ex	formatter: Use user.uri instead of user.source_data.uri	2020-04-10 06:20:02 +02:00
healthcheck.ex
html.ex
instances.ex
job_queue_monitor.ex
jwt.ex
keys.ex
list.ex
marker.ex	Revert "Merge branch 'issue/1276' into 'develop'"	2020-04-14 16:32:22 +00:00
mime.ex
moderation_log.ex
notification.ex	Revert "Merge branch 'issue/1276' into 'develop'"	2020-04-14 16:32:22 +00:00
object.ex	Polls: Persist and show voters' count	2020-04-22 14:06:39 +02:00
object_tombstone.ex
otp_version.ex
pagination.ex
password_reset_token.ex
registration.ex
release_tasks.ex
repo.ex
repo_streamer.ex
report_note.ex
scheduled_activity.ex
signature.ex
stats.ex
thread_mute.ex
upload.ex
user.ex	Streamer: Stream boosts to the boosting user.	2020-04-22 17:21:13 +02:00
user_invite_token.ex
user_relationship.ex	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	2020-04-13 09:16:51 +03:00
utils.ex