Merge remote-tracking branch 'upstream/master' into take-picture

debian/changelog

@@ -1,3 +1,10 @@
+spreed-webrtc-server (0.18.1) precise; urgency=low
+
+  * Added autoconf/automake support.
+  * Build SCSS compressed in release mode. 
+
+ -- Simon Eisenmann <simon@struktur.de>  Tue, 27 May 2014 11:16:22 +0200
+
 spreed-webrtc-server (0.18.0) precise; urgency=low
 
   * The project is now named Spreed WebRTC. All reference to the old

src/styles/components/_chat.scss

@@ -297,6 +297,11 @@
     text-align: right;
     top: 8px;
   }
+  .timestamp-space {
+    width:40px;
+    height:10px;
+    float:right;
+  }
   strong {
     display: block;
     padding-bottom: 2px;

static/js/controllers/chatroomcontroller.js

@@ -192,7 +192,9 @@ define(['underscore', 'moment', 'text!partials/fileinfo.html'], function(_, mome
 				}
 				lastMessageContainer = $("<ul>").appendTo(container);
 				if ($.trim(s)) {
-					element = $("<li>").html(s).appendTo(lastMessageContainer);
+					element = $("<li>").html(s);
+					element.prepend('<div class="timestamp-space">');
+					element.appendTo(lastMessageContainer);
 				}
 			}
 			if (nodes) {