From fd0ed4a406c330fa7bf3d5f4c7f41473d64e3acf Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 2 Sep 2016 16:54:27 +0100
Subject: [PATCH 1/3] Show something when we see a no-op join event

As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020, don't supress no-op joins
---
 src/TextForEvent.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 93f5f7c4e2..f32d1a7132 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -62,6 +62,9 @@ function textForMemberEvent(ev) {
                     return senderName + " changed their profile picture";
                 } else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) {
                     return senderName + " set a profile picture";
+                } else {
+                    // hacky hack for https://github.com/vector-im/vector-web/issues/2020
+                    return senderName + " rejoined the room.";
                 }
             } else {
                 if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);

From 6de2e8bda500f3506eae3926e4406f8a47d101b8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:13:52 +0100
Subject: [PATCH 2/3] update changelog

---
 CHANGELOG.md                               | 7 +++++++
 src/components/structures/TimelinePanel.js | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03096b04b8..c024595205 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.6.5-r2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5-r2) (2016-09-02)
+=========================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.5-r1...v0.6.5-r2)
+
+ * Workaround vector-im/vector-web#2020 where floods of joins could crash the browser
+   (as seen in #matrix-dev right now)
+
 Changes in [0.6.5-r1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5-r1) (2016-09-01)
 =========================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.5...v0.6.5-r1)
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index c80a8c89d7..715cc5a4c8 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -32,7 +32,7 @@ var KeyCode = require('../../KeyCode');
 var PAGINATE_SIZE = 20;
 var INITIAL_SIZE = 20;
 
-var DEBUG = false;
+var DEBUG = true;
 
 if (DEBUG) {
     // using bind means that we get to keep useful line numbers in the console

From c2ca261085b296ed9878c2b5b44ff9d5b936212d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:13:59 +0100
Subject: [PATCH 3/3] 0.6.5-r2

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

diff --git a/package.json b/package.json
index c154f7bc88..3398226389 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.6.5-r1",
+  "version": "0.6.5-r2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {