Merge branch 'master' of https://github.com/RocketChat/Rocket.Chat into firefox-evt-wrap

README.md

@@ -56,10 +56,10 @@ It is a great solution for communities and companies wanting to privately host t
 - Media Embeds
 - Link Previews
 - LDAP Authentication - [LDAP Authentication on Rocket.Chat Wiki](https://github.com/RocketChat/Rocket.Chat/wiki/LDAP-Authentication)
+- [WebRTC signalling - ALPHA - help wanted - Issue #115](https://github.com/RocketChat/Rocket.Chat/issues/115)
 
 ### Roadmap for v1.0
 
-- WebRTC signalling
 - File uploads
 - Full text search
 - REST-like APIs

client/views/app/room.html

@@ -166,8 +166,8 @@
 										{{#if selfVideoUrl}}
 											{{#if rtcLayout2}}
 											<div style="display: flex; flex-direction: row; align-items: center; width: 800px; height: 350px">
-												<video class="video-remote" src="{{remoteVideoUrl}}" style="flex: 1 0; width: 480px; margin: 10px; background-color: #000;"  autoplay></video>
-												<video class="video-self" src="{{selfVideoUrl}}" style="flex: 1 0;  width: 480px; margin: 10px; background-color: #000;" autoplay muted></video>
+												<video class="video-remote" src="{{remoteVideoUrl}}" style="flex: 1 0; min-width: 380px; height: 285px; margin: 10px; background-color: #000;"  autoplay></video>
+												<video class="video-self" src="{{selfVideoUrl}}" style="flex: 1 0;  min-width: 380px; height: 285px; margin: 10px; background-color: #000;" autoplay muted></video>
 											</div>
 											{{else}}
 											  {{#if rtcLayout1}}

server/startup/indexes.coffee

@@ -11,5 +11,6 @@ Meteor.startup ->
 		try ChatSubscription._ensureIndex { 'ts': 1 } catch e then console.log e
 
 		try ChatMessage._ensureIndex { 'rid': 1, 'ts': 1 } catch e then console.log e
+		try ChatMessage._ensureIndex { 'ets': 1 }, { sparse: 1 } catch e then console.log e
 		try ChatMessage._ensureIndex { 'rid': 1, 't': 1, 'u._id': 1 } catch e then console.log e
 		try ChatMessage._ensureIndex { 'expireAt': 1 }, { expireAfterSeconds: 0 } catch e then console.log e