From 3173898bc1c06d3a2300349c1252b4590b3e4b2e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 14 Mar 2016 15:47:09 +0000
Subject: [PATCH 1/3] Bump the timeline limit to 500

... so that matthew can ctrl-f
---
 src/components/structures/TimelinePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index d2afff13e7..3f934ce34e 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -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

From 6a0cd9e0470339fcdb4bc531127c806bd7cad7fc Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 14 Mar 2016 15:54:33 +0000
Subject: [PATCH 2/3] Bump to dev branch of js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3a55730402..6d31c49129 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "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",

From 0598092f9d77783ee77402740be97b923ce93f86 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 14 Mar 2016 19:02:22 +0000
Subject: [PATCH 3/3] Bump to latest react-gemini-scrollbar

... which will hopefully fix the mystery of the disappearing member list.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6d31c49129..b539a32d3e 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "q": "^1.4.1",
     "react": "^0.14.2",
     "react-dom": "^0.14.2",
-    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#d9a808d",
+    "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"