Merge remote-tracking branch 'upstream/master' into password_expiration

2018-01-30 22:16:03 +01:00
parent 0362c9bc04 bf89beff4e
commit 26791a2d8d
81 changed files with 917 additions and 538 deletions
--- a/src/User/Migration/m000000_000006_add_two_factor_fields.php
+++ b/src/User/Migration/m000000_000006_add_two_factor_fields.php
@ -18,7 +18,7 @@ class m000000_000006_add_two_factor_fields extends Migration
    public function safeUp()
    {
        $this->addColumn('{{%user}}', 'auth_tf_key', $this->string(16));
-        $this->addColumn('{{%user}}', 'auth_tf_enabled', $this->boolean()->defaultValue(0));
+        $this->addColumn('{{%user}}', 'auth_tf_enabled', $this->boolean()->defaultValue(false));
    }

    public function safeDown()