beatrix 136458eaf4

Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing ...

Revert 245816ab2721f386184878d71be01143d207abf5 (fixes #348)

2018-02-10 21:47:27 -05:00

..

controllers

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

helpers

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-28 22:45:17 -06:00

javascript

Revert 245816ab2721f386184878d71be01143d207abf5 (fixes #348)

2018-02-10 20:59:50 +01:00

lib

Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.

2018-02-10 10:36:15 -06:00

mailers

Make sure status is not nil (#6428)

2018-02-04 12:31:46 +01:00

models

Use Html2Text to generate plaintext for keyword mutes. #236.

2018-02-10 10:36:16 -06:00

policies

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-02 14:17:11 +00:00

presenters

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-06 20:17:13 +00:00

serializers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00

services

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-02 08:39:52 -06:00

validators

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

views

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

workers

Rename ResolveRemoteAccountService to ResolveAccountService (#6327)

2018-01-22 14:25:09 +01:00