Eugen Rochko e168e8afe5 Merge branch 'master' into for-upstream/optional-notification-muting

2017-11-15 03:36:01 +01:00

..

controllers

Merge branch 'master' into for-upstream/optional-notification-muting

2017-11-15 03:36:01 +01:00

helpers

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

javascript

Merge branch 'master' into for-upstream/optional-notification-muting

2017-11-15 03:36:01 +01:00

lib

Avoid emojifying on invisible text (#5558)

2017-11-07 14:48:13 +01:00

mailers

Add ability to disable login and mark accounts as memorial (#5615)

2017-11-07 19:06:44 +01:00

models

Merge branch 'master' into for-upstream/optional-notification-muting

2017-11-15 03:36:01 +01:00

policies

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

presenters

Compact status_ids in StatusRelationshipsPresenter (#5073)

2017-09-24 11:18:32 +02:00

serializers

Remove /api/v2/mutes

2017-11-14 20:26:22 -06:00

services

Merge branch 'master' into for-upstream/optional-notification-muting

2017-11-15 03:36:01 +01:00

validators

Implement EmailBlackList (#5109)

2017-10-04 15:16:10 +02:00

views

Add option to block direct messages from people you don't follow (#5669)

2017-11-14 21:12:57 +01:00

workers

Retry thread resolving (#5599)

2017-11-11 16:49:04 +01:00