Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Emmanuel ROHEE 2014-09-15 10:08:47 +02:00
parent 7a77aabb4b 49b5dd56b5
commit 3292f70071
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WISHLIST.rst
View File

@ -5,3 +5,5 @@ Broad-sweeping stuff which would be nice to have
- homeserver implementation in go - homeserver implementation in go
- homeserver implementation in node.js - homeserver implementation in node.js
- client SDKs - client SDKs
- libpurple library
- irssi plugin?

3
webclient/app.css
View File

@ -529,7 +529,8 @@ a:active { color: #000; }
.bubble .message { .bubble .message {
/* Break lines when encountering CR+LF */ /* Break lines when encountering CR+LF */
white-space: pre; /* FIXME: this breaks wordwrapping. We need to s#CRLF#<br/>#g instead */
/* white-space: pre; */
} }
.bubble .messagePending { .bubble .messagePending {
opacity: 0.3 opacity: 0.3

4
webclient/room/room-controller.js
View File

@ -220,7 +220,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
}; };
var paginate = function(numItems) { var paginate = function(numItems) {
// console.log("paginate " + numItems); //console.log("paginate " + numItems + " and first_pagination is " + $scope.state.first_pagination);
if ($scope.state.paginating || !$scope.room_id) { if ($scope.state.paginating || !$scope.room_id) {
return; return;
} }
@ -260,7 +260,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
} }
if ($scope.state.first_pagination) { if ($scope.state.first_pagination) {
scrollToBottom(); scrollToBottom(true);
$scope.state.first_pagination = false; $scope.state.first_pagination = false;
} }
else { else {