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

This commit is contained in:
2020-01-23 16:11:11 +00:00
20 changed files with 403 additions and 278 deletions

View File

@@ -392,3 +392,7 @@ class ResetApiKey(generic.RedirectView):
self.request.user.save()
return reverse_lazy('profile_detail')
class PasswordResetDisabled(generic.TemplateView):
template_name = "RIGS/password_reset_disable.html"