David Yip 6f8ccbfcdf

Merge pull request #222 from yipdw/merge/tootsuite/master ...

Merge upstream (e28b33c.. 94c5a11)

2017-11-17 14:35:16 -06:00

..

controllers

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

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

helpers

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

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

javascript

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

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

lib

Themed prefetching

2017-11-16 21:37:08 -08:00

mailers

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

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

models

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

2017-11-16 22:52:37 -06: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 tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5

2017-11-16 01:21:16 -06:00

services

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

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

validators

Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00

views

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

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

workers

Retry thread resolving (#5599)

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