Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ...

# Conflicts:
#	lib/pleroma/plugs/static_fe_plug.ex

2020-03-14 15:37:02 +03:00

..

activity

Fix hashtags WebSocket streaming

2020-03-13 19:30:42 +04:00

bbs

Update Copyrights

2020-03-03 16:44:49 -06:00

captcha

Update Copyrights

2020-03-03 16:44:49 -06:00

config

using Pleroma.Config instead of ets

2020-03-11 17:22:50 +03:00

conversation

Update Copyrights

2020-03-03 16:44:49 -06:00

docs

merging release default config on app start

2020-03-11 16:25:53 +03:00

emails

Update Copyrights

2020-03-03 16:44:49 -06:00

emoji

Update Copyrights

2020-03-03 16:44:49 -06:00

gopher

Update Copyrights

2020-03-03 16:44:49 -06:00

helpers

Update Copyrights

2020-03-03 16:44:49 -06:00

http

Update Copyrights

2020-03-03 16:44:49 -06:00

instances

Update Copyrights

2020-03-03 16:44:49 -06:00

object

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

plugs

Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions

2020-03-14 15:37:02 +03:00

reverse_proxy

Lint

2020-03-13 12:42:06 -05:00

upload

Update Copyrights

2020-03-03 16:44:49 -06:00

uploaders

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

user

Update Copyrights

2020-03-03 16:44:49 -06:00

web

Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions

2020-03-14 15:37:02 +03:00

workers

Merge branch 'fix/no-email-no-fail' into 'develop'

2020-03-04 12:43:06 +00:00

activity_expiration.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

activity.ex

relay list shows hosts without accepted follow

2020-03-02 09:27:20 +03:00

application.ex

using Pleroma.Config instead of ets

2020-03-11 17:22:50 +03:00

bookmark.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

clippy.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

config.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

constants.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

conversation.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

counter_cache.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

delivery.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

earmark_renderer.ex

Formatting: Do not use \n and prefer <br> instead

2020-03-13 16:07:17 +01:00

ecto_enums.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

emoji-data.txt

…

emoji.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

filter.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

following_relationship.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

formatter.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

healthcheck.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

html.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

instances.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

job_queue_monitor.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

jwt.ex

…

keys.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

list.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

marker.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

mime.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

moderation_log.ex

moderation log: fix improperly migrated data

2020-03-07 17:00:58 +03:00

notification.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

object_tombstone.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

object.ex

Merge branch 'feature/1482-activity_pub_transactions' into 'develop'

2020-03-02 07:58:01 +00:00

pagination.ex

Merge branch 'feature/1482-activity_pub_transactions' into 'develop'

2020-03-02 07:58:01 +00:00

password_reset_token.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

registration.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

release_tasks.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

repo_streamer.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

repo.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

report_note.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

scheduled_activity.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

signature.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

stats.ex

Generate instance stats on startup

2020-03-04 13:33:26 -06:00

thread_mute.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

upload.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

user_invite_token.ex

Update Copyrights

2020-03-03 16:44:49 -06:00

user_relationship.ex

Bump copyright years of files changed after 2020-01-07

2020-03-02 06:08:45 +01:00

user.ex

Merge branch 'develop' into fix/signup-without-email

2020-03-02 15:35:49 +04:00

utils.ex

Update Copyrights

2020-03-03 16:44:49 -06:00