Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into configme-integration

Conflicts: pom.xml
2016-09-04 15:25:18 +02:00
parent 34a2b46768 6857bd929e
commit 09f403f357
22 changed files with 529 additions and 381 deletions
@@ -89,7 +89,7 @@ public class SecuritySettings implements SettingsHolder {
        "- '123456'",
        "- 'password'"})
    public static final Property<List<String>> UNSAFE_PASSWORDS =
-        newLowercaseListProperty("settings.security.unsafePasswords", "123456", "password", "qwerty", "12345", "54321");
+        newLowercaseListProperty("settings.security.unsafePasswords", "123456", "password", "qwerty", "12345", "54321", "123456789");

    @Comment("Tempban a user's IP address if they enter the wrong password too many times")
    public static final Property<Boolean> TEMPBAN_ON_MAX_LOGINS =