beatrix bcda3f85ce

Merge pull request #226 from glitch-soc/glitch-theme ...

Glitch/Vanilla themes

2017-11-18 20:32:17 -05:00

..

controllers

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

2017-11-17 17:40:00 -06:00

helpers

Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00

javascript

Merge pull request #226 from glitch-soc/glitch-theme

2017-11-18 20:32:17 -05:00

lib

Merge pull request #208 from yipdw/keyword-mute

2017-11-18 12:06:40 -05:00

mailers

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

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

models

Merge pull request #208 from yipdw/keyword-mute

2017-11-18 12:06:40 -05:00

policies

Update StatusPolicy to check current_account for local_only? toots.

2017-11-17 09:07:21 -06:00

presenters

Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream

2017-09-28 09:18:35 +02:00

serializers

Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size

2017-11-17 19:02:40 -05:00

services

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

2017-11-17 17:40:00 -06:00

validators

Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.

2017-11-14 17:56:38 +01:00

views

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

2017-11-17 20:17:12 +00:00

workers

Lists (#5703)

2017-11-18 00:16:48 +01:00