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

..

templates

Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp

2020-09-28 23:25:29 -04:00

auth.py

Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp

2020-09-28 23:25:16 -04:00

backend.py

Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp

2020-09-10 15:23:27 -04:00

backup.py

Issue #1340 - LDAP backend for accounts

2020-01-17 17:03:21 -05:00

csr_country_codes.tsv

drop the CSR_COUNTRY setting and ask within the control panel

2015-12-26 11:48:23 -05:00

daemon.py

Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp

2020-09-29 22:20:15 -04:00

daily_tasks.sh

daily_tasks.sh: redirect stderr to stdout (#1768)

2020-06-07 09:56:45 -04:00

dns_update.py

Merge branch 'master' of https://github.com/mail-in-a-box/mailinabox

2020-07-08 19:36:15 -04:00

email_administrator.py

send the mail_log.py report to the box admin every Monday

2018-02-25 11:55:06 -05:00

mail_log.py

Merge branch 'master' into ldap

2020-03-15 09:51:10 -04:00

mailconfig.py

Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp

2020-09-28 23:25:16 -04:00

mfa_totp.py

Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp

2020-09-29 22:20:15 -04:00

mfa.py

Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp

2020-09-29 22:20:15 -04:00

munin_start.sh

update bind9 configuration

2018-10-03 14:28:43 -04:00

ssl_certificates.py

Merge branch 'master' into ldap

2020-05-29 17:11:39 -04:00

status_checks.py

Wording changes

2020-08-29 06:57:33 -04:00

utils.py

Issue #1340 - LDAP backend for accounts

2020-01-17 17:03:21 -05:00

web_update.py

Merge branch 'master' of https://github.com/mail-in-a-box/mailinabox

2020-07-16 07:57:09 -04:00