David Yip d66192f21c

Merge remote-tracking branch 'glitchsoc/master' into gs-master ...

Conflicts:
 	db/schema.rb

2018-04-14 03:50:31 -05:00

..

chewy

Full-text search for authorized statuses (#6423)

2018-02-09 23:04:47 +01:00

controllers

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

2018-04-14 03:50:31 -05:00

helpers

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

2018-04-11 00:50:09 +00:00

javascript

Add missing Japanese translation

2018-04-14 07:53:56 +09:00

lib

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

2018-04-08 19:05:02 -05:00

mailers

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

models

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

2018-04-14 03:50:31 -05:00

policies

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

2018-04-11 00:50:09 +00:00

presenters

Add backend support for bookmarks

2018-04-11 20:40:29 +02:00

serializers

Add backend support for bookmarks

2018-04-11 20:40:29 +02:00

services

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

2018-04-11 00:50:09 +00:00

validators

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

2018-03-27 10:44:12 -05:00

views

Merge remote-tracking branch 'tootsuite/master'

2018-04-12 03:30:57 -05:00

workers

Add a circuit breaker for ActivityPub deliveries (#7053)

2018-04-07 21:36:58 +02:00