LemmyNet
/
lemmy
3
2
Fork 3
Code Pull Requests 1 Releases Wiki Activity

Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
Conversation 3 Commits 120 Files Changed 57 +9 -3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d02e4c021 - Show all commits

2
ui/src/components/login.tsx vendored
View File

@ -187,6 +187,7 @@ export class Login extends Component<any, State> {
type="password" type="password"
id="register-password" id="register-password"
value={this.state.registerForm.password} value={this.state.registerForm.password}
autoComplete="new-password"
onInput={linkEvent(this, this.handleRegisterPasswordChange)} onInput={linkEvent(this, this.handleRegisterPasswordChange)}
class="form-control" class="form-control"
required required
@ -206,6 +207,7 @@ export class Login extends Component<any, State> {
type="password" type="password"
id="register-verify-password" id="register-verify-password"
value={this.state.registerForm.password_verify} value={this.state.registerForm.password_verify}
autoComplete="new-password"
onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)} onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)}
class="form-control" class="form-control"
required required

10
ui/src/components/user.tsx vendored
View File

@ -81,7 +81,6 @@ export class User extends Component<any, UserState> {
user: { user: {
id: null, id: null,
name: null, name: null,
fedi_name: null,
published: null, published: null,
number_of_posts: null, number_of_posts: null,
post_score: null, post_score: null,
@ -455,8 +454,9 @@ export class User extends Component<any, UserState> {
) : ( ) : (
<> <>
<a <a
className={`btn btn-block btn-secondary mt-3 ${!this.state className={`btn btn-block btn-secondary mt-3 ${
.user.matrix_user_id && 'disabled'}`} !this.state.user.matrix_user_id && 'disabled'
}`}
target="_blank" target="_blank"
href={`https://matrix.to/#/${this.state.user.matrix_user_id}`} href={`https://matrix.to/#/${this.state.user.matrix_user_id}`}
> >
@ -609,6 +609,7 @@ export class User extends Component<any, UserState> {
id="user-password" id="user-password"
class="form-control" class="form-control"
value={this.state.userSettingsForm.new_password} value={this.state.userSettingsForm.new_password}
autoComplete="new-password"
onInput={linkEvent( onInput={linkEvent(
this, this,
this.handleUserSettingsNewPasswordChange this.handleUserSettingsNewPasswordChange
@ -629,6 +630,7 @@ export class User extends Component<any, UserState> {
id="user-verify-password" id="user-verify-password"
class="form-control" class="form-control"
value={this.state.userSettingsForm.new_password_verify} value={this.state.userSettingsForm.new_password_verify}
autoComplete="new-password"
onInput={linkEvent( onInput={linkEvent(
this, this,
this.handleUserSettingsNewPasswordVerifyChange this.handleUserSettingsNewPasswordVerifyChange
@ -649,6 +651,7 @@ export class User extends Component<any, UserState> {
id="user-old-password" id="user-old-password"
class="form-control" class="form-control"
value={this.state.userSettingsForm.old_password} value={this.state.userSettingsForm.old_password}
autoComplete="new-password"
onInput={linkEvent( onInput={linkEvent(
this, this,
this.handleUserSettingsOldPasswordChange this.handleUserSettingsOldPasswordChange
@ -745,6 +748,7 @@ export class User extends Component<any, UserState> {
<input <input
type="password" type="password"
value={this.state.deleteAccountForm.password} value={this.state.deleteAccountForm.password}
autoComplete="new-password"
onInput={linkEvent( onInput={linkEvent(
this, this,
this.handleDeleteAccountPasswordChange this.handleDeleteAccountPasswordChange