Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411

2019-12-11 15:02:53 -06:00

..

activity

status search: prefer the status fetched by url over other results

2019-12-09 20:45:04 +03:00

bbs

Merge branch 'develop' into feature/fast_sanitize

2019-10-30 17:51:15 -05:00

captcha

…

config

…

conversation

Mastodon API: Add the recipients parameter to GET /api/v1/conversations

2019-11-07 08:26:24 +03:00

daemons

[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.

2019-10-16 21:59:21 +03:00

docs

fix for migrate task

2019-11-10 22:54:37 +03:00

emails

[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.

2019-10-16 21:59:21 +03:00

emoji

…

gopher

…

helpers

…

http

…

instances

…

object

fetcher: move local object checking into a reusable function

2019-11-23 22:55:41 +03:00

plugs

[#1427] Fixed :admin option handling in OAuthScopesPlug, added tests.

2019-12-11 11:42:02 +03:00

reverse_proxy

Make MediaProxy failure tracking less brutal

2019-10-11 22:52:38 +03:00

upload

…

uploaders

…

user

Merge branch 'develop' into issue/1342

2019-12-08 21:25:26 +03:00

web

Merge branch 'develop' into issue/1411

2019-12-11 15:02:53 -06:00

workers

Merge branch 'develop' into issue/1342

2019-12-05 15:46:27 +03:00

activity_expiration.ex

…

activity.ex

ActivityPub: Fix deletes being exempt from MRF

2019-12-05 21:45:57 +03:00

application.ex

HTML: Compile Scrubbers on boot

2019-12-08 20:35:41 +03:00

bookmark.ex

…

clippy.ex

Fix never matching clause

2019-12-08 16:46:18 +03:00

config.ex

[#1427] Fixed :admin option handling in OAuthScopesPlug, added tests.

2019-12-11 11:42:02 +03:00

constants.ex

…

conversation.ex

Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count.

2019-10-26 02:29:18 +03:00

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

Fix Pleroma.FollowingRelationship.move_following/2

2019-12-03 22:31:12 +07:00

formatter.ex

[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.

2019-10-16 21:59:21 +03:00

healthcheck.ex

…

html.ex

HTML: Compile Scrubbers on boot

2019-12-08 20:35:41 +03:00

instances.ex

…

job_queue_monitor.ex

…

jwt.ex

…

keys.ex

…

list.ex

…

marker.ex

add Markers /api/v1/markers

2019-10-17 15:26:59 +03:00

mime.ex

…

moderation_log.ex

AdminAPI: Confirm user account, resend confirmation email

2019-11-19 20:14:02 +09:00

notification.ex

Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'

2019-12-09 14:55:42 +00:00

object_tombstone.ex

…

object.ex

Merge branch 'develop' into issue/1411

2019-12-11 15:02:53 -06:00

pagination.ex

fix order by for fetch_favorites

2019-11-18 21:34:54 +03:00

password_reset_token.ex

…

registration.ex

…

release_tasks.ex

…

repo_streamer.ex

…

repo.ex

…

scheduled_activity.ex

…

scheduler.ex

…

signature.ex

Move local keys out of user.info

2019-10-06 16:56:36 +03:00

stats.ex

[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.

2019-10-16 21:59:21 +03:00

thread_mute.ex

…

upload.ex

upload.ex: Remove deprecated configuration

2019-10-18 12:34:09 +02: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

user.ex

Apply suggestion to lib/pleroma/user.ex

2019-12-10 18:49:41 +00:00