5 Commits

Author	SHA1	Message	Date
mattwr18	704b8c2d57	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users	2020-01-21 21:15:03 +01:00
mattwr18	769c0cd105	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2675-migrate-avatar-component-2	2020-01-21 17:08:51 +01:00
roschaefer	c22a6330aa	refactor(translations): Fix keys for muting ... Provide the correct German translation. Remove "" and use `null` for Italian. @mattwr18 we really have to make sure not to add empty strings to our translations because we disable the fallback in that case. Also, if we want, we could replace the other translations with `null` in order to make sure that we have the better (though untranslated) explanation. @mattwr18 I had a look into `notificationsMiddleware.js`. I think that we can still keep the tests and the behaviour although there is no `BLOCKED` relationship anymore, right?	2020-01-16 20:56:12 +01:00
mattwr18	851babeac3	Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content	2020-01-16 14:48:56 +01:00
mattwr18	ba3e9e1025	Rename blacklist/whitelist to mute/unmute ... - Follow @roschaefer suggestion in issue - This can be reverted if we decide otherwise	2020-01-08 18:04:26 +01:00