downtownallday
|
d349150dd0
|
Merge remote-tracking branch 'upstream/main' into merge-upstream
# Conflicts:
# .gitignore
# management/auth.py
# management/daemon.py
# management/mail_log.py
# management/mailconfig.py
# management/mfa.py
# management/ssl_certificates.py
# management/status_checks.py
# management/utils.py
# management/web_update.py
# setup/mail-postfix.sh
# setup/migrate.py
# setup/preflight.sh
# setup/webmail.sh
# tests/test_mail.py
# tools/editconf.py
|
2024-03-12 07:41:14 -04:00 |
|
downtownallday
|
bf63ca827e
|
Add copyright to source files
|
2022-09-19 14:45:11 -04:00 |
|
downtownallday
|
a7370beae0
|
Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp
# Conflicts:
# management/daemon.py
# management/mfa.py
|
2020-10-29 16:56:36 -04:00 |
|
downtownallday
|
100acb119b
|
Add a totpMruTokenTime value to record the time when the mru token was used
Use the totpMruTokenTime as the id to uniquely identify a totp entry
|
2020-09-30 11:00:58 -04:00 |
|
downtownallday
|
a5ebd07549
|
Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp
# Conflicts:
# management/auth.py
# management/mfa.py
|
2020-09-30 09:05:03 -04:00 |
|
downtownallday
|
5deb88ab60
|
Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp
# Conflicts:
# management/daemon.py
# management/mfa.py
# setup/mail-users.sh
|
2020-09-29 22:20:15 -04:00 |
|
downtownallday
|
75fb6d2a5d
|
Rename a function
|
2020-09-29 08:55:04 -04:00 |
|
downtownallday
|
00fc94d3c1
|
Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp
# Conflicts:
# management/auth.py
# management/daemon.py
# management/mailconfig.py
# setup/mail-users.sh
|
2020-09-28 23:25:16 -04:00 |
|