nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'develop' into rav/fix_scroll_on_resize

Browse Source
This commit is contained in:
Richard van der Hoff
2016-03-14 22:32:54 +00:00
parent 61cd66304e 0598092f9d
commit ce150646e6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/TimelinePanel.js
View File

@@ -28,7 +28,7 @@ var ObjectUtils = require('../../ObjectUtils');
var PAGINATE_SIZE = 20;
var INITIAL_SIZE = 20;
var TIMELINE_CAP = 250; // the most events to show in a timeline
var TIMELINE_CAP = 500; // the most events to show in a timeline
// consider that the user remains "active" for this many milliseconds after a
// user_activity event (and thus don't make the read-marker visible on new