Merge branch 'master' into user-invite
This commit is contained in:
commit
9f6e36e38d
|
@ -2215,7 +2215,7 @@
|
||||||
|
|
||||||
renderPasswordForm: function () {
|
renderPasswordForm: function () {
|
||||||
this.$el.find('span.centered.spinner').remove();
|
this.$el.find('span.centered.spinner').remove();
|
||||||
this.$el.find('.chat-body').append(
|
this.$el.find('.chat-body').html(
|
||||||
$('<div class="chatroom-form-container">'+
|
$('<div class="chatroom-form-container">'+
|
||||||
'<form class="chatroom-form">'+
|
'<form class="chatroom-form">'+
|
||||||
'<legend>'+__('This chatroom requires a password')+'</legend>' +
|
'<legend>'+__('This chatroom requires a password')+'</legend>' +
|
||||||
|
|
Loading…
Reference in New Issue
Block a user