Baptiste Lemoine 79f60e91c3 Merge branch 'master' of https://github.com/tootsuite/mastodon

2020-08-03 11:37:47 +02:00

..

assets

prototype for groups

2019-08-27 17:05:17 +02:00

chewy

Change tootctl search deploy algorithm (#14300)

2020-07-14 18:10:35 +02:00

controllers

Merge branch 'master cipherbliss' of https://framagit.org/tykayn/mastodon

2020-07-24 14:52:03 +02:00

helpers

Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master

2020-07-17 20:49:44 +02:00

javascript

Merge branch 'master' of https://github.com/tootsuite/mastodon

2020-08-03 11:37:47 +02:00

lib

Fix handling of Reject Follow when a matching follow relationship exists (#14479)

2020-08-01 18:20:37 +02:00

mailers

Add e-mail-based sign in challenge for users with disabled 2FA (#14013)

2020-06-09 10:23:06 +02:00

models

stuff to fit screen

2020-07-24 17:04:16 +02:00

policies

Add ability to delete files uploaded for settings in admin UI (#13192)

2020-03-08 16:00:24 +01:00

presenters

Add user notes on accounts (#14148)

2020-06-30 19:19:50 +02:00

serializers

Merge branch 'master cipherbliss' of https://framagit.org/tykayn/mastodon

2020-07-24 14:52:03 +02:00

services

Fix following restriction not working when exact match in account search (#14394)

2020-07-26 23:58:36 +02:00

validators

hop

2020-07-09 10:48:27 +02:00

views

Merge branch 'master' of https://github.com/tootsuite/mastodon

2020-08-03 11:37:47 +02:00

workers

Changed retries and rescued in ActivityPub::ProcessingWorker (#14355)

2020-07-20 11:26:12 +02:00