From 37c46cf02f5851127bd666dead93a1b55155de7f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 31 Aug 2016 21:51:20 +0100
Subject: [PATCH 01/20] add a top-level remote audio element for
https://github.com/vector-im/vector-web/issues/1271 and
https://github.com/vector-im/vector-web/issues/621
---
vector/index.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/vector/index.html b/vector/index.html
index d6d8ddcb61..e00c5a6f3e 100644
--- a/vector/index.html
+++ b/vector/index.html
@@ -49,6 +49,7 @@
<source src="media/busy.ogg" type="audio/ogg" />
<source src="media/busy.mp3" type="audio/mpeg" />
</audio>
+ <audio id="remoteAudio"/>
<script>
if (window.location.host === 'www.vector.im' || window.location.host === 'vector.im') {
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
From eaf47ea05c3a87c9f0cd4742c2a8369a1d137365 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 00:13:49 +0100
Subject: [PATCH 02/20] show ongoing audio call in LeftPanel
---
src/components/structures/LeftPanel.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 58347a068d..87c75283fb 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -109,7 +109,7 @@ var LeftPanel = React.createClass({
var CallView = sdk.getComponent('voip.CallView');
callPreview = (
<CallView
- className="mx_LeftPanel_callView" onClick={this.onCallViewClick}
+ className="mx_LeftPanel_callView" showVoice={true} onClick={this.onCallViewClick}
ConferenceHandler={VectorConferenceHandler} />
);
}
From 56dfdbeb6bddaeb70b4069067ba4f029e8185719 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 00:14:01 +0100
Subject: [PATCH 03/20] call noisy notifs... noisy
---
src/components/views/settings/Notifications.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index fb49019e41..b6f880db18 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -843,7 +843,7 @@ module.exports = React.createClass({
<th width="55%"></th>
<th width="15%">Off</th>
<th width="15%">On</th>
- <th width="15%">Highlight<br/>& sound</th>
+ <th width="15%">Noisy</th>
</tr>
</thead>
<tbody>
From 735da3c15eb1acc44e1fbe38ffae0d9fd30e7d0a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 00:14:32 +0100
Subject: [PATCH 04/20] show ongoing audio call in LeftPanel CSS
---
.../css/matrix-react-sdk/views/voip/CallView.css | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/voip/CallView.css b/src/skins/vector/css/matrix-react-sdk/views/voip/CallView.css
index 179fd29467..8051b4d0d6 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/voip/CallView.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/voip/CallView.css
@@ -12,4 +12,14 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-*/
\ No newline at end of file
+*/
+
+.mx_CallView_voice {
+ background-color: #76cfa6;
+ color: #fff;
+ cursor: pointer;
+ text-align: center;
+ padding: 6px;
+ font-weight: bold;
+ font-size: 13px;
+}
\ No newline at end of file
From cc75eb8b0ed14b5989c303e9d2b7bc6caa95046b Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 00:14:51 +0100
Subject: [PATCH 05/20] fix statusbar height and behaviour during voip calls
---
.../css/matrix-react-sdk/structures/RoomStatusBar.css | 8 +++++++-
.../vector/css/matrix-react-sdk/structures/RoomView.css | 3 ++-
.../vector/css/matrix-react-sdk/structures/UploadBar.css | 8 ++++++++
.../css/matrix-react-sdk/views/rooms/TabCompleteBar.css | 2 ++
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
index 4d91755c3f..1d5e7dd62c 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
@@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_RoomStatusBar {
- margin-top: 15px;
+ margin-top: 10px;
margin-left: 65px;
min-height: 34px;
}
@@ -25,11 +25,17 @@ limitations under the License.
padding-left: 18px;
padding-right: 12px;
margin-left: -73px;
+ margin-top: 13px;
float: left;
width: 24px;
text-align: center;
}
+.mx_RoomStatusBar_callBar {
+ height: 50px;
+ line-height: 50px;
+}
+
.mx_RoomStatusBar_placeholderIndicator span {
color: #4a4a4a;
opacity: 0.5;
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
index c8772b499e..d24a69220a 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
@@ -207,7 +207,7 @@ hr.mx_RoomView_myReadMarker {
.mx_RoomView_statusAreaBox {
max-width: 960px;
margin: auto;
- min-height: 60px;
+ min-height: 50px;
}
.mx_RoomView_statusAreaBox_line {
@@ -239,6 +239,7 @@ hr.mx_RoomView_myReadMarker {
.mx_RoomView_voipButton {
float: right;
margin-right: 13px;
+ margin-top: 10px;
cursor: pointer;
}
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css b/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css
index b489e13265..a8ec47ac6c 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css
@@ -30,6 +30,10 @@ limitations under the License.
height: 5px;
}
+.mx_UploadBar_uploadProgressInner .mx_RoomView_callStatusBar {
+ background-color: #fff ! important;
+}
+
.mx_UploadBar_uploadFilename {
margin-top: 5px;
margin-left: 65px;
@@ -37,6 +41,10 @@ limitations under the License.
color: #4a4a4a;
}
+.mx_UploadBar_uploadFilename .mx_RoomView_callStatusBar {
+ color: #fff;
+}
+
.mx_UploadBar_uploadIcon {
float: left;
margin-top: 5px;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css
index f7f4a0bdcb..1f8a345083 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css
@@ -34,6 +34,8 @@ limitations under the License.
padding-bottom: 2px;
margin-bottom: 6px;
border-radius: 30px;
+ position: relative;
+ top: 1px;
}
.mx_TabCompleteBar_command .mx_TabCompleteBar_text {
From ad266318742374dd91fe776dc93b243e277771ec Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 00:33:45 +0100
Subject: [PATCH 06/20] fix icon layout
---
.../vector/css/matrix-react-sdk/structures/RoomStatusBar.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
index 1d5e7dd62c..130ef53e8a 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
@@ -15,7 +15,6 @@ limitations under the License.
*/
.mx_RoomStatusBar {
- margin-top: 10px;
margin-left: 65px;
min-height: 34px;
}
@@ -109,6 +108,7 @@ limitations under the License.
}
.mx_RoomStatusBar_tabCompleteBar {
+ padding-top: 10px;
color: #4a4a4a;
}
From e77e6c2af0cb1661516186a59cea316eb3a28e70 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 00:35:07 +0100
Subject: [PATCH 07/20] fix typing notif layout
---
.../vector/css/matrix-react-sdk/structures/RoomStatusBar.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
index 130ef53e8a..22a4f69383 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
@@ -113,6 +113,7 @@ limitations under the License.
}
.mx_RoomStatusBar_typingBar {
+ padding-top: 10px;
color: #4a4a4a;
opacity: 0.5;
overflow-y: hidden;
From 7a89328ccbb4881c398203076d611f1c47918239 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 00:38:37 +0100
Subject: [PATCH 08/20] file upload when on call
---
.../vector/css/matrix-react-sdk/structures/RoomView.css | 9 +++++++++
.../vector/css/matrix-react-sdk/structures/UploadBar.css | 8 --------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
index d24a69220a..67551541bf 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
@@ -216,6 +216,15 @@ hr.mx_RoomView_myReadMarker {
height: 1px;
}
+.mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {
+ background-color: #fff;
+}
+
+.mx_RoomView_callStatusBar .mx_UploadBar_uploadFilename {
+ color: #fff;
+ opacity: 1.0;
+}
+
.mx_RoomView_inCall .mx_RoomView_statusAreaBox_line {
border-top: 1px hidden;
}
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css b/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css
index a8ec47ac6c..b489e13265 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css
@@ -30,10 +30,6 @@ limitations under the License.
height: 5px;
}
-.mx_UploadBar_uploadProgressInner .mx_RoomView_callStatusBar {
- background-color: #fff ! important;
-}
-
.mx_UploadBar_uploadFilename {
margin-top: 5px;
margin-left: 65px;
@@ -41,10 +37,6 @@ limitations under the License.
color: #4a4a4a;
}
-.mx_UploadBar_uploadFilename .mx_RoomView_callStatusBar {
- color: #fff;
-}
-
.mx_UploadBar_uploadIcon {
float: left;
margin-top: 5px;
From e85674711c74c9c2dca539ed4bf6fe7c965e3e6e Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Thu, 1 Sep 2016 15:12:34 +0300
Subject: [PATCH 09/20] Improve readability of the changelog dialog
---
src/components/views/dialogs/ChangelogDialog.js | 4 +++-
.../vector/css/vector-web/views/dialogs/ChangelogDialog.css | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.js
index ea32a756a1..2790f93c8d 100644
--- a/src/components/views/dialogs/ChangelogDialog.js
+++ b/src/components/views/dialogs/ChangelogDialog.js
@@ -50,9 +50,11 @@ export default class ChangelogDialog extends React.Component {
return (
<div key={repo}>
<h2>{repo}</h2>
+ <ul>
{this.state[repo].map(commit =>
- <div key={commit.commit.url}><a href={commit.commit.url}>{commit.commit.message}</a></div>
+ <li key={commit.commit.url} className="mx_ChangelogDialog_li"><a href={commit.commit.url}>{commit.commit.message}</a></li>
)}
+ </ul>
</div>
)
});
diff --git a/src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css b/src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css
index 37b865d948..460a5f94b1 100644
--- a/src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css
+++ b/src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css
@@ -18,3 +18,7 @@ limitations under the License.
max-height: 300px;
overflow: auto;
}
+
+.mx_ChangelogDialog_li {
+ padding: 0.2em;
+}
From 49e5fa41adf36c6419834cd36c84a1dafdd51540 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 16:06:45 +0100
Subject: [PATCH 10/20] fix overscroll on view source
---
src/skins/vector/css/common.css | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css
index 64cf4d6d4b..b68b58138d 100644
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -153,6 +153,8 @@ input[type=text]:focus, textarea:focus {
width: 60%;
max-width: 704px;
box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
+ max-height: 80%;
+ overflow-y: scroll;
}
.mx_Dialog_background {
From b4cf86a362faf791b7498bc38071b122207fa4ae Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 17:00:52 +0100
Subject: [PATCH 11/20] fix padding-top for unread msgs
---
.../vector/css/matrix-react-sdk/structures/RoomStatusBar.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
index 22a4f69383..ef0b69c4d0 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
@@ -75,6 +75,7 @@ limitations under the License.
}
.mx_RoomStatusBar_unreadMessagesBar {
+ padding-top: 10px;
color: #ff0064;
cursor: pointer;
}
From a20962ac143c0e15f1314f0d4bf27af8041f6b1a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 22:28:39 +0100
Subject: [PATCH 12/20] bump to react-sdk v0.6.5-r1
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 7f1e8d921d..8968bf6cf6 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"highlight.js": "^9.0.0",
"linkifyjs": "2.0.0-beta.4",
"matrix-js-sdk": "0.5.6",
- "matrix-react-sdk": "0.6.5",
+ "matrix-react-sdk": "0.6.5-r1",
"modernizr": "^3.1.0",
"q": "^1.4.1",
"react": "^15.2.1",
From 67255e3f84c7065b1a68768abef2d891fb8cd4dc Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 22:29:36 +0100
Subject: [PATCH 13/20] Prepare changelog for v0.7.5-r2
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83d60f7d8a..3bc316d725 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.7.5-r2](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r2) (2016-09-01)
+==================================================================================================
+[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r1...v0.7.5-r2)
+
+ * Bump to matrix-react-sdk 0.6.5-r1 in order to fix guest access
+
Changes in [0.7.5-r1](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r1) (2016-08-28)
==================================================================================================
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5...v0.7.5-r1)
From 06ca94c1e6371248d964259523c8f82302bb45cd Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 22:29:36 +0100
Subject: [PATCH 14/20] 0.7.5-r2
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 8968bf6cf6..3a351b9423 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vector-web",
- "version": "0.7.5-r1",
+ "version": "0.7.5-r2",
"description": "Vector webapp",
"author": "matrix.org",
"repository": {
From 6c8a492637ddfc6471466b4cf3594ab5dee524f0 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 2 Sep 2016 12:01:27 +0100
Subject: [PATCH 15/20] Bump to olm 1.1.0
Olm 1.0.0 made broken OlmAccounts.
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 3fc952adb8..9a8f67a1ae 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,6 @@
"webpack": "^1.12.14"
},
"optionalDependencies": {
- "olm": "https://matrix.org/packages/npm/olm/olm-1.0.0.tgz"
+ "olm": "https://matrix.org/packages/npm/olm/olm-1.1.0.tgz"
}
}
From 4ce80a08374e7ccc193947019a083401ee90631e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 14:39:38 +0100
Subject: [PATCH 16/20] fix dialog css
---
src/skins/vector/css/common.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css
index b68b58138d..9eb67c3c54 100644
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -154,7 +154,7 @@ input[type=text]:focus, textarea:focus {
max-width: 704px;
box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
max-height: 80%;
- overflow-y: scroll;
+ overflow-y: auto;
}
.mx_Dialog_background {
From 00d53e48247777979bc436e96f38b085213f31f9 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 15:38:40 +0100
Subject: [PATCH 17/20] css for conf join
---
src/skins/vector/css/matrix-react-sdk/structures/RoomView.css | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
index 67551541bf..c3f7ceed3b 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
@@ -278,3 +278,7 @@ hr.mx_RoomView_myReadMarker {
padding: 6px 0;
cursor: pointer;
}
+
+.mx_RoomView_ongoingConfCallNotification a {
+ color: #fff ! important;
+}
\ No newline at end of file
From 67d38bfab8ffba9fa8eb2ae5028d5412aa649ab2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:20:08 +0100
Subject: [PATCH 18/20] Prepare changelog for v0.7.5-r3
---
CHANGELOG.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bc316d725..82906e6ebd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.7.5-r3](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r3) (2016-09-02)
+==================================================================================================
+[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r2...v0.7.5-r3)
+
+ * Bump to matrix-react-sdk 0.6.5-r3 in order to fix bug #2020 (tightloop when flooded with join events)
+
+
Changes in [0.7.5-r2](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r2) (2016-09-01)
==================================================================================================
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r1...v0.7.5-r2)
From dec62ab92c1073e2d6e7ddf34eb12b25ce8972a5 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:20:23 +0100
Subject: [PATCH 19/20] bump react-sdk
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 3a351b9423..ca024ed217 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"highlight.js": "^9.0.0",
"linkifyjs": "2.0.0-beta.4",
"matrix-js-sdk": "0.5.6",
- "matrix-react-sdk": "0.6.5-r1",
+ "matrix-react-sdk": "0.6.5-r3",
"modernizr": "^3.1.0",
"q": "^1.4.1",
"react": "^15.2.1",
From e63e6e7016c9d7e83ce61eb9a5e7676eb0220607 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:21:30 +0100
Subject: [PATCH 20/20] 0.7.5-r3
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index ca024ed217..794b3694a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vector-web",
- "version": "0.7.5-r2",
+ "version": "0.7.5-r3",
"description": "Vector webapp",
"author": "matrix.org",
"repository": {