mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages 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
commit ce150646e6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -28,12 +28,12 @@
"highlight.js": "^8.9.1",
"linkifyjs": "^2.0.0-beta.4",
"marked": "^0.3.5",
"matrix-js-sdk": "^0.4.1",
"matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
"optimist": "^0.6.1",
"q": "^1.4.1",
"react": "^0.14.2",
"react-dom": "^0.14.2",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#3ee2648",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#8c29605",
"sanitize-html": "^1.11.1",
"velocity-animate": "^1.2.3",
"velocity-ui-pack": "^1.2.2"

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