Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md		2019-12-10 08:55:14 +03:00
..
activity	status search: prefer the status fetched by url over other results	2019-12-09 20:45:04 +03:00
bbs
captcha
config
conversation	Mastodon API: Add the recipients parameter to GET /api/v1/conversations	2019-11-07 08:26:24 +03:00
daemons
docs	fix for migrate task	2019-11-10 22:54:37 +03:00
emails
emoji
gopher
helpers
http
instances
object	fetcher: move local object checking into a reusable function	2019-11-23 22:55:41 +03:00
plugs	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes	2019-12-10 08:55:14 +03:00
reverse_proxy
upload
uploaders
user	Merge branch 'develop' into issue/1342	2019-12-08 21:25:26 +03:00
web	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes	2019-12-10 08:55:14 +03: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] Reworked admin scopes support.	2019-12-06 00:25:44 +03:00
constants.ex
conversation.ex
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
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
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	ActivityPub: Fix deletes being exempt from MRF	2019-12-05 21:45:57 +03:00
pagination.ex
password_reset_token.ex
registration.ex
release_tasks.ex
repo_streamer.ex
repo.ex
scheduled_activity.ex
scheduler.ex
signature.ex
stats.ex
thread_mute.ex
upload.ex
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	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes	2019-12-10 08:55:14 +03:00