nicolas 959e4b8198 Merge branch 'master' into french-translation

2016-11-25 13:33:00 +01:00

..

assets

Update fr.jsx

2016-11-25 13:31:46 +01:00

channels

Adding unified streamable notifications

2016-11-20 19:39:58 +01:00

controllers

Remove stale entries from cache results

2016-11-25 13:25:40 +01:00

helpers

Adding French locale to settings_helper.rb

2016-11-22 10:20:28 +01:00

lib

Fix #65 - Options to block notifications from people you don't follow/who don't follow you

2016-11-25 13:13:16 +01:00

mailers

Adding unified streamable notifications

2016-11-20 19:39:58 +01:00

models

Fix #65 - Options to block notifications from people you don't follow/who don't follow you

2016-11-25 13:13:16 +01:00

services

Fix #65 - Options to block notifications from people you don't follow/who don't follow you

2016-11-25 13:13:16 +01:00

views

Fix #65 - Options to block notifications from people you don't follow/who don't follow you

2016-11-25 13:13:16 +01:00

workers

Remove unneeded indices, improve error handling in background workers, don't needlessly reload reblogged status, send Devise e-mails asynchronously

2016-11-22 17:32:51 +01:00