Tomy Hsieh 7d46de33d8 Merge from upstream branch 'staging' ...

# Conflicts:
#	data/web/inc/vars.inc.php

2022-09-30 16:03:49 +08:00

..

admin

🐄 Moorch Update 2022 - ClamAV, Dovecot & Olefy Update (#4497)

2022-03-02 16:32:17 +01:00

cache

Readded .gitkeep in data/web/templates/cache

2022-05-05 17:25:04 +02:00

edit

Add Domain and Mailbox tagging (#4569)

2022-05-05 08:25:01 +02:00

mailbox

[Web] Fix wrong lang string for filter deletion confirmation

2022-04-08 09:39:32 +02:00

modals

yubi_otp undo authenticator selection

2022-07-15 16:45:28 +02:00

oauth

[Web] oauth authorize - added missing twig templating

2021-10-22 14:37:26 +02:00

user

[UI] Moved PWChange Button for users back to original place

2022-08-05 14:12:25 +02:00

admin.twig

Jan(moo)uary Update 2022 - Revision A (2022-01a) (#4445)

2022-02-01 15:26:48 +01:00

base.twig

Merge from upstream branch 'staging'

2022-09-30 16:03:49 +08:00

debug.twig

[web] implemented twig templating system (#4264)

2021-09-22 20:47:10 +02:00

domainadmin.twig

[Web] multiple tfa - domainadmin support

2022-03-14 10:31:58 +01:00

edit.twig

[web] implemented twig templating system (#4264)

2021-09-22 20:47:10 +02:00

fido2.twig

[web] implemented twig templating system (#4264)

2021-09-22 20:47:10 +02:00

index.twig

Switch language key

2022-07-02 17:01:50 +08:00

mailbox.twig

[web] implemented twig templating system (#4264)

2021-09-22 20:47:10 +02:00

qhandler.twig

[Web] qhandler - added missing twig templating

2021-10-22 08:52:05 +02:00

quarantine.twig

[web] implemented twig templating system (#4264)

2021-09-22 20:47:10 +02:00

tfa_keys.twig

[Web] Ask for confirmation before deleting OTP; Twig: fix parsing of Yubi OTP help text

2021-10-24 08:17:17 +02:00

user_domainadmin_common.twig

[web] implemented twig templating system (#4264)

2021-09-22 20:47:10 +02:00

user.twig

[web] implemented twig templating system (#4264)

2021-09-22 20:47:10 +02:00