Olivier Martin
39167d333a
Merge commit '0d631329873196935ba29db985c5e32def391251' into 2fa_enforcement
2021-05-01 12:35:58 -04:00
Olivier Martin
f707f86c8e
Merge commit '1e5306b8203a7ebe24047910e6c690c18c6d827a' into 2fa_enforcement
2021-04-29 23:29:28 -04:00
Olivier Martin
cc021a4784
project name and links in new email templates
2021-04-27 21:48:07 -04:00
Olivier Martin
e3c4609c2a
Merge commit '3da44a8d30e76f48b84f5b888e0b33427037037c' into 2fa_enforcement
2021-04-27 21:44:32 -04:00
Olivier Martin
89a68741d6
ran cargo fmt --all
2021-04-16 14:49:59 -04:00
Olivier Martin
2421d49d9a
Merge branch 'master' of github.com:dani-garcia/bitwarden_rs into 2fa_enforcement
...
# Conflicts:
# src/db/models/org_policy.rs
# src/db/models/organization.rs
2021-04-16 14:29:28 -04:00
Olivier Martin
1db37bf3d0
make error toast display detailed message
...
replace invite accept error message with the one from upstream
check if config mail is enabled
2021-04-12 21:54:57 -04:00
Olivier Martin
d75a80bd2d
Resolves dani-garcia/bitwarden_rs#981
...
* a user without 2fa trying to join a 2fa org will fail, but user gets an email to enable 2fa
* a user disabling 2fa will be removed from 2fa orgs; user gets an email for each org
* an org enabling 2fa policy will remove users without 2fa; users get an email
2021-04-11 22:57:17 -04:00
Olivier Martin