ソースを参照

Merge pull request #166 from andryyy/master

Correct push to master
André Peters 8 年 前
コミット
1ffc2490b2
2 ファイル変更8 行追加2 行削除
  1. 7 1
      data/web/css/mailcow.css
  2. 1 1
      data/web/lang/lang.en.php

+ 7 - 1
data/web/css/mailcow.css

@@ -43,4 +43,10 @@
         transform: rotate(359deg);
         transform: rotate(359deg);
     }
     }
 }
 }
-pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;}
+pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;}
+.footable-sortable {
+	 -webkit-user-select: none;  
+  -moz-user-select: none;    
+  -ms-user-select: none;      
+  user-select: none;
+}

+ 1 - 1
data/web/lang/lang.en.php

@@ -387,7 +387,7 @@ $lang['tfa']['api_register'] = 'mailcow uses the Yubico Cloud API. Please get an
 $lang['tfa']['u2f'] = "U2F authentication";
 $lang['tfa']['u2f'] = "U2F authentication";
 $lang['tfa']['hotp'] = "HOTP authentication";
 $lang['tfa']['hotp'] = "HOTP authentication";
 $lang['tfa']['totp'] = "TOTP authentication";
 $lang['tfa']['totp'] = "TOTP authentication";
-$lang['tfa']['none'] = "Deaktiviert";
+$lang['tfa']['none'] = "Deactivate";
 $lang['tfa']['delete_tfa'] = "Disable TFA";
 $lang['tfa']['delete_tfa'] = "Disable TFA";
 $lang['tfa']['disable_tfa'] = "Disable TFA until next successful login";
 $lang['tfa']['disable_tfa'] = "Disable TFA until next successful login";
 $lang['tfa']['confirm_tfa'] = "Please confirm your one-time password in the below field";
 $lang['tfa']['confirm_tfa'] = "Please confirm your one-time password in the below field";