Eugen 4f3264d291 Merge branch 'master' into boostspin		2017-01-24 14:27:13 +01:00
..
assets	Merge branch 'master' into boostspin	2017-01-24 14:27:13 +01:00
channels	Adding unified streamable notifications	2016-11-20 19:39:58 +01:00
controllers	API now respects ?limit param as long as it's within 2x default limit	2017-01-24 04:22:10 +01:00
helpers	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings	2017-01-12 20:46:24 +01:00
lib	Move merging/unmerging of timelines into background. Move blocking into	2017-01-23 21:29:34 +01:00
mailers	Follow requests send e-mail notifications, but are excluded from notifications API	2016-12-26 21:52:03 +01:00
models	Domain blocks now have varying severity - auto-suspend vs auto-silence	2017-01-23 17:38:38 +01:00
services	Domains with reject_media? set to true won't download avatars either	2017-01-23 21:55:29 +01:00
views	Domain blocks now have varying severity - auto-suspend vs auto-silence	2017-01-23 17:38:38 +01:00
workers	Move merging/unmerging of timelines into background. Move blocking into	2017-01-23 21:29:34 +01:00