Fix merge with upstream

2018-05-27 07:09:02 +02:00
parent 1d0168379a 71f9587374
commit 83d6f9547e
121 changed files with 2598 additions and 407 deletions
--- a/src/User/resources/views/registration/register.php
+++ b/src/User/resources/views/registration/register.php
@ -37,7 +37,7 @@ $this->params['breadcrumbs'][] = $this->title;
                    ]
                ); ?>

-                <?= $form->field($model, 'email') ?>
+                <?= $form->field($model, 'email')->textInput(['autofocus' => true]) ?>

                <?= $form->field($model, 'username') ?>