Merge branch 'features/avatar' of github.com:RocketChat/Rocket.Chat into features/avatar

client/views/app/chatWindowDashboard.coffee

@@ -229,6 +229,8 @@ Template.chatWindowDashboard.helpers
 					$in: room?.uids
 
 			# unless Template.instance().showUsersOffline.get()
+			# 	filter.status = { $ne: 'offline' }
+
 			filter.$and = [{ status: {$exists: true} }, { status: {$ne: 'offline'} }]
 
 			users = Meteor.users.find(filter, { sort: { name: 1 } } ).fetch()
@@ -469,7 +471,7 @@ Template.chatWindowDashboard.onCreated ->
 	this.scrollOnBottom = true
 	this.showUsersOffline = new ReactiveVar false
 
-	this.subscribe("allUsers")
+	# this.subscribe("allUsers")
 
 Template.chatWindowDashboard.onRendered ->
 	FlexTab.check()

client/views/app/chatWindowDashboard.html

@@ -106,7 +106,6 @@
 		<div class="content">
 			{{#if isGroupChat}}
 				<div class="list-view{{#if $.Session.get 'showUserInfo'}} -hidden{{/if}}">
-					{{#if Template.subscriptionsReady}}
 					{{#with roomUsers}}
 						<div class="status">
 							<h2>{{_ "chatWindowDashboard.Members_List"}}</h2>
@@ -121,7 +120,6 @@
 							{{/each}}
 						</ul>
 					{{/with}}
-					{{/if}}
 				</div>
 				<div class="user-view animated{{#unless $.Session.get 'showUserInfo'}} -hidden{{/unless}}">
 					{{#with flexUserInfo}}