kaniini 475fcb3e6c Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop' ...

Clear follow requests when blocking a user

See merge request pleroma/pleroma!1583

2019-08-18 21:59:22 +00:00

..

activity

constants: add as_public constant and use it everywhere

2019-07-29 02:43:19 +00:00

bbs

…

captcha

use default child_specs

2019-08-14 11:55:17 -04:00

config

use default child_specs

2019-08-14 11:55:17 -04:00

conversation

Conversations: Load relations in one query.

2019-08-14 17:01:11 +02:00

emails

Merge branch 'feature/digest-email' into 'develop'

2019-08-08 14:38:33 +00:00

gopher

use default child_specs

2019-08-14 11:55:17 -04:00

helpers

…

http

Handle 303 redirects

2019-07-28 20:24:39 +00:00

instances

…

object

Resolve merge conflicts

2019-07-20 22:04:47 +03:00

plugs

tests WebFinger

2019-07-24 15:13:10 +00:00

reverse_proxy

…

upload

added tests for Pleroma.Upload.Filter

2019-07-16 21:35:43 +00:00

uploaders

tests for Pleroma.Uploaders

2019-08-10 18:46:26 +00:00

user

Merge branch 'feature/digest-email' into 'develop'

2019-08-08 14:38:33 +00:00

web

Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'

2019-08-18 21:57:55 +00:00

activity.ex

Hide muted theads from home/public timelines unless with_muted is set

2019-08-15 17:37:30 +03:00

application.ex

Fix OAuth cleanup worker unconditionally starting

2019-08-15 20:36:20 +03:00

bookmark.ex

…

clippy.ex

…

config.ex

…

constants.ex

constants: add as_public constant and use it everywhere

2019-07-29 02:43:19 +00:00

conversation.ex

Conversation: Rename function to better express what it does.

2019-08-06 15:06:19 +02:00

digest_email_worker.ex

Use PleromaJobQueue for scheduling

2019-07-16 16:49:50 +03:00

emoji.ex

use default child_specs

2019-08-14 11:55:17 -04:00

filter.ex

…

flake_id.ex

use default child_specs

2019-08-14 11:55:17 -04:00

formatter.ex

…

html.ex

html.ex: Allow sub and sup elements by default

2019-08-14 22:49:13 +02:00

instances.ex

…

jwt.ex

…

keys.ex

…

list.ex

…

mime.ex

…

notification.ex

Merge develop

2019-07-16 16:19:19 +03:00

object_tombstone.ex

…

object.ex

…

pagination.ex

…

password_reset_token.ex

…

registration.ex

…

release_tasks.ex

…

repo_streamer.ex

…

repo.ex

…

scheduled_activity_worker.ex

use default child_specs

2019-08-14 11:55:17 -04:00

scheduled_activity.ex

…

signature.ex

Fix HTTP sig tweak on KeyId

2019-07-28 14:17:56 +02:00

stats.ex

Collect stats immediately after init

2019-08-15 01:01:13 +03:00

thread_mute.ex

…

upload.ex

Do not prepend /media/ when using base_url

2019-07-24 15:35:25 +00:00

user_invite_token.ex

Add tests for users tasks and PleromaAuthenticator

2019-07-22 02:43:15 +00:00

user.ex

clear follow requests when blocking a user

2019-08-18 20:30:57 +01:00