From 85040a2e6d77c2a33262df92f8cf2cbfa5cc01e3 Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Thu, 5 Jan 2017 23:18:56 +0100
Subject: [PATCH 01/71] Hide Options button from copy to clipboard
---
.../vector/css/matrix-react-sdk/views/rooms/EventTile.css | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
index fd3f486b..cbae8643 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
@@ -172,6 +172,10 @@ limitations under the License.
cursor: pointer;
top: 6px;
right: 6px;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
}
.mx_EventTile:hover .mx_EventTile_editButton,
From 5020307a6c01122706dff1e835d8f0a93495bb23 Mon Sep 17 00:00:00 2001
From: Ruben Barkow <rubo77@users.noreply.github.com>
Date: Mon, 2 Jan 2017 01:44:04 +0100
Subject: [PATCH 02/71] Add a after timestamp
This solves part of the problem that the timestamp is gluing at the message, when copied in your clipboard.
Example:
23:02test message
see https://github.com/vector-im/riot-web/issues/893
---
src/components/views/messages/MessageTimestamp.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index dda87767..3a8dd91d 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -26,9 +26,8 @@ module.exports = React.createClass({
var date = new Date(this.props.ts);
return (
<span className="mx_MessageTimestamp">
- { DateUtils.formatTime(date) }
+ { DateUtils.formatTime(date)+' ' }
</span>
);
},
});
-
From b00cf8c939e6551b6899fe17c2319c3aa1c70ade Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Nov 2017 17:13:39 +0000
Subject: [PATCH 03/71] add dark theme styling to devtools input box
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/dialogs/DevtoolsDialog.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index a7155ad1..5d9168f5 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -60,7 +60,7 @@ class GenericEditor extends DevtoolsComponent {
<label htmlFor={id}>{ label }</label>
</div>
<div className="mx_DevTools_inputCell">
- <input id={id} onChange={this._onChange} value={this.state[id]} size="32" />
+ <input id={id} className="mx_TextInputDialog_input" onChange={this._onChange} value={this.state[id]} size="32" />
</div>
</div>;
}
From 26269986f512c015754c2c1863b31491b6e57ffc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Nov 2017 15:36:28 +0000
Subject: [PATCH 04/71] move piwik whitelists to conf and add piwik config.json
info to readme
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
README.md | 5 +++++
config.sample.json | 2 ++
2 files changed, 7 insertions(+)
diff --git a/README.md b/README.md
index 1da20632..273f448b 100644
--- a/README.md
+++ b/README.md
@@ -130,6 +130,11 @@ You can configure the app by copying `config.sample.json` to
anything else since it is used to isolate the privileges of file attachments to this
domain. Default: `usercontent.riot.im`. This needs to contain v1.html from
https://github.com/matrix-org/usercontent/blob/master/v1.html
+1. `piwik`: an object containing the following properties:
+ 1. `url`: The URL of the Piwik instance to use for collecting Analytics
+ 1. `whitelistedHSUrls`: a list of HS URLs to not redact from the Analytics
+ 1. `whitelistedISUrls`: a list of IS URLs to not redact from the Analytics
+ 1. `siteId`: The Piwik Site ID to use when sending Analytics to the Piwik server configured above
Running as a Desktop app
========================
diff --git a/config.sample.json b/config.sample.json
index 016517cd..6e83cec2 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -24,6 +24,8 @@
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
"url": "https://piwik.riot.im/",
+ "whitelistedHSUrls": ["https://matrix.org"],
+ "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
"siteId": 1
}
}
From f7a26ddb915143918e93a0fea89a0b7d0394355d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Nov 2017 20:46:40 +0000
Subject: [PATCH 05/71] fix (race?) broken tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
test/app-tests/joining.js | 5 +++++
test/app-tests/loading.js | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index 29da3413..fc380e7d 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -16,6 +16,9 @@ limitations under the License.
/* joining.js: tests for the various paths when joining a room */
+import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
+import Platform from '../../src/vector/platform';
+
require('skin-sdk');
var jssdk = require('matrix-js-sdk');
@@ -85,6 +88,8 @@ describe('joining a room', function () {
localStorage.setItem("mx_access_token", ACCESS_TOKEN );
localStorage.setItem("mx_user_id", USER_ID);
+ PlatformPeg.set(new Platform());
+
var mc = (
<MatrixChat config={{}}
makeRegistrationUrl={()=>{throw new Error("unimplemented");}}
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index a7e7c985..dab61657 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -16,6 +16,9 @@ limitations under the License.
/* loading.js: test the myriad paths we have for loading the application */
+import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
+import Platform from '../../src/vector/platform';
+
import 'skin-sdk';
import React from 'react';
@@ -137,6 +140,8 @@ describe('loading:', function () {
default_is_url: DEFAULT_IS_URL,
}, opts.config || {});
+ PlatformPeg.set(new Platform());
+
var params = parseQs(windowLocation);
matrixChat = ReactDOM.render(
<MatrixChat
From c0a5c28d800ad835290d4b80e7df0f7a8e43796f Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 25 Nov 2017 22:58:52 +1300
Subject: [PATCH 06/71] Set html lang attribute from language setting
---
src/vector/index.html | 2 +-
src/vector/index.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/vector/index.html b/src/vector/index.html
index 8568d96a..f930b6d2 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -1,5 +1,5 @@
<!doctype html>
-<html lang="en" style="height: 100%;">
+<html id="root" lang="en" style="height: 100%;">
<head>
<meta charset="utf-8">
<title>Riot</title>
diff --git a/src/vector/index.js b/src/vector/index.js
index 46ef706e..fe326e16 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -382,6 +382,7 @@ async function loadLanguage() {
}
try {
await languageHandler.setLanguage(langs);
+ document.getElementById("root").setAttribute("lang", languageHandler.getCurrentLanguage());
} catch (e) {
console.error("Unable to set language", e);
}
From 43b3c013f26177d7037f7ad0b3326c4eade62232 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sun, 26 Nov 2017 09:49:39 +1300
Subject: [PATCH 07/71] Change html root id
Change the root <html> element id to follow Matrix naming conventions.
---
src/vector/index.html | 2 +-
src/vector/index.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/vector/index.html b/src/vector/index.html
index f930b6d2..172ccfab 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -1,5 +1,5 @@
<!doctype html>
-<html id="root" lang="en" style="height: 100%;">
+<html id="mx_PageRoot" lang="en" style="height: 100%;">
<head>
<meta charset="utf-8">
<title>Riot</title>
diff --git a/src/vector/index.js b/src/vector/index.js
index fe326e16..c154919b 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -382,7 +382,7 @@ async function loadLanguage() {
}
try {
await languageHandler.setLanguage(langs);
- document.getElementById("root").setAttribute("lang", languageHandler.getCurrentLanguage());
+ document.getElementById("mx_PageRoot").setAttribute("lang", languageHandler.getCurrentLanguage());
} catch (e) {
console.error("Unable to set language", e);
}
From c4dc59dc413d83b48fd9a84ea427a1ff76d0544c Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sun, 26 Nov 2017 13:46:47 +1300
Subject: [PATCH 08/71] Use documentElement instead of getElementById
Use documentElement to get the root <html> element instead of adding an id to
the root element.
---
src/vector/index.html | 2 +-
src/vector/index.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/vector/index.html b/src/vector/index.html
index 172ccfab..8568d96a 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -1,5 +1,5 @@
<!doctype html>
-<html id="mx_PageRoot" lang="en" style="height: 100%;">
+<html lang="en" style="height: 100%;">
<head>
<meta charset="utf-8">
<title>Riot</title>
diff --git a/src/vector/index.js b/src/vector/index.js
index c154919b..5ac42d8a 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -382,7 +382,7 @@ async function loadLanguage() {
}
try {
await languageHandler.setLanguage(langs);
- document.getElementById("mx_PageRoot").setAttribute("lang", languageHandler.getCurrentLanguage());
+ document.documentElement.setAttribute("lang", languageHandler.getCurrentLanguage());
} catch (e) {
console.error("Unable to set language", e);
}
From 0c43edb629ad945320665b486cce3ad1d6b895b7 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 29 Nov 2017 16:41:00 +0000
Subject: [PATCH 09/71] CSS for new TagPanel
---
src/skins/vector/css/_components.scss | 1 +
.../structures/_SearchBox.scss | 2 +
.../structures/_TagPanel.scss | 77 +++++++++++++++++++
src/skins/vector/css/themes/_base.scss | 1 +
.../vector-web/structures/_RoomSubList.scss | 5 +-
5 files changed, 83 insertions(+), 3 deletions(-)
create mode 100644 src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 67ca0966..0dd6a1b1 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -11,6 +11,7 @@
@import "./matrix-react-sdk/structures/_RoomStatusBar.scss";
@import "./matrix-react-sdk/structures/_RoomView.scss";
@import "./matrix-react-sdk/structures/_SearchBox.scss";
+@import "./matrix-react-sdk/structures/_TagPanel.scss";
@import "./matrix-react-sdk/structures/_UploadBar.scss";
@import "./matrix-react-sdk/structures/_UserSettings.scss";
@import "./matrix-react-sdk/structures/login/_Login.scss";
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_SearchBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_SearchBox.scss
index 64dec826..6f08fd47 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_SearchBox.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_SearchBox.scss
@@ -21,6 +21,8 @@ limitations under the License.
padding-top: 24px;
padding-bottom: 22px;
+ border-bottom: 1px solid $panel-divider-color;
+
display: flex;
}
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss b/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
new file mode 100644
index 00000000..6c8f7197
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
@@ -0,0 +1,77 @@
+/*
+Copyright 2017 New Vector Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+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.
+*/
+
+.mx_TagPanel {
+ width: 60px;
+ background-color: $tertiary-accent-color;
+ cursor: pointer;
+
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.mx_TagPanel .mx_TagPanel_tagTileContainer {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin-top: 65px;
+}
+
+.mx_TagPanel .mx_TagTile {
+ margin: 6px 0px;
+ opacity: 0.5;
+}
+.mx_TagPanel .mx_TagTile:focus,
+.mx_TagPanel .mx_TagTile:hover,
+.mx_TagPanel .mx_TagTile.mx_TagTile_selected {
+ opacity: 1;
+}
+
+.mx_TagPanel .mx_TagTile.mx_TagTile_selected {
+ /* To offset border of mx_TagTile_avatar */
+ margin: 3px 0px;
+}
+
+.mx_TagPanel .mx_TagTile.mx_TagTile_selected .mx_TagTile_avatar {
+ border: 3px solid $accent-color;
+ border-radius: 60px;
+}
+
+.mx_TagPanel .mx_TagTile.mx_AccessibleButton:focus {
+ filter: none;
+}
+
+.mx_TagTile_tooltip {
+ position: relative;
+ top: -30px;
+ left: 5px;
+}
+
+.mx_TagPanel_createGroupButton {
+ cursor: pointer;
+ opacity: 0.5;
+ margin-bottom: 12px;
+}
+
+.mx_TagPanel_createGroupButton:hover {
+ opacity: 1;
+}
+
+.mx_TagPanel_createGroupButton object {
+ pointer-events: none;
+}
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index 62d7af06..327f2e4a 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -40,6 +40,7 @@ $preview-bar-bg-color: #f7f7f7;
// left-panel style muted accent color
$secondary-accent-color: #eaf5f0;
+$tertiary-accent-color: #d3efe1;
// used by RoomDirectory permissions
$plinth-bg-color: $secondary-accent-color;
diff --git a/src/skins/vector/css/vector-web/structures/_RoomSubList.scss b/src/skins/vector/css/vector-web/structures/_RoomSubList.scss
index 1a78e517..bc04abca 100644
--- a/src/skins/vector/css/vector-web/structures/_RoomSubList.scss
+++ b/src/skins/vector/css/vector-web/structures/_RoomSubList.scss
@@ -33,14 +33,13 @@ limitations under the License.
font-weight: 600;
font-size: 12px;
width: 203px; /* padding + width = LHS Panel width */
- height: 17px; /* padding + height = 29px, same as mx_RoomSubList_stickyContainer */
+ height: 19px; /* padding + height = 29px, same as mx_RoomSubList_stickyContainer */
padding-left: 16px; /* gutter */
padding-right: 16px; /* gutter */
padding-top: 6px;
padding-bottom: 6px;
cursor: pointer;
- background-color: $roomsublist-label-bg-color;
- border-top: solid 2px $secondary-accent-color;
+ background-color: $secondary-accent-color;
}
.mx_RoomSubList_label.mx_RoomSubList_fixed {
From 28132eaf36daf17139e6034cac0e4cf32933673e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 29 Nov 2017 17:17:09 +0000
Subject: [PATCH 10/71] Correct comment
---
src/skins/vector/css/vector-web/structures/_RoomSubList.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/skins/vector/css/vector-web/structures/_RoomSubList.scss b/src/skins/vector/css/vector-web/structures/_RoomSubList.scss
index bc04abca..db1fb170 100644
--- a/src/skins/vector/css/vector-web/structures/_RoomSubList.scss
+++ b/src/skins/vector/css/vector-web/structures/_RoomSubList.scss
@@ -33,7 +33,7 @@ limitations under the License.
font-weight: 600;
font-size: 12px;
width: 203px; /* padding + width = LHS Panel width */
- height: 19px; /* padding + height = 29px, same as mx_RoomSubList_stickyContainer */
+ height: 19px; /* height + padding = 31px = mx_RoomSubList_label height */
padding-left: 16px; /* gutter */
padding-right: 16px; /* gutter */
padding-top: 6px;
From 72563e61142197c333105bd0c8a51ec0519a8a1c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 29 Nov 2017 18:50:22 +0000
Subject: [PATCH 11/71] overflow hidden for groupPublicity scrollbox
---
.../css/matrix-react-sdk/views/groups/_GroupUserSettings.scss | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss
index 8083306b..0c909b7c 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss
@@ -19,4 +19,5 @@ limitations under the License.
border: 1px solid $primary-hairline-color;
border-radius: 3px;
margin-right: 32px;
+ overflow: hidden;
}
From f72b44650b70694a6141e45df21c6632d137f24a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 29 Nov 2017 22:04:40 +0000
Subject: [PATCH 12/71] fix tertiary accent colors
---
src/skins/vector/css/themes/_base.scss | 6 +++---
src/skins/vector/css/themes/_dark.scss | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index 327f2e4a..d5e862ae 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -49,7 +49,7 @@ $plinth-bg-color: $secondary-accent-color;
$droptarget-bg-color: rgba(255,255,255,0.5);
// used by AddressSelector
-$selected-color: #eaf5f0;
+$selected-color: $secondary-accent-color;
// selected for hoverover & selected event tiles
$event-selected-color: #f7f7f7;
@@ -105,14 +105,14 @@ $roomtile-selected-bg-color: rgba(255, 255, 255, 0.8);
$roomtile-focused-bg-color: rgba(255, 255, 255, 0.9);
$roomsublist-label-fg-color: $h3-color;
-$roomsublist-label-bg-color: #d3efe1;
+$roomsublist-label-bg-color: $tertiary-accent-color;
$roomsublist-chevron-color: $accent-color;
$panel-divider-color: rgba(118, 207, 166, 0.2);
// ********************
-$widget-menu-bar-bg-color: #d3efe1;
+$widget-menu-bar-bg-color: $tertiary-accent-color;
// ********************
diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss
index c140f707..60ffeca8 100644
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/src/skins/vector/css/themes/_dark.scss
@@ -29,12 +29,13 @@ $preview-bar-bg-color: #333;
// left-panel style muted accent color
$secondary-accent-color: $primary-bg-color;
+$tertiary-accent-color: #454545;
// stop the tinter trying to change the secondary accent color
// by overriding the key to something untintable
// XXX: this is a bit of a hack.
#mx_theme_secondaryAccentColor {
- color: #c0ff33 ! important; // deliberately off by one
+ color: #c0ffee ! important;
}
#mx_theme_tertiaryAccentColor {
@@ -103,14 +104,14 @@ $roomtile-selected-bg-color: rgba(255, 255, 255, 0.05);
$roomtile-focused-bg-color: rgba(255, 255, 255, 0.2);
$roomsublist-label-fg-color: $h3-color;
-$roomsublist-label-bg-color: #454545;
+$roomsublist-label-bg-color: $tertiary-accent-color;
$roomsublist-chevron-color: $accent-color;
$panel-divider-color: rgba(118, 207, 166, 0.2);
// ********************
-$widget-menu-bar-bg-color: #454545;
+$widget-menu-bar-bg-color: $tertiary-accent-color;
// ********************
From 4e7a1e9653b76f8a0a36d81d14a9205b4cfed987 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 30 Nov 2017 11:07:27 +0000
Subject: [PATCH 13/71] Correctly position TagPanel createGroupButton
---
.../vector/css/matrix-react-sdk/structures/_TagPanel.scss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss b/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
index 6c8f7197..b557710b 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
@@ -63,9 +63,9 @@ limitations under the License.
}
.mx_TagPanel_createGroupButton {
- cursor: pointer;
opacity: 0.5;
- margin-bottom: 12px;
+ margin-bottom: 17px;
+ height: 25px;
}
.mx_TagPanel_createGroupButton:hover {
From 1ccffb7e58497665fdd7b7558eee050907c9ca11 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 1 Dec 2017 10:56:25 +0000
Subject: [PATCH 14/71] Update imports for accessing KeyCode
---
src/components/structures/LeftPanel.js | 2 +-
src/components/structures/RoomSubList.js | 2 +-
src/components/structures/SearchBox.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 60f07a62..fa3a593c 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -20,7 +20,7 @@ import React from 'react';
import { DragDropContext } from 'react-dnd';
import HTML5Backend from 'react-dnd-html5-backend';
import classNames from 'classnames';
-import KeyCode from 'matrix-react-sdk/lib/KeyCode';
+import { KeyCode } from 'matrix-react-sdk/lib/Keyboard';
import sdk from 'matrix-react-sdk';
import dis from 'matrix-react-sdk/lib/dispatcher';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index c3f51bc8..e1b2f96e 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -30,7 +30,7 @@ var RoomNotifs = require('matrix-react-sdk/lib/RoomNotifs');
var FormattingUtils = require('matrix-react-sdk/lib/utils/FormattingUtils');
var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
import Modal from 'matrix-react-sdk/lib/Modal';
-import KeyCode from 'matrix-react-sdk/lib/KeyCode';
+import { KeyCode } from 'matrix-react-sdk/lib/Keyboard';
// turn this on for drop & drag console debugging galore
var debug = false;
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 7de3958a..2d6e6ae0 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -18,7 +18,7 @@ limitations under the License.
import React from 'react';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
-import KeyCode from 'matrix-react-sdk/lib/KeyCode';
+import { KeyCode } from 'matrix-react-sdk/lib/Keyboard';
import sdk from 'matrix-react-sdk';
import dis from 'matrix-react-sdk/lib/dispatcher';
import rate_limited_func from 'matrix-react-sdk/lib/ratelimitedfunc';
From a24c42b3a8a20dcc1786c9af34548350e97ceddd Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 1 Dec 2017 11:04:46 +0000
Subject: [PATCH 15/71] Realign collpased BottomLeftMenu with create group
button
---
src/skins/vector/css/vector-web/structures/_LeftPanel.scss | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/skins/vector/css/vector-web/structures/_LeftPanel.scss b/src/skins/vector/css/vector-web/structures/_LeftPanel.scss
index 29786fad..8ae1fe15 100644
--- a/src/skins/vector/css/vector-web/structures/_LeftPanel.scss
+++ b/src/skins/vector/css/vector-web/structures/_LeftPanel.scss
@@ -44,6 +44,7 @@ limitations under the License.
.mx_LeftPanel.collapsed .mx_BottomLeftMenu {
flex: 0 0 160px;
+ margin-bottom: 9px;
}
.mx_LeftPanel .mx_BottomLeftMenu {
@@ -77,6 +78,7 @@ limitations under the License.
.mx_BottomLeftMenu_options .mx_RoleButton {
margin-left: 0px;
margin-right: 10px;
+ height: 30px;
}
.mx_BottomLeftMenu_options .mx_BottomLeftMenu_settings {
From cc4890f0b864d5a568f1a6bdafd090dbc3a8c323 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 1 Dec 2017 14:12:31 +0000
Subject: [PATCH 16/71] Fix TagPanel bg on status theme
---
src/skins/vector/themes/status/css/_status.scss | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/skins/vector/themes/status/css/_status.scss b/src/skins/vector/themes/status/css/_status.scss
index bd05efa0..ed60b83d 100644
--- a/src/skins/vector/themes/status/css/_status.scss
+++ b/src/skins/vector/themes/status/css/_status.scss
@@ -85,6 +85,7 @@ $preview-bar-bg-color: #f7f7f7;
// left-panel style muted accent color
$secondary-accent-color: #586C7B;
+$tertiary-accent-color: #DBEBF6;
// stop the tinter trying to change the secondary accent color
// by overriding the key to something untintable
@@ -236,7 +237,7 @@ $progressbar-color: #000;
.mx_RoomSubList_label {
font-size: 13px;
font-family: $header-font-family;
- letter-spacing: 1px;
+ letter-spacing: 1px;
}
// FIXME: all these ! importants are horrid - we should instead go and define
From e80c4fadea7cc60488bf4a17e9b34ea70ef4914a Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 1 Dec 2017 18:18:48 +0000
Subject: [PATCH 17/71] Linting
---
src/components/structures/RoomSubList.js | 29 +++++++++++-------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index e1b2f96e..9ad265dc 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -327,40 +327,37 @@ var RoomSubList = React.createClass({
},
calcManualOrderTagData: function(room) {
- var index = this.state.sortedList.indexOf(room);
+ const index = this.state.sortedList.indexOf(room);
// we sort rooms by the lexicographic ordering of the 'order' metadata on their tags.
// for convenience, we calculate this for now a floating point number between 0.0 and 1.0.
- var orderA = 0.0; // by default we're next to the beginning of the list
+ let orderA = 0.0; // by default we're next to the beginning of the list
if (index > 0) {
- var prevTag = this.state.sortedList[index - 1].tags[this.props.tagName];
+ const prevTag = this.state.sortedList[index - 1].tags[this.props.tagName];
if (!prevTag) {
- console.error("Previous room in sublist is not tagged to be in this list. This should never happen.")
- }
- else if (prevTag.order === undefined) {
+ console.error("Previous room in sublist is not tagged to be in this list. This should never happen.");
+ } else if (prevTag.order === undefined) {
console.error("Previous room in sublist has no ordering metadata. This should never happen.");
- }
- else {
+ } else {
orderA = prevTag.order;
}
}
- var orderB = 1.0; // by default we're next to the end of the list too
+ let orderB = 1.0; // by default we're next to the end of the list too
if (index < this.state.sortedList.length - 1) {
- var nextTag = this.state.sortedList[index + 1].tags[this.props.tagName];
+ const nextTag = this.state.sortedList[index + 1].tags[this.props.tagName];
if (!nextTag) {
- console.error("Next room in sublist is not tagged to be in this list. This should never happen.")
- }
- else if (nextTag.order === undefined) {
+ console.error("Next room in sublist is not tagged to be in this list. This should never happen.");
+ } else if (nextTag.order === undefined) {
console.error("Next room in sublist has no ordering metadata. This should never happen.");
- }
- else {
+ } else {
orderB = nextTag.order;
}
}
- var order = (orderA + orderB) / 2.0;
+ const order = (orderA + orderB) / 2.0;
+
if (order === orderA || order === orderB) {
console.error("Cannot describe new list position. This should be incredibly unlikely.");
// TODO: renumber the list
From b0d115a64ac35b2a87fdcc11c7d7eec4f4228836 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 1 Dec 2017 18:20:38 +0000
Subject: [PATCH 18/71] Implement renumeration of ordered tags upon collision
I was being bitten by this enough for me to want to fix it. This implementation really ought to be improved such that it doesnt tend towards being broken the more it is used.
---
src/components/structures/RoomSubList.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 9ad265dc..251c6522 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -360,7 +360,13 @@ var RoomSubList = React.createClass({
if (order === orderA || order === orderB) {
console.error("Cannot describe new list position. This should be incredibly unlikely.");
- // TODO: renumber the list
+ this.state.sortedList.forEach((room, index) => {
+ MatrixClientPeg.get().setRoomTag(
+ room.roomId, this.props.tagName,
+ {order: index / this.state.sortedList.length},
+ );
+ });
+ return index / this.state.sortedList.length;
}
return order;
From 380625241e7d7ac6bb35f7bb1c85d6a6234c1b62 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Sun, 3 Dec 2017 11:25:52 +0000
Subject: [PATCH 19/71] Green camera icon
---
src/skins/vector/img/camera_green.svg | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 src/skins/vector/img/camera_green.svg
diff --git a/src/skins/vector/img/camera_green.svg b/src/skins/vector/img/camera_green.svg
new file mode 100644
index 00000000..5aae5502
--- /dev/null
+++ b/src/skins/vector/img/camera_green.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="2048px" height="1792px" viewBox="0 0 2048 1792" enable-background="new 0 0 2048 1792" xml:space="preserve">
+<path fill="#76CFA6" d="M1024,672c79.333,0,147.166,28.167,203.5,84.5c56.333,56.334,84.5,124.167,84.5,203.5
+ c0,79.334-28.167,147.167-84.5,203.5c-56.334,56.334-124.167,84.5-203.5,84.5c-79.334,0-147.167-28.166-203.5-84.5
+ C764.166,1107.167,736,1039.334,736,960c0-79.333,28.166-147.166,84.5-203.5C876.833,700.167,944.666,672,1024,672z M1728,256
+ c70.666,0,131,25,181,75s75,110.334,75,181v896c0,70.667-25,131-75,181s-110.334,75-181,75H320c-70.667,0-131-25-181-75
+ s-75-110.333-75-181V512c0-70.666,25-131,75-181s110.333-75,181-75h224l51-136c12.666-32.666,35.833-60.833,69.5-84.5
+ C698.166,11.834,732.666,0,768,0h512c35.333,0,69.833,11.834,103.5,35.5c33.666,23.667,56.833,51.834,69.5,84.5l51,136H1728z
+ M1024,1408c123.333,0,228.833-43.833,316.5-131.5c87.666-87.666,131.5-193.166,131.5-316.5c0-123.333-43.834-228.833-131.5-316.5
+ C1252.833,555.834,1147.333,512,1024,512c-123.334,0-228.834,43.834-316.5,131.5C619.833,731.167,576,836.667,576,960
+ c0,123.334,43.833,228.834,131.5,316.5C795.166,1364.167,900.666,1408,1024,1408z"/>
+</svg>
From 1a0c0af447a908377fd526f9eacfdde84d06ccfa Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 4 Dec 2017 12:25:54 +0000
Subject: [PATCH 20/71] Bump js-sdk to 0.9.2, react-sdk to 0.11.3
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index e6d3e1f2..a4ca44ad 100644
--- a/package.json
+++ b/package.json
@@ -68,8 +68,8 @@
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3",
- "matrix-js-sdk": "0.9.1",
- "matrix-react-sdk": "0.11.2",
+ "matrix-js-sdk": "0.9.2",
+ "matrix-react-sdk": "0.11.3",
"modernizr": "^3.1.0",
"pako": "^1.0.5",
"prop-types": "^15.5.10",
From c685546e9a6e6a598fd8bdd5c5318497d9f36ea8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 4 Dec 2017 12:25:54 +0000
Subject: [PATCH 21/71] Bump js-sdk to 0.9.2, react-sdk to 0.11.3
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index e6d3e1f2..a4ca44ad 100644
--- a/package.json
+++ b/package.json
@@ -68,8 +68,8 @@
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3",
- "matrix-js-sdk": "0.9.1",
- "matrix-react-sdk": "0.11.2",
+ "matrix-js-sdk": "0.9.2",
+ "matrix-react-sdk": "0.11.3",
"modernizr": "^3.1.0",
"pako": "^1.0.5",
"prop-types": "^15.5.10",
From 5fba5b30e92edd871f3c968b4a2d399a1a0fe839 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 4 Dec 2017 12:29:32 +0000
Subject: [PATCH 22/71] v0.13.3
---
electron_app/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/electron_app/package.json b/electron_app/package.json
index 85e7358b..ad237ebe 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "0.13.2",
+ "version": "0.13.3",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
From 8ec48db86ce1c70a857a9dcbf81a42e1d630ba74 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 4 Dec 2017 12:31:50 +0000
Subject: [PATCH 23/71] Prepare changelog for v0.13.3
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d683290..c72ea8da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.13.3](https://github.com/vector-im/riot-web/releases/tag/v0.13.3) (2017-12-04)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.13.2...v0.13.3)
+
+ * Bump js-sdk, react-sdk version to pull in fix for [setting room publicity in a group](https://github.com/matrix-org/matrix-js-sdk/commit/aa3201ebb0fff5af2fb733080aa65ed1f7213de6).
+
Changes in [0.13.2](https://github.com/vector-im/riot-web/releases/tag/v0.13.2) (2017-11-28)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.13.1...v0.13.2)
From b73f0c7b905732a4158293eeb38a58b19be02257 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 4 Dec 2017 12:31:50 +0000
Subject: [PATCH 24/71] v0.13.3
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index a4ca44ad..050c9f32 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "0.13.2",
+ "version": "0.13.3",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"repository": {
From e0ae266bb2f367aa1701b986473cf082aa6ccdf7 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 5 Dec 2017 18:07:19 +0000
Subject: [PATCH 25/71] Make cursor pointer on menubar mouseover.
---
.../vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
index 8376cea7..975d16f6 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@@ -85,6 +85,7 @@ limitations under the License.
flex-direction: row;
align-items: center;
justify-content: space-between;
+ cursor: pointer;
}
.mx_AppTileMenuBarWidgets {
From c37c50e1e03e7290eb4ab371f7004aa6d902c384 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 5 Dec 2017 18:07:49 +0000
Subject: [PATCH 26/71] Add maximise and minimise icons
---
src/skins/vector/img/maximize.svg | 9 +++++++++
src/skins/vector/img/minimize.svg | 8 ++++++++
2 files changed, 17 insertions(+)
create mode 100644 src/skins/vector/img/maximize.svg
create mode 100644 src/skins/vector/img/minimize.svg
diff --git a/src/skins/vector/img/maximize.svg b/src/skins/vector/img/maximize.svg
new file mode 100644
index 00000000..4f9e1019
--- /dev/null
+++ b/src/skins/vector/img/maximize.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="1792px" height="1792px" viewBox="0 0 1792 1792" enable-background="new 0 0 1792 1792" xml:space="preserve">
+<path fill="#76CFA6" d="M256,1408h1280V640H256V1408z M1792,288v1216c0,44-15.667,81.667-47,113s-69,47-113,47H160
+ c-44,0-81.667-15.667-113-47s-47-69-47-113V288c0-44,15.667-81.667,47-113s69-47,113-47h1472c44,0,81.667,15.667,113,47
+ S1792,244,1792,288z"/>
+</svg>
diff --git a/src/skins/vector/img/minimize.svg b/src/skins/vector/img/minimize.svg
new file mode 100644
index 00000000..410b0bc0
--- /dev/null
+++ b/src/skins/vector/img/minimize.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="1792px" height="1792px" viewBox="0 0 1792 1792" enable-background="new 0 0 1792 1792" xml:space="preserve">
+<path fill="#76CFA6" d="M1792,1312v192c0,44-15.667,81.667-47,113s-69,47-113,47H160c-44,0-81.667-15.667-113-47s-47-69-47-113v-192
+ c0-44,15.667-81.667,47-113s69-47,113-47h1472c44,0,81.667,15.667,113,47S1792,1268,1792,1312z"/>
+</svg>
From 0ff5d6118981b6a9f4f50405f7eaba65b07fdb41 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 5 Dec 2017 18:44:24 +0000
Subject: [PATCH 27/71] Don't capture pointer events.
---
.../css/matrix-react-sdk/views/rooms/_AppsDrawer.scss | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
index 975d16f6..2d61ca77 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@@ -88,12 +88,20 @@ limitations under the License.
cursor: pointer;
}
+.mx_AppTileMenuBarTitle {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ pointer-events: none;
+}
+
.mx_AppTileMenuBarWidgets {
float: right;
display: flex;
flex-direction: row;
align-items: center;
}
+
.mx_AppTileMenuBarWidget {
// pointer-events: none;
cursor: pointer;
From 608a359e0a9ca7b3798cf860c0b11ee6ede14097 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 6 Dec 2017 14:54:35 +0000
Subject: [PATCH 28/71] Move DND wrapper to top level component
---
src/components/structures/LeftPanel.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index fa3a593c..f78835b4 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -17,8 +17,6 @@ limitations under the License.
'use strict';
import React from 'react';
-import { DragDropContext } from 'react-dnd';
-import HTML5Backend from 'react-dnd-html5-backend';
import classNames from 'classnames';
import { KeyCode } from 'matrix-react-sdk/lib/Keyboard';
import sdk from 'matrix-react-sdk';
@@ -199,4 +197,4 @@ var LeftPanel = React.createClass({
}
});
-module.exports = DragDropContext(HTML5Backend)(LeftPanel);
+module.exports = LeftPanel;
From 10c6f24a8325376c62db690e35f00c0949e46b38 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 10 Dec 2017 12:46:12 +0000
Subject: [PATCH 29/71] CSS and Context Menu tweaks for Rich Quoting/Replies
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/context_menus/MessageContextMenu.js | 4 +--
.../views/rooms/_Autocomplete.scss | 29 +++++++++++++++++--
.../views/rooms/_EventTile.scss | 4 +--
3 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index d8f9a4da..dfff031f 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -171,8 +171,8 @@ module.exports = React.createClass({
onQuoteClick: function() {
dis.dispatch({
- action: 'quote',
- text: this.props.eventTileOps.getInnerText(),
+ action: 'quote_event',
+ event: this.props.mxEvent,
});
this.closeMenu();
},
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss
index 6bf3f3b6..8ce81c0d 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss
@@ -1,4 +1,17 @@
.mx_Autocomplete {
+ position: absolute;
+ bottom: 0;
+ z-index: 1001;
+ width: 100%;
+ border: 1px solid $primary-hairline-color;
+ background: $primary-bg-color;
+ border-bottom: none;
+ border-radius: 4px 4px 0 0;
+ max-height: 50vh;
+ overflow: auto
+}
+
+.mx_Quoting {
position: absolute;
bottom: 0;
z-index: 1000;
@@ -11,7 +24,7 @@
overflow: auto
}
-.mx_Autocomplete_ProviderSection {
+.mx_Autocomplete_ProviderSection, .mx_Quoting_section {
border-bottom: 1px solid $primary-hairline-color;
}
@@ -74,13 +87,25 @@
outline: none;
}
-.mx_Autocomplete_provider_name {
+.mx_Autocomplete_provider_name, .mx_Quoting_header {
margin: 12px;
color: $primary-fg-color;
font-weight: 400;
opacity: 0.4;
}
+.mx_Quoting_title {
+ float: left;
+}
+
+.mx_Quoting_cancel {
+ float: right;
+}
+
+.mx_Quoting_clear {
+ clear: both;
+}
+
/* styling for common completion elements */
.mx_Autocomplete_Completion_subtitle {
font-style: italic;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index cfc46e85..b4a42420 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -109,7 +109,7 @@ limitations under the License.
/* this is used for the tile for the event which is selected via the URL.
* TODO: ultimately we probably want some transition on here.
*/
-.mx_EventTile_selected .mx_EventTile_line {
+.mx_EventTile_selected > .mx_EventTile_line {
border-left: $accent-color 5px solid;
padding-left: 60px;
background-color: $event-selected-color;
@@ -209,7 +209,7 @@ limitations under the License.
visibility: visible;
}
-.mx_EventTile_selected .mx_MessageTimestamp {
+.mx_EventTile_selected > div > a > .mx_MessageTimestamp {
left: 3px;
width: auto;
}
From 25bfb52e7e7544df64637da25debe08267fd2efd Mon Sep 17 00:00:00 2001
From: pafcu <pafcu@iki.fi>
Date: Tue, 12 Dec 2017 19:49:48 +0100
Subject: [PATCH 30/71] Instructions on security issues
It's not good to put potentially sensitive security issues in the public bug tracker, so advice to use security@matrix.org instead
---
.github/ISSUE_TEMPLATE.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 7e1d380c..ba4adf39 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,5 @@
+<!-- Please report security issues by email to security@matrix.org -->
+
<!-- This is a bug report template. By following the instructions below and
filling out the sections with your information, you will help the us to get all
the necessary data to fix your issue.
From 54a9ccdee759d38b24f3597a8e4fc70a980117c2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Dec 2017 23:36:10 +0000
Subject: [PATCH 31/71] throw new quoting behind flags
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/context_menus/MessageContextMenu.js | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index dfff031f..f2a10674 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -170,10 +170,17 @@ module.exports = React.createClass({
},
onQuoteClick: function() {
- dis.dispatch({
- action: 'quote_event',
- event: this.props.mxEvent,
- });
+ if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
+ dis.dispatch({
+ action: 'quote_event',
+ event: this.props.mxEvent,
+ });
+ } else {
+ dis.dispatch({
+ action: 'quote',
+ text: this.props.eventTileOps.getInnerText(),
+ });
+ }
this.closeMenu();
},
From 4bc99b7f01c7b9488c748b05cb722ccb7217190d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Dec 2017 23:40:02 +0000
Subject: [PATCH 32/71] move QuotePreview CSS out to own file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/skins/vector/css/_components.scss | 1 +
.../views/rooms/_Autocomplete.scss | 30 ++--------------
.../views/rooms/_QuotePreview.scss | 35 +++++++++++++++++++
3 files changed, 39 insertions(+), 27 deletions(-)
create mode 100644 src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 0dd6a1b1..01665851 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -70,6 +70,7 @@
@import "./matrix-react-sdk/views/rooms/_RoomTile.scss";
@import "./matrix-react-sdk/views/rooms/_SearchableEntityList.scss";
@import "./matrix-react-sdk/views/rooms/_TopUnreadMessagesBar.scss";
+@import "./matrix-react-sdk/views/rooms/_QuotePreview.scss";
@import "./matrix-react-sdk/views/settings/_DevicesPanel.scss";
@import "./matrix-react-sdk/views/settings/_IntegrationsManager.scss";
@import "./matrix-react-sdk/views/voip/_CallView.scss";
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss
index 8ce81c0d..732ada08 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss
@@ -11,20 +11,7 @@
overflow: auto
}
-.mx_Quoting {
- position: absolute;
- bottom: 0;
- z-index: 1000;
- width: 100%;
- border: 1px solid $primary-hairline-color;
- background: $primary-bg-color;
- border-bottom: none;
- border-radius: 4px 4px 0 0;
- max-height: 50vh;
- overflow: auto
-}
-
-.mx_Autocomplete_ProviderSection, .mx_Quoting_section {
+.mx_Autocomplete_ProviderSection {
border-bottom: 1px solid $primary-hairline-color;
}
@@ -87,25 +74,13 @@
outline: none;
}
-.mx_Autocomplete_provider_name, .mx_Quoting_header {
+.mx_Autocomplete_provider_name {
margin: 12px;
color: $primary-fg-color;
font-weight: 400;
opacity: 0.4;
}
-.mx_Quoting_title {
- float: left;
-}
-
-.mx_Quoting_cancel {
- float: right;
-}
-
-.mx_Quoting_clear {
- clear: both;
-}
-
/* styling for common completion elements */
.mx_Autocomplete_Completion_subtitle {
font-style: italic;
@@ -115,3 +90,4 @@
.mx_Autocomplete_Completion_description {
color: gray;
}
+
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss
new file mode 100644
index 00000000..f0fb62b8
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss
@@ -0,0 +1,35 @@
+.mx_QuotePreview {
+ position: absolute;
+ bottom: 0;
+ z-index: 1000;
+ width: 100%;
+ border: 1px solid $primary-hairline-color;
+ background: $primary-bg-color;
+ border-bottom: none;
+ border-radius: 4px 4px 0 0;
+ max-height: 50vh;
+ overflow: auto
+}
+
+.mx_QuotePreview_section {
+ border-bottom: 1px solid $primary-hairline-color;
+}
+
+.mx_QuotePreview_header {
+ margin: 12px;
+ color: $primary-fg-color;
+ font-weight: 400;
+ opacity: 0.4;
+}
+
+.mx_QuotePreview_title {
+ float: left;
+}
+
+.mx_QuotePreview_cancel {
+ float: right;
+}
+
+.mx_QuotePreview_clear {
+ clear: both;
+}
From 9c38794ad588474e8b3201ae1a985dca5551a536 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Dec 2017 18:37:44 +0000
Subject: [PATCH 33/71] Style datesep inside Quote
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/skins/vector/css/_components.scss | 1 +
.../views/elements/_Quote.scss | 22 +++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 src/skins/vector/css/matrix-react-sdk/views/elements/_Quote.scss
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 01665851..c2725aeb 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -39,6 +39,7 @@
@import "./matrix-react-sdk/views/elements/_RichText.scss";
@import "./matrix-react-sdk/views/elements/_RoleButton.scss";
@import "./matrix-react-sdk/views/elements/_ToolTipButton.scss";
+@import "./matrix-react-sdk/views/elements/_Quote.scss";
@import "./matrix-react-sdk/views/groups/_GroupPublicityToggle.scss";
@import "./matrix-react-sdk/views/groups/_GroupRoomList.scss";
@import "./matrix-react-sdk/views/groups/_GroupUserSettings.scss";
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_Quote.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_Quote.scss
new file mode 100644
index 00000000..2ccde389
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_Quote.scss
@@ -0,0 +1,22 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+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.
+*/
+
+.mx_Quote .mx_DateSeparator {
+ font-size: 1em !important;
+ margin-bottom: 0;
+ padding-bottom: 1px;
+ bottom: -5px;
+}
From 304d281ed2ae4801cba26441ee948f30ab2b791c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Dec 2017 19:01:56 +0000
Subject: [PATCH 34/71] change reply to be its own thing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/context_menus/MessageContextMenu.js | 38 ++++++++++++-------
src/i18n/strings/en_EN.json | 3 +-
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index f2a10674..84bebc13 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -25,6 +25,7 @@ import { _t } from 'matrix-react-sdk/lib/languageHandler';
const Modal = require('matrix-react-sdk/lib/Modal');
const Resend = require("matrix-react-sdk/lib/Resend");
import SettingsStore from "matrix-react-sdk/lib/settings/SettingsStore";
+import {makeEventPermalink} from 'matrix-react-sdk/lib/matrix-to';
module.exports = React.createClass({
displayName: 'MessageContextMenu',
@@ -170,17 +171,18 @@ module.exports = React.createClass({
},
onQuoteClick: function() {
- if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
- dis.dispatch({
- action: 'quote_event',
- event: this.props.mxEvent,
- });
- } else {
- dis.dispatch({
- action: 'quote',
- text: this.props.eventTileOps.getInnerText(),
- });
- }
+ dis.dispatch({
+ action: 'quote',
+ text: this.props.eventTileOps.getInnerText(),
+ });
+ this.closeMenu();
+ },
+
+ onReplyClick: function() {
+ dis.dispatch({
+ action: 'quote_event',
+ event: this.props.mxEvent,
+ });
this.closeMenu();
},
@@ -197,6 +199,7 @@ module.exports = React.createClass({
let permalinkButton;
let externalURLButton;
let quoteButton;
+ let replyButton;
if (eventStatus === 'not_sent') {
resendButton = (
@@ -268,8 +271,8 @@ module.exports = React.createClass({
// XXX: if we use room ID, we should also include a server where the event can be found (other than in the domain of the event ID)
permalinkButton = (
<div className="mx_MessageContextMenu_field">
- <a href={ "https://matrix.to/#/" + this.props.mxEvent.getRoomId() +"/"+ this.props.mxEvent.getId() }
- target="_blank" rel="noopener" onClick={ this.closeMenu }>{ _t('Permalink') }</a>
+ <a href={makeEventPermalink(this.props.mxEvent.getRoomId(), this.props.mxEvent.getId())}
+ target="_blank" rel="noopener" onClick={this.closeMenu}>{ _t('Permalink') }</a>
</div>
);
@@ -279,6 +282,14 @@ module.exports = React.createClass({
{ _t('Quote') }
</div>
);
+
+ if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
+ replyButton = (
+ <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
+ { _t('Reply') }
+ </div>
+ );
+ }
}
// Bridges can provide a 'external_url' to link back to the source.
@@ -304,6 +315,7 @@ module.exports = React.createClass({
{unhidePreviewButton}
{permalinkButton}
{quoteButton}
+ {replyButton}
{externalURLButton}
</div>
);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c1857e31..cdca2570 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -217,5 +217,6 @@
"Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot",
"Dev chat for the Riot/Web dev team": "Dev chat for the Riot/Web dev team",
"Dev chat for the Dendrite dev team": "Dev chat for the Dendrite dev team",
- "Co-ordination for Riot/Web translators": "Co-ordination for Riot/Web translators"
+ "Co-ordination for Riot/Web translators": "Co-ordination for Riot/Web translators",
+ "Reply": "Reply"
}
From 2961e1949ff3d0208983465fccb9eb29683cdf3c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Dec 2017 19:05:18 +0000
Subject: [PATCH 35/71] delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/context_menus/MessageContextMenu.js | 72 +++++++++----------
1 file changed, 35 insertions(+), 37 deletions(-)
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 84bebc13..62bffa76 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -16,14 +16,14 @@ limitations under the License.
'use strict';
-const React = require('react');
+import React from 'react';
-const MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-const dis = require('matrix-react-sdk/lib/dispatcher');
-const sdk = require('matrix-react-sdk');
+import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
+import dis from 'matrix-react-sdk/lib/dispatcher';
+import sdk from 'matrix-react-sdk';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
-const Modal = require('matrix-react-sdk/lib/Modal');
-const Resend = require("matrix-react-sdk/lib/Resend");
+import Modal from 'matrix-react-sdk/lib/Modal';
+import Resend from "matrix-react-sdk/lib/Resend";
import SettingsStore from "matrix-react-sdk/lib/settings/SettingsStore";
import {makeEventPermalink} from 'matrix-react-sdk/lib/matrix-to';
@@ -108,15 +108,14 @@ module.exports = React.createClass({
onFinished: (proceed) => {
if (!proceed) return;
- MatrixClientPeg.get().redactEvent(
- this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
- ).catch(function(e) {
+ const cli = MatrixClientPeg.get();
+ cli.redactEvent(this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()).catch(function(e) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
// display error message stating you couldn't delete this.
const code = e.errcode || e.statusCode;
Modal.createTrackedDialog('You cannot delete this message', '', ErrorDialog, {
title: _t('Error'),
- description: _t('You cannot delete this message. (%(code)s)', {code: code})
+ description: _t('You cannot delete this message. (%(code)s)', {code}),
});
}).done();
},
@@ -139,12 +138,12 @@ module.exports = React.createClass({
onPinClick: function() {
MatrixClientPeg.get().getStateEvent(this.props.mxEvent.getRoomId(), 'm.room.pinned_events', '')
- .catch(e => {
+ .catch((e) => {
// Intercept the Event Not Found error and fall through the promise chain with no event.
if (e.errcode === "M_NOT_FOUND") return null;
throw e;
})
- .then(event => {
+ .then((event) => {
const eventIds = (event ? event.pinned : []) || [];
if (!eventIds.includes(this.props.mxEvent.getId())) {
// Not pinned - add
@@ -154,7 +153,8 @@ module.exports = React.createClass({
eventIds.splice(eventIds.indexOf(this.props.mxEvent.getId()), 1);
}
- MatrixClientPeg.get().sendStateEvent(this.props.mxEvent.getRoomId(), 'm.room.pinned_events', {pinned: eventIds}, '');
+ const cli = MatrixClientPeg.get();
+ cli.sendStateEvent(this.props.mxEvent.getRoomId(), 'm.room.pinned_events', {pinned: eventIds}, '');
});
this.closeMenu();
},
@@ -193,10 +193,8 @@ module.exports = React.createClass({
let cancelButton;
let forwardButton;
let pinButton;
- let viewSourceButton;
let viewClearSourceButton;
let unhidePreviewButton;
- let permalinkButton;
let externalURLButton;
let quoteButton;
let replyButton;
@@ -237,14 +235,14 @@ module.exports = React.createClass({
if (this.state.canPin) {
pinButton = (
<div className="mx_MessageContextMenu_field" onClick={this.onPinClick}>
- {this._isPinned() ? _t('Unpin Message') : _t('Pin Message')}
+ { this._isPinned() ? _t('Unpin Message') : _t('Pin Message') }
</div>
);
}
}
}
- viewSourceButton = (
+ const viewSourceButton = (
<div className="mx_MessageContextMenu_field" onClick={this.onViewSourceClick}>
{ _t('View Source') }
</div>
@@ -269,7 +267,7 @@ module.exports = React.createClass({
}
// XXX: if we use room ID, we should also include a server where the event can be found (other than in the domain of the event ID)
- permalinkButton = (
+ const permalinkButton = (
<div className="mx_MessageContextMenu_field">
<a href={makeEventPermalink(this.props.mxEvent.getRoomId(), this.props.mxEvent.getId())}
target="_blank" rel="noopener" onClick={this.closeMenu}>{ _t('Permalink') }</a>
@@ -293,30 +291,30 @@ module.exports = React.createClass({
}
// Bridges can provide a 'external_url' to link back to the source.
- if( typeof(this.props.mxEvent.event.content.external_url) === "string") {
- externalURLButton = (
- <div className="mx_MessageContextMenu_field">
- <a href={ this.props.mxEvent.event.content.external_url }
- rel="noopener" target="_blank" onClick={ this.closeMenu }>{ _t('Source URL') }</a>
- </div>
- );
+ if (typeof(this.props.mxEvent.event.content.external_url) === "string") {
+ externalURLButton = (
+ <div className="mx_MessageContextMenu_field">
+ <a href={this.props.mxEvent.event.content.external_url}
+ rel="noopener" target="_blank" onClick={this.closeMenu}>{ _t('Source URL') }</a>
+ </div>
+ );
}
return (
<div>
- {resendButton}
- {redactButton}
- {cancelButton}
- {forwardButton}
- {pinButton}
- {viewSourceButton}
- {viewClearSourceButton}
- {unhidePreviewButton}
- {permalinkButton}
- {quoteButton}
- {replyButton}
- {externalURLButton}
+ { resendButton }
+ { redactButton }
+ { cancelButton }
+ { forwardButton }
+ { pinButton }
+ { viewSourceButton }
+ { viewClearSourceButton }
+ { unhidePreviewButton }
+ { permalinkButton }
+ { quoteButton }
+ { replyButton }
+ { externalURLButton }
</div>
);
},
From b16dcbc057bb726c9ce09fed777362e7a131e0aa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Dec 2017 19:28:19 +0000
Subject: [PATCH 36/71] styling for on-demand quote nest traversal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../vector/css/matrix-react-sdk/views/elements/_Quote.scss | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_Quote.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_Quote.scss
index 2ccde389..0af555b5 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/_Quote.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_Quote.scss
@@ -20,3 +20,7 @@ limitations under the License.
padding-bottom: 1px;
bottom: -5px;
}
+
+.mx_Quote_show {
+ cursor: pointer;
+}
From 3164655a214422c6f2e9a3fe4548c8a6f2d7c584 Mon Sep 17 00:00:00 2001
From: Alexandr Korsak <alex.korsak@gmail.com>
Date: Mon, 18 Dec 2017 22:41:46 +0300
Subject: [PATCH 37/71] Fixes #1953
---
AUTHORS.rst | 3 +++
1 file changed, 3 insertions(+)
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 68c61afb..a92ca066 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -13,3 +13,6 @@ include:
* Michael Telatynski (https://github.com/t3chguy)
Improved consistency of inverted elements in dark theme across browsers
+
+* Alexandr Korsak (https://github.com/oivoodoo)
+ Improved multiple file uploading
From 843505f6a96d7e1fba32cc8d8dafd60190fa0a33 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Dec 2017 12:03:48 +0000
Subject: [PATCH 38/71] add missing config.json entry such that scalar-staging
widgets work
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
electron_app/riot.im/config.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index 5b48cf67..5b2fe37b 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -5,6 +5,10 @@
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
+ "integrations_widgets_urls": [
+ "https://scalar-staging.riot.im/scalar/api",
+ "https://scalar.vector.im/api"
+ ],
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"welcomeUserId": "@riot-bot:matrix.org",
"roomDirectory": {
From 8a7477f50cba19d98d901007b87561a52a181382 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 20 Dec 2017 20:40:41 +0000
Subject: [PATCH 39/71] Highlight ViewSource and Devtools ViewSource
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/ViewSource.js | 15 +++---
.../views/dialogs/DevtoolsDialog.js | 9 +++-
src/components/views/elements/Highlight.js | 51 +++++++++++++++++++
src/skins/vector/css/_components.scss | 1 +
.../vector-web/views/elements/_Highlight.scss | 21 ++++++++
5 files changed, 89 insertions(+), 8 deletions(-)
create mode 100644 src/components/views/elements/Highlight.js
create mode 100644 src/skins/vector/css/vector-web/views/elements/_Highlight.scss
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index a0e198ce..8f60ae88 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -16,14 +16,17 @@ limitations under the License.
'use strict';
-var React = require('react');
+import React from 'react';
+import PropTypes from 'prop-types';
+import Highlight from '../views/elements/Highlight';
+
module.exports = React.createClass({
displayName: 'ViewSource',
propTypes: {
- content: React.PropTypes.object.isRequired,
- onFinished: React.PropTypes.func.isRequired,
+ content: PropTypes.object.isRequired,
+ onFinished: PropTypes.func.isRequired,
},
componentDidMount: function() {
@@ -45,9 +48,9 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_ViewSource">
- <pre>
- {JSON.stringify(this.props.content, null, 2)}
- </pre>
+ <Highlight className="json">
+ { JSON.stringify(this.props.content, null, 2) }
+ </Highlight>
</div>
);
}
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 5d9168f5..1b2af377 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -17,6 +17,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import sdk from 'matrix-react-sdk';
+import Highlight from '../elements/Highlight';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
@@ -343,7 +344,9 @@ class RoomStateExplorer extends DevtoolsComponent {
return <div className="mx_ViewSource">
<div className="mx_Dialog_content">
- <pre>{ JSON.stringify(this.state.event.event, null, 2) }</pre>
+ <Highlight className="json">
+ { JSON.stringify(this.state.event.event, null, 2) }
+ </Highlight>
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.onBack}>{ _t('Back') }</button>
@@ -459,7 +462,9 @@ class AccountDataExplorer extends DevtoolsComponent {
return <div className="mx_ViewSource">
<div className="mx_Dialog_content">
- <pre>{ JSON.stringify(this.state.event.event, null, 2) }</pre>
+ <Highlight className="json">
+ { JSON.stringify(this.state.event.event, null, 2) }
+ </Highlight>
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.onBack}>{ _t('Back') }</button>
diff --git a/src/components/views/elements/Highlight.js b/src/components/views/elements/Highlight.js
new file mode 100644
index 00000000..1251264e
--- /dev/null
+++ b/src/components/views/elements/Highlight.js
@@ -0,0 +1,51 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+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.
+*/
+
+'use strict';
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {highlightBlock} from 'highlight.js';
+
+export default class Highlight extends React.Component {
+ static propTypes = {
+ className: PropTypes.string,
+ children: PropTypes.node,
+ };
+
+ constructor(props, context) {
+ super(props, context);
+
+ this._ref = this._ref.bind(this);
+ }
+
+ componentDidUpdate() {
+ if (this._el) highlightBlock(this._el);
+ }
+
+ _ref(el) {
+ this._el = el;
+ this.componentDidUpdate();
+ }
+
+ render() {
+ const { className, children } = this.props;
+
+ return <pre className={`${className} mx_Highlight`} ref={this._ref}>
+ <code>{ children }</code>
+ </pre>;
+ }
+}
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 0dd6a1b1..c01a7dcf 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -91,6 +91,7 @@
@import "./vector-web/views/dialogs/_SetEmailDialog.scss";
@import "./vector-web/views/dialogs/_SetPasswordDialog.scss";
@import "./vector-web/views/directory/_NetworkDropdown.scss";
+@import "./vector-web/views/elements/_Highlight.scss";
@import "./vector-web/views/elements/_ImageView.scss";
@import "./vector-web/views/elements/_InlineSpinner.scss";
@import "./vector-web/views/elements/_Spinner.scss";
diff --git a/src/skins/vector/css/vector-web/views/elements/_Highlight.scss b/src/skins/vector/css/vector-web/views/elements/_Highlight.scss
new file mode 100644
index 00000000..9b35844f
--- /dev/null
+++ b/src/skins/vector/css/vector-web/views/elements/_Highlight.scss
@@ -0,0 +1,21 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+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.
+*/
+
+.mx_Highlight {
+ /* inhibit hljs styling */
+ background: none !important;
+ color: $light-fg-color !important;
+}
From 3600d1c667997d36b73b6f79eaf086e1f411c5c8 Mon Sep 17 00:00:00 2001
From: Nostradamos <n0stradamos@mail.ru>
Date: Tue, 2 Jan 2018 12:14:54 +0100
Subject: [PATCH 40/71] moved max-height/min-height/overflow attributes to
higher level to also include DraftEditorPlaceholder. Could fix
https://github.com/vector-im/riot-web/issues/4821
---
.../matrix-react-sdk/views/rooms/_MessageComposer.scss | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
index 14e75853..40ed59bc 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
@@ -96,6 +96,9 @@ limitations under the License.
width: 100%;
flex: 1;
word-break: break-word;
+ max-height: 120px;
+ min-height: 21px;
+ overflow: auto;
}
.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
@@ -103,12 +106,6 @@ limitations under the License.
padding-top: 2px;
}
-.mx_MessageComposer_input .public-DraftEditor-content {
- max-height: 120px;
- min-height: 21px;
- overflow: auto;
-}
-
.mx_MessageComposer_input blockquote {
color: $blockquote-fg-color;
margin: 0 0 16px;
From d71af40967a0a490f167f4696f12418129c6abca Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Dec 2017 12:03:48 +0000
Subject: [PATCH 41/71] add missing config.json entry such that scalar-staging
widgets work
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
electron_app/riot.im/config.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index 5b48cf67..5b2fe37b 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -5,6 +5,10 @@
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
+ "integrations_widgets_urls": [
+ "https://scalar-staging.riot.im/scalar/api",
+ "https://scalar.vector.im/api"
+ ],
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"welcomeUserId": "@riot-bot:matrix.org",
"roomDirectory": {
From 2eb433157aad8cb43ad95c72a55f28841b677ea1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 3 Jan 2018 16:08:38 +0000
Subject: [PATCH 42/71] v0.13.4
---
electron_app/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/electron_app/package.json b/electron_app/package.json
index ad237ebe..b33da34f 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "0.13.3",
+ "version": "0.13.4",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
From 1bb861f6cfe500ba7c92fcc001cac9ed3c679895 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 3 Jan 2018 16:13:24 +0000
Subject: [PATCH 43/71] Prepare changelog for v0.13.4
---
CHANGELOG.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c72ea8da..d93444c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+Changes in [0.13.4](https://github.com/vector-im/riot-web/releases/tag/v0.13.4) (2018-01-03)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.13.3...v0.13.4)
+
+ * Change config of riot.im electron build to fix some widgets not working. This only affects
+ electron builds using the riot.im config - for all other builds, this is identical to
+ v0.13.3.
+
Changes in [0.13.3](https://github.com/vector-im/riot-web/releases/tag/v0.13.3) (2017-12-04)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.13.2...v0.13.3)
From 5635614549dfabe805ba1235408c0a94ce1e6136 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 3 Jan 2018 16:13:24 +0000
Subject: [PATCH 44/71] v0.13.4
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 050c9f32..ac25f8e0 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "0.13.3",
+ "version": "0.13.4",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"repository": {
From 3788fde711d5d5a0f761c9b853000f5d1a4692bb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jan 2018 23:16:21 +0000
Subject: [PATCH 45/71] Add a tooltip to members button and badge with actual
count
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/RightPanel.js | 11 ++++++-----
src/i18n/strings/en_EN.json | 1 +
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 2a19794f..778c0114 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -266,6 +266,7 @@ module.exports = React.createClass({
let inviteGroup;
let membersBadge;
+ let membersTitle = _t('Members');
if ((this.state.phase == this.Phase.RoomMemberList || this.state.phase === this.Phase.RoomMemberInfo)
&& this.props.roomId
) {
@@ -273,10 +274,10 @@ module.exports = React.createClass({
const room = cli.getRoom(this.props.roomId);
let userIsInRoom;
if (room) {
- membersBadge = formatCount(room.getJoinedMembers().length);
- userIsInRoom = room.hasMembershipState(
- this.context.matrixClient.credentials.userId, 'join',
- );
+ const numMembers = room.getJoinedMembers().length;
+ membersTitle = _t('%(numMembers)s Members', { numMembers });
+ membersBadge = <div title={membersTitle}>{ formatCount(numMembers) }</div>;
+ userIsInRoom = room.hasMembershipState(this.context.matrixClient.credentials.userId, 'join');
}
if (userIsInRoom) {
@@ -298,7 +299,7 @@ module.exports = React.createClass({
let headerButtons = [];
if (this.props.roomId) {
headerButtons = [
- <HeaderButton key="_membersButton" title={_t('Members')} iconSrc="img/icons-people.svg"
+ <HeaderButton key="_membersButton" title={membersTitle} iconSrc="img/icons-people.svg"
isHighlighted={[this.Phase.RoomMemberList, this.Phase.RoomMemberInfo].includes(this.state.phase)}
clickPhase={this.Phase.RoomMemberList}
badge={membersBadge}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c1857e31..52244e09 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -158,6 +158,7 @@
"Register": "Register",
"Invite to this room": "Invite to this room",
"Members": "Members",
+ "%(numMembers)s Members": "%(numMembers)s Members",
"Files": "Files",
"Notifications": "Notifications",
"Rooms": "Rooms",
From c68c54618f37d70f485f40719021efa7448bbb80 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jan 2018 23:19:43 +0000
Subject: [PATCH 46/71] delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/RightPanel.js | 58 ++++++++++++-------------
1 file changed, 27 insertions(+), 31 deletions(-)
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 778c0114..da1e7117 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -24,7 +24,7 @@ import sdk from 'matrix-react-sdk';
import dis from 'matrix-react-sdk/lib/dispatcher';
import { MatrixClient } from 'matrix-js-sdk';
import Analytics from 'matrix-react-sdk/lib/Analytics';
-import rate_limited_func from 'matrix-react-sdk/lib/ratelimitedfunc';
+import RateLimitedFunc from 'matrix-react-sdk/lib/ratelimitedfunc';
import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
import { showGroupInviteDialog, showGroupAddRoomDialog } from 'matrix-react-sdk/lib/GroupAddressPicker';
import GroupStoreCache from 'matrix-react-sdk/lib/stores/GroupStoreCache';
@@ -58,8 +58,8 @@ class HeaderButton extends React.Component {
<div className="mx_RightPanel_headerButton_badge">
{ this.props.badge ? this.props.badge : <span> </span> }
</div>
- <TintableSvg src={this.props.iconSrc} width="25" height="25"/>
- { this.props.isHighlighted ? <div className="mx_RightPanel_headerButton_highlight"></div> : <div/> }
+ <TintableSvg src={this.props.iconSrc} width="25" height="25" />
+ { this.props.isHighlighted ? <div className="mx_RightPanel_headerButton_highlight" /> : <div /> }
</AccessibleButton>;
}
@@ -184,18 +184,17 @@ module.exports = React.createClass({
onRoomStateMember: function(ev, state, member) {
// redraw the badge on the membership list
- if (this.state.phase == this.Phase.RoomMemberList && member.roomId === this.props.roomId) {
+ if (this.state.phase === this.Phase.RoomMemberList && member.roomId === this.props.roomId) {
this._delayedUpdate();
- }
- else if (this.state.phase === this.Phase.RoomMemberInfo && member.roomId === this.props.roomId &&
+ } else if (this.state.phase === this.Phase.RoomMemberInfo && member.roomId === this.props.roomId &&
member.userId === this.state.member.userId) {
// refresh the member info (e.g. new power level)
this._delayedUpdate();
}
},
- _delayedUpdate: new rate_limited_func(function() {
- this.forceUpdate();
+ _delayedUpdate: new RateLimitedFunc(function() {
+ this.forceUpdate(); // eslint-disable-line babel/no-invalid-this
}, 500),
onAction: function(payload) {
@@ -267,7 +266,7 @@ module.exports = React.createClass({
let membersBadge;
let membersTitle = _t('Members');
- if ((this.state.phase == this.Phase.RoomMemberList || this.state.phase === this.Phase.RoomMemberInfo)
+ if ((this.state.phase === this.Phase.RoomMemberList || this.state.phase === this.Phase.RoomMemberInfo)
&& this.props.roomId
) {
const cli = this.context.matrixClient;
@@ -282,7 +281,7 @@ module.exports = React.createClass({
if (userIsInRoom) {
inviteGroup =
- <AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
+ <AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteButtonClick}>
<div className="mx_RightPanel_icon" >
<TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
</div>
@@ -293,7 +292,7 @@ module.exports = React.createClass({
const isPhaseGroup = [
this.Phase.GroupMemberInfo,
- this.Phase.GroupMemberList
+ this.Phase.GroupMemberList,
].includes(this.state.phase);
let headerButtons = [];
@@ -337,54 +336,54 @@ module.exports = React.createClass({
// button on these 2 screens or you won't be able to re-expand the panel.
headerButtons.push(
<div className="mx_RightPanel_headerButton mx_RightPanel_collapsebutton" key="_minimizeButton"
- title={ _t("Hide panel") } aria-label={ _t("Hide panel") } onClick={ this.onCollapseClick }
+ title={_t("Hide panel")} aria-label={_t("Hide panel")} onClick={this.onCollapseClick}
>
- <TintableSvg src="img/minimise.svg" width="10" height="16"/>
+ <TintableSvg src="img/minimise.svg" width="10" height="16" />
</div>,
);
}
let panel = <div />;
if (!this.props.collapsed) {
- if (this.props.roomId && this.state.phase == this.Phase.RoomMemberList) {
+ if (this.props.roomId && this.state.phase === this.Phase.RoomMemberList) {
panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />;
- } else if (this.props.groupId && this.state.phase == this.Phase.GroupMemberList) {
+ } else if (this.props.groupId && this.state.phase === this.Phase.GroupMemberList) {
panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
} else if (this.state.phase === this.Phase.GroupRoomList) {
panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
- } else if (this.state.phase == this.Phase.RoomMemberInfo) {
+ } else if (this.state.phase === this.Phase.RoomMemberInfo) {
panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.state.member.userId} />;
- } else if (this.state.phase == this.Phase.GroupMemberInfo) {
+ } else if (this.state.phase === this.Phase.GroupMemberInfo) {
panel = <GroupMemberInfo
groupMember={this.state.member}
groupId={this.props.groupId}
key={this.state.member.user_id} />;
- } else if (this.state.phase == this.Phase.GroupRoomInfo) {
+ } else if (this.state.phase === this.Phase.GroupRoomInfo) {
panel = <GroupRoomInfo
groupRoomId={this.state.groupRoomId}
groupId={this.props.groupId}
key={this.state.groupRoomId} />;
- } else if (this.state.phase == this.Phase.NotificationPanel) {
+ } else if (this.state.phase === this.Phase.NotificationPanel) {
panel = <NotificationPanel />;
- } else if (this.state.phase == this.Phase.FilePanel) {
+ } else if (this.state.phase === this.Phase.FilePanel) {
panel = <FilePanel roomId={this.props.roomId} />;
}
}
if (!panel) {
- panel = <div className="mx_RightPanel_blank"></div>;
+ panel = <div className="mx_RightPanel_blank" />;
}
if (this.props.groupId && this.state.isUserPrivilegedInGroup) {
inviteGroup = isPhaseGroup ? (
- <AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
+ <AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteButtonClick}>
<div className="mx_RightPanel_icon" >
<TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
</div>
<div className="mx_RightPanel_message">{ _t('Invite to this community') }</div>
</AccessibleButton>
) : (
- <AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
+ <AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteButtonClick}>
<div className="mx_RightPanel_icon" >
<TintableSvg src="img/icons-room-add.svg" width="35" height="35" />
</div>
@@ -393,19 +392,16 @@ module.exports = React.createClass({
);
}
- let classes = classNames(
- "mx_RightPanel", "mx_fadable",
- {
- "collapsed": this.props.collapsed,
- "mx_fadable_faded": this.props.disabled,
- }
- );
+ const classes = classNames("mx_RightPanel", "mx_fadable", {
+ "collapsed": this.props.collapsed,
+ "mx_fadable_faded": this.props.disabled,
+ });
return (
<aside className={classes}>
<div className="mx_RightPanel_header">
<div className="mx_RightPanel_headerButtonGroup">
- {headerButtons}
+ { headerButtons }
</div>
</div>
{ panel }
From 290bf54d4f399aee34478f54a917c1cc59ba5a35 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jan 2018 23:55:32 +0000
Subject: [PATCH 47/71] pluralise properly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/RightPanel.js | 2 +-
src/i18n/strings/en_EN.json | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index da1e7117..82933c74 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -274,7 +274,7 @@ module.exports = React.createClass({
let userIsInRoom;
if (room) {
const numMembers = room.getJoinedMembers().length;
- membersTitle = _t('%(numMembers)s Members', { numMembers });
+ membersTitle = _t('%(count)s Members', { count: numMembers });
membersBadge = <div title={membersTitle}>{ formatCount(numMembers) }</div>;
userIsInRoom = room.hasMembershipState(this.context.matrixClient.credentials.userId, 'join');
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 52244e09..84bac98f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -158,7 +158,8 @@
"Register": "Register",
"Invite to this room": "Invite to this room",
"Members": "Members",
- "%(numMembers)s Members": "%(numMembers)s Members",
+ "%(count)s Members|other": "%(count)s Members",
+ "%(count)s Members|one": "%(count)s Member",
"Files": "Files",
"Notifications": "Notifications",
"Rooms": "Rooms",
From 5106809394bb7ae28595511bffa3dba4d2b0df10 Mon Sep 17 00:00:00 2001
From: osoitz <osoitz@users.noreply.github.com>
Date: Sun, 7 Jan 2018 20:39:24 +0100
Subject: [PATCH 48/71] Update copy-res.js
Corrected Basque name
---
scripts/copy-res.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index fe708d39..53967811 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -16,7 +16,7 @@ const INCLUDE_LANGS = [
{'value': 'el', 'label': 'Ελληνικά'},
{'value': 'eo', 'label': 'Esperanto'},
{'value': 'es', 'label': 'Español'},
- {'value': 'eu', 'label': 'Euskal'},
+ {'value': 'eu', 'label': 'Euskara'},
{'value': 'fi', 'label': 'Suomi'},
{'value': 'fr', 'label': 'Français'},
{'value': 'hu', 'label': 'Magyar'},
From b6c002b587b0bb45798973f319427204d1259ef0 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 8 Jan 2018 14:35:39 +0000
Subject: [PATCH 49/71] Fix merge
---
src/components/views/messages/MessageTimestamp.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index c802f119..f5968a68 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -29,8 +29,6 @@ module.exports = React.createClass({
render: function() {
const date = new Date(this.props.ts);
return (
- <span className="mx_MessageTimestamp">
- { DateUtils.formatTime(date)+' ' }
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
{ DateUtils.formatTime(date, this.props.showTwelveHour) + ' ' }
</span>
From 24e16e5c1868892bc27493d5900da1ec57d5462b Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 8 Jan 2018 15:17:05 +0000
Subject: [PATCH 50/71] Revert "Add a after timestamp"
---
src/components/views/messages/MessageTimestamp.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index f5968a68..3102b559 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -30,7 +30,7 @@ module.exports = React.createClass({
const date = new Date(this.props.ts);
return (
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
- { DateUtils.formatTime(date, this.props.showTwelveHour) + ' ' }
+ { DateUtils.formatTime(date, this.props.showTwelveHour) }
</span>
);
},
From 627ebb848d32e65c7b747544f97adb619327f6f3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Mon, 8 Jan 2018 21:32:25 +0000
Subject: [PATCH 51/71] Change author
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index ac25f8e0..556f0c72 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"main": "electron_app/src/electron-main.js",
"version": "0.13.4",
"description": "A feature-rich client for Matrix.org",
- "author": "Vector Creations Ltd.",
+ "author": "New Vector Ltd.",
"repository": {
"type": "git",
"url": "https://github.com/vector-im/riot-web"
From 77e2ceba9e068b7ee57d772e1b9219f92ee4386a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jan 2018 21:50:32 +0000
Subject: [PATCH 52/71] switch to new ES6 DateUtils imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/elements/ImageView.js | 4 ++--
src/components/views/messages/DateSeparator.js | 4 ++--
src/components/views/messages/MessageTimestamp.js | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index bdb9d17f..d1a34d02 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -20,7 +20,7 @@ var React = require('react');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-var DateUtils = require('matrix-react-sdk/lib/DateUtils');
+import {formatDate} from 'matrix-react-sdk/lib/DateUtils';
var filesize = require('filesize');
var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
const Modal = require('matrix-react-sdk/lib/Modal');
@@ -159,7 +159,7 @@ module.exports = React.createClass({
}
eventMeta = (<div className="mx_ImageView_metadata">
- { _t('Uploaded on %(date)s by %(user)s', {date: DateUtils.formatDate(new Date(this.props.mxEvent.getTs())), user: sender}) }
+ { _t('Uploaded on %(date)s by %(user)s', {date: formatDate(new Date(this.props.mxEvent.getTs())), user: sender}) }
</div>);
}
diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.js
index 84d63dd5..5d579e5d 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@@ -16,7 +16,7 @@ limitations under the License.
import React from 'react';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
-import DateUtils from 'matrix-react-sdk/lib/DateUtils';
+import {formatFullDate} from 'matrix-react-sdk/lib/DateUtils';
function getdaysArray() {
return [
@@ -49,7 +49,7 @@ module.exports = React.createClass({
label = days[date.getDay()];
}
else {
- label = DateUtils.formatFullDate(date, this.props.showTwelveHour);
+ label = formatFullDate(date, this.props.showTwelveHour);
}
return (
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index 3102b559..3d972e4c 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -17,7 +17,7 @@ limitations under the License.
'use strict';
import React from 'react';
-import DateUtils from 'matrix-react-sdk/lib/DateUtils';
+import {formatFullDate, formatTime} from 'matrix-react-sdk/lib/DateUtils';
module.exports = React.createClass({
displayName: 'MessageTimestamp',
@@ -29,8 +29,8 @@ module.exports = React.createClass({
render: function() {
const date = new Date(this.props.ts);
return (
- <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
- { DateUtils.formatTime(date, this.props.showTwelveHour) }
+ <span className="mx_MessageTimestamp" title={ formatFullDate(date, this.props.showTwelveHour) }>
+ { formatTime(date, this.props.showTwelveHour) }
</span>
);
},
From 17c4839029166fdf839dad273ff3adc2cc201c47 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 Jan 2018 19:21:02 +0000
Subject: [PATCH 53/71] only show reply button on REAL (not pending)
m.room.message events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/context_menus/MessageContextMenu.js | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 62bffa76..ab30c342 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -232,6 +232,14 @@ module.exports = React.createClass({
</div>
);
+ if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
+ replyButton = (
+ <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
+ { _t('Reply') }
+ </div>
+ );
+ }
+
if (this.state.canPin) {
pinButton = (
<div className="mx_MessageContextMenu_field" onClick={this.onPinClick}>
@@ -280,14 +288,6 @@ module.exports = React.createClass({
{ _t('Quote') }
</div>
);
-
- if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
- replyButton = (
- <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
- { _t('Reply') }
- </div>
- );
- }
}
// Bridges can provide a 'external_url' to link back to the source.
From 5aec6840bf804cfa26daf4dce7fe4ad9403c900c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 Jan 2018 19:33:21 +0000
Subject: [PATCH 54/71] Add cursor:pointer so that it actually looks clickable
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss
index f0fb62b8..86fd79d4 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss
@@ -28,6 +28,7 @@
.mx_QuotePreview_cancel {
float: right;
+ cursor: pointer;
}
.mx_QuotePreview_clear {
From 22c024cc94e280545cf4901c6e8d7ed555d5b271 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 14 Jan 2018 18:33:58 +0000
Subject: [PATCH 55/71] Refactor DateSep, use new
Dateutils.formatFullDateNoTime as it is not desired for it to include the
time.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/messages/DateSeparator.js | 54 ++++++++++---------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.js
index 5d579e5d..4dcac99d 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,8 +16,9 @@ limitations under the License.
*/
import React from 'react';
+import PropTypes from 'prop-types';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
-import {formatFullDate} from 'matrix-react-sdk/lib/DateUtils';
+import {formatFullDateNoTime} from 'matrix-react-sdk/lib/DateUtils';
function getdaysArray() {
return [
@@ -30,30 +32,30 @@ function getdaysArray() {
];
}
-module.exports = React.createClass({
- displayName: 'DateSeparator',
- render: function() {
- var date = new Date(this.props.ts);
- var today = new Date();
- var yesterday = new Date();
- var days = getdaysArray();
- yesterday.setDate(today.getDate() - 1);
- var label;
- if (date.toDateString() === today.toDateString()) {
- label = _t('Today');
- }
- else if (date.toDateString() === yesterday.toDateString()) {
- label = _t('Yesterday');
- }
- else if (today.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
- label = days[date.getDay()];
- }
- else {
- label = formatFullDate(date, this.props.showTwelveHour);
- }
+export class DateSeparator extends React.Component {
+ static propTypes = {
+ ts: PropTypes.number.isRequired,
+ };
- return (
- <h2 className="mx_DateSeparator">{ label }</h2>
- );
+ getLabel() {
+ const date = new Date(this.props.ts);
+ const today = new Date();
+ const yesterday = new Date();
+ const days = getdaysArray();
+ yesterday.setDate(today.getDate() - 1);
+
+ if (date.toDateString() === today.toDateString()) {
+ return _t('Today');
+ } else if (date.toDateString() === yesterday.toDateString()) {
+ return _t('Yesterday');
+ } else if (today.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
+ return days[date.getDay()];
+ } else {
+ return formatFullDateNoTime(date);
+ }
}
-});
+
+ render() {
+ return <h2 className="mx_DateSeparator">{ this.getLabel() }</h2>;
+ }
+}
From b65fdf6ab0572b5ebe26636897736fab9e4d7172 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 14 Jan 2018 18:35:53 +0000
Subject: [PATCH 56/71] refactor MessageTimestamp, as it was missing a
PropTypes def for ts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../views/messages/MessageTimestamp.js | 23 +++++++++----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index 3d972e4c..eafa25da 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,24 +15,22 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
import React from 'react';
+import PropTypes from 'prop-types';
import {formatFullDate, formatTime} from 'matrix-react-sdk/lib/DateUtils';
-module.exports = React.createClass({
- displayName: 'MessageTimestamp',
+export class MessageTimestamp extends React.Component {
+ static propTypes = {
+ ts: PropTypes.number.isRequired,
+ showTwelveHour: PropTypes.bool,
+ };
- propTypes: {
- showTwelveHour: React.PropTypes.bool,
- },
-
- render: function() {
+ render() {
const date = new Date(this.props.ts);
return (
- <span className="mx_MessageTimestamp" title={ formatFullDate(date, this.props.showTwelveHour) }>
+ <span className="mx_MessageTimestamp" title={formatFullDate(date, this.props.showTwelveHour)}>
{ formatTime(date, this.props.showTwelveHour) }
</span>
);
- },
-});
+ }
+}
From f97395f40fc95e011f6d43540a8eae5a724ab1c3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 14 Jan 2018 18:41:44 +0000
Subject: [PATCH 57/71] change exports to default to retain compatibility with
existing imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/messages/DateSeparator.js | 2 +-
src/components/views/messages/MessageTimestamp.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.js
index 4dcac99d..2e081bc6 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@@ -32,7 +32,7 @@ function getdaysArray() {
];
}
-export class DateSeparator extends React.Component {
+export default class DateSeparator extends React.Component {
static propTypes = {
ts: PropTypes.number.isRequired,
};
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index eafa25da..6d433067 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -19,7 +19,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import {formatFullDate, formatTime} from 'matrix-react-sdk/lib/DateUtils';
-export class MessageTimestamp extends React.Component {
+export default class MessageTimestamp extends React.Component {
static propTypes = {
ts: PropTypes.number.isRequired,
showTwelveHour: PropTypes.bool,
From c269abd434c24df194b7024021ce9ee958a9db96 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 16 Jan 2018 09:40:15 +0000
Subject: [PATCH 58/71] CSS required as part of moving TagPanel from react-dnd
to react-beautiful-dnd
---
.../vector/css/matrix-react-sdk/structures/_TagPanel.scss | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss b/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
index b557710b..91199a11 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
@@ -29,11 +29,13 @@ limitations under the License.
display: flex;
flex-direction: column;
align-items: center;
- margin-top: 65px;
+ padding-top: 65px;
+
+ flex-grow: 1;
}
.mx_TagPanel .mx_TagTile {
- margin: 6px 0px;
+ padding: 6px 3px;
opacity: 0.5;
}
.mx_TagPanel .mx_TagTile:focus,
@@ -44,7 +46,7 @@ limitations under the License.
.mx_TagPanel .mx_TagTile.mx_TagTile_selected {
/* To offset border of mx_TagTile_avatar */
- margin: 3px 0px;
+ padding: 3px 0px;
}
.mx_TagPanel .mx_TagTile.mx_TagTile_selected .mx_TagTile_avatar {
From 4386d45a972802d48d81d3016fdfd3a50a55ee87 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 16 Jan 2018 10:27:47 +0000
Subject: [PATCH 59/71] remove 'use strict'
---
src/components/views/elements/Highlight.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/components/views/elements/Highlight.js b/src/components/views/elements/Highlight.js
index 1251264e..8706bb05 100644
--- a/src/components/views/elements/Highlight.js
+++ b/src/components/views/elements/Highlight.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
import React from 'react';
import PropTypes from 'prop-types';
import {highlightBlock} from 'highlight.js';
From 3481283af8f9921fcd7b5c8eb4941822b123434b Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 18 Jan 2018 17:54:12 +0000
Subject: [PATCH 60/71] Swap RoomList to react-beautiful-dnd
Includes themeing
See matrix-org/matrix-react-sdk#1711
---
package.json | 1 +
src/components/structures/RoomSubList.js | 38 +--
src/components/views/rooms/DNDRoomTile.js | 253 +++---------------
.../views/rooms/_RoomTile.scss | 2 +
src/skins/vector/css/themes/_base.scss | 1 +
src/skins/vector/css/themes/_dark.scss | 3 +-
.../vector-web/structures/_RoomSubList.scss | 4 +
.../vector/themes/status/css/_status.scss | 1 +
8 files changed, 68 insertions(+), 235 deletions(-)
diff --git a/package.json b/package.json
index 556f0c72..65f866dc 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
"pako": "^1.0.5",
"prop-types": "^15.5.10",
"react": "^15.6.0",
+ "react-beautiful-dnd": "^4.0.1",
"react-dnd": "^2.1.4",
"react-dnd-html5-backend": "^2.1.2",
"react-dom": "^15.6.0",
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 251c6522..15f56c00 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -20,8 +20,8 @@ limitations under the License.
var React = require('react');
var ReactDOM = require('react-dom');
var classNames = require('classnames');
-var DropTarget = require('react-dnd').DropTarget;
var sdk = require('matrix-react-sdk');
+import { Droppable } from 'react-beautiful-dnd';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
var dis = require('matrix-react-sdk/lib/dispatcher');
var Unread = require('matrix-react-sdk/lib/Unread');
@@ -32,6 +32,7 @@ var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/A
import Modal from 'matrix-react-sdk/lib/Modal';
import { KeyCode } from 'matrix-react-sdk/lib/Keyboard';
+
// turn this on for drop & drag console debugging galore
var debug = false;
@@ -326,9 +327,7 @@ var RoomSubList = React.createClass({
});
},
- calcManualOrderTagData: function(room) {
- const index = this.state.sortedList.indexOf(room);
-
+ calcManualOrderTagData: function(index) {
// we sort rooms by the lexicographic ordering of the 'order' metadata on their tags.
// for convenience, we calculate this for now a floating point number between 0.0 and 1.0.
@@ -375,12 +374,14 @@ var RoomSubList = React.createClass({
makeRoomTiles: function() {
var self = this;
var DNDRoomTile = sdk.getComponent("rooms.DNDRoomTile");
- return this.state.sortedList.map(function(room) {
+ return this.state.sortedList.map(function(room, index) {
// XXX: is it evil to pass in self as a prop to RoomTile?
return (
<DNDRoomTile
+ index={index} // For DND
room={ room }
roomSubList={ self }
+ tagName={self.props.tagName}
key={ room.roomId }
collapsed={ self.props.collapsed || false}
unread={ Unread.doesRoomHaveUnreadMessages(room) }
@@ -566,12 +567,18 @@ var RoomSubList = React.createClass({
</TruncatedList>;
}
- return connectDropTarget(
- <div>
- { this._getHeaderJsx() }
- { subList }
- </div>
- );
+ const subListContent = <div>
+ { this._getHeaderJsx() }
+ { subList }
+ </div>;
+
+ return this.props.editable ? <Droppable droppableId={"room-sub-list-droppable_" + this.props.tagName}>
+ { (provided, snapshot) => (
+ <div ref={provided.innerRef}>
+ { subListContent }
+ </div>
+ ) }
+ </Droppable> : subListContent;
}
else {
var Loader = sdk.getComponent("elements.Spinner");
@@ -585,11 +592,4 @@ var RoomSubList = React.createClass({
}
});
-// Export the wrapped version, inlining the 'collect' functions
-// to more closely resemble the ES7
-module.exports =
-DropTarget('RoomTile', roomListTarget, function(connect) {
- return {
- connectDropTarget: connect.dropTarget(),
- }
-})(RoomSubList);
+module.exports = RoomSubList;
diff --git a/src/components/views/rooms/DNDRoomTile.js b/src/components/views/rooms/DNDRoomTile.js
index 430906d2..1adb2a79 100644
--- a/src/components/views/rooms/DNDRoomTile.js
+++ b/src/components/views/rooms/DNDRoomTile.js
@@ -14,227 +14,50 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
import React from 'react';
-import {DragSource} from 'react-dnd';
-import {DropTarget} from 'react-dnd';
-
-import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
-import sdk from 'matrix-react-sdk';
-import { _t } from 'matrix-react-sdk/lib/languageHandler';
+import { Draggable } from 'react-beautiful-dnd';
import RoomTile from 'matrix-react-sdk/lib/components/views/rooms/RoomTile';
-import * as Rooms from 'matrix-react-sdk/lib/Rooms';
-import Modal from 'matrix-react-sdk/lib/Modal';
-/**
- * Defines a new Component, DNDRoomTile that wraps RoomTile, making it draggable.
- * Requires extra props:
- * roomSubList: React.PropTypes.object.isRequired,
- * refreshSubList: React.PropTypes.func.isRequired,
- */
+export default class DNDRoomTile extends React.Component {
+ constructor() {
+ super();
+ this.getStyle = this.getStyle.bind(this);
+ }
-/**
- * Specifies the drag source contract.
- * Only `beginDrag` function is required.
- */
-var roomTileSource = {
- canDrag: function(props, monitor) {
- return props.roomSubList.props.editable;
- },
-
- beginDrag: function (props) {
- // Return the data describing the dragged item
- var item = {
- room: props.room,
- originalList: props.roomSubList,
- originalIndex: props.roomSubList.findRoomTile(props.room).index,
- targetList: props.roomSubList, // at first target is same as original
- // lastTargetRoom: null,
- // lastYOffset: null,
- // lastYDelta: null,
+ getStyle(isDragging) {
+ const result = {
+ transform: isDragging ? "scale(1.05, 1.05)" : "none",
+ transition: "transform 0.2s",
};
-
- if (props.roomSubList.debug) console.log("roomTile beginDrag for " + item.room.roomId);
-
- // doing this 'correctly' with state causes react-dnd to break seemingly due to the state transitions
- props.room._dragging = true;
-
- return item;
- },
-
- endDrag: function (props, monitor, component) {
- var item = monitor.getItem();
-
- if (props.roomSubList.debug) console.log("roomTile endDrag for " + item.room.roomId + " with didDrop=" + monitor.didDrop());
-
- props.room._dragging = false;
- if (monitor.didDrop()) {
- if (props.roomSubList.debug) console.log("force updating component " + item.targetList.props.label);
- item.targetList.forceUpdate(); // as we're not using state
- }
-
- const prevTag = item.originalList.props.tagName;
- const newTag = item.targetList.props.tagName;
-
- if (monitor.didDrop() && item.targetList.props.editable) {
- // Evil hack to get DMs behaving
- if ((prevTag === undefined && newTag === 'im.vector.fake.direct') ||
- (prevTag === 'im.vector.fake.direct' && newTag === undefined)
- ) {
- Rooms.guessAndSetDMRoom(
- item.room, newTag === 'im.vector.fake.direct',
- ).done(() => {
- item.originalList.removeRoomTile(item.room);
- }, (err) => {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- console.error("Failed to set direct chat tag " + err);
- Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
- title: _t('Failed to set direct chat tag'),
- description: ((err && err.message) ? err.message : _t('Operation failed')),
- });
- });
- return;
- }
-
- // More evilness: We will still be dealing with moving to favourites/low prio,
- // but we avoid ever doing a request with 'im.vector.fake.direct`.
-
- // if we moved lists, remove the old tag
- if (prevTag && prevTag !== 'im.vector.fake.direct' &&
- item.targetList !== item.originalList
- ) {
- // commented out attempts to set a spinner on our target component as component is actually
- // the original source component being dragged, not our target. To fix we just need to
- // move all of this to endDrop in the target instead. FIXME later.
-
- //component.state.set({ spinner: component.state.spinner ? component.state.spinner++ : 1 });
- MatrixClientPeg.get().deleteRoomTag(item.room.roomId, prevTag).finally(function() {
- //component.state.set({ spinner: component.state.spinner-- });
- }).catch(function(err) {
- var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- console.error("Failed to remove tag " + prevTag + " from room: " + err);
- Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
- title: _t('Failed to remove tag %(tagName)s from room', {tagName: prevTag}),
- description: ((err && err.message) ? err.message : _t('Operation failed')),
- });
- });
- }
-
- var newOrder= {};
- if (item.targetList.props.order === 'manual') {
- newOrder['order'] = item.targetList.calcManualOrderTagData(item.room);
- }
-
- // if we moved lists or the ordering changed, add the new tag
- if (newTag && newTag !== 'im.vector.fake.direct' &&
- (item.targetList !== item.originalList || newOrder)
- ) {
- MatrixClientPeg.get().setRoomTag(item.room.roomId, newTag, newOrder).catch(function(err) {
- var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- console.error("Failed to add tag " + newTag + " to room: " + err);
- Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
- title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
- description: ((err && err.message) ? err.message : _t('Operation failed')),
- });
- });
- }
- }
- else {
- // cancel the drop and reset our original position
- if (props.roomSubList.debug) console.log("cancelling drop & drag");
- props.roomSubList.moveRoomTile(item.room, item.originalIndex);
- if (item.targetList && item.targetList !== item.originalList) {
- item.targetList.removeRoomTile(item.room);
- }
- }
+ return result;
}
-};
-var roomTileTarget = {
- canDrop: function() {
- return false;
- },
+ render() {
+ const props = this.props;
- hover: function(props, monitor) {
- var item = monitor.getItem();
- //var off = monitor.getClientOffset();
- // console.log("hovering on room " + props.room.roomId + ", isOver=" + monitor.isOver());
-
- //console.log("item.targetList=" + item.targetList + ", roomSubList=" + props.roomSubList);
-
- var switchedTarget = false;
- if (item.targetList !== props.roomSubList) {
- // we've switched target, so remove the tile from the previous target.
- // n.b. the previous target might actually be the source list.
- if (props.roomSubList.debug) console.log("switched target sublist");
- switchedTarget = true;
- item.targetList.removeRoomTile(item.room);
- item.targetList = props.roomSubList;
- }
-
- if (!item.targetList.props.editable) return;
-
- if (item.targetList.props.order === 'manual') {
- if (item.room.roomId !== props.room.roomId && props.room !== item.lastTargetRoom) {
- // find the offset of the target tile in the list.
- var roomTile = props.roomSubList.findRoomTile(props.room);
- // shuffle the list to add our tile to that position.
- props.roomSubList.moveRoomTile(item.room, roomTile.index);
- }
-
- // stop us from flickering between our droptarget and the previous room.
- // whenever the cursor changes direction we have to reset the flicker-damping.
-/*
- var yDelta = off.y - item.lastYOffset;
-
- if ((yDelta > 0 && item.lastYDelta < 0) ||
- (yDelta < 0 && item.lastYDelta > 0))
- {
- // the cursor changed direction - forget our previous room
- item.lastTargetRoom = null;
- }
- else {
- // track the last room we were hovering over so we can stop
- // bouncing back and forth if the droptarget is narrower than
- // the other list items. The other way to do this would be
- // to reduce the size of the hittarget on the list items, but
- // can't see an easy way to do that.
- item.lastTargetRoom = props.room;
- }
-
- if (yDelta) item.lastYDelta = yDelta;
- item.lastYOffset = off.y;
-*/
- }
- else if (switchedTarget) {
- if (!props.roomSubList.findRoomTile(item.room).room) {
- // add to the list in the right place
- props.roomSubList.moveRoomTile(item.room, 0);
- }
- // we have to sort the list whatever to recalculate it
- props.roomSubList.sortList();
- }
- },
-};
-
-// Export the wrapped version, inlining the 'collect' functions
-// to more closely resemble the ES7
-module.exports =
-DropTarget('RoomTile', roomTileTarget, function(connect, monitor) {
- return {
- // Call this function inside render()
- // to let React DnD handle the drag events:
- connectDropTarget: connect.dropTarget(),
- isOver: monitor.isOver(),
+ return <div>
+ <Draggable
+ key={props.room.roomId}
+ draggableId={props.tagName + '_' + props.room.roomId}
+ index={props.index}
+ >
+ { (provided, snapshot) => {
+ return (
+ <div>
+ <div
+ ref={provided.innerRef}
+ {...provided.draggableProps}
+ {...provided.dragHandleProps}
+ >
+ <div style={this.getStyle(snapshot.isDragging)}>
+ <RoomTile {...props} />
+ </div>
+ </div>
+ { provided.placeholder }
+ </div>
+ );
+ } }
+ </Draggable>
+ </div>;
}
-})(
-DragSource('RoomTile', roomTileSource, function(connect, monitor) {
- return {
- // Call this function inside render()
- // to let React DnD handle the drag events:
- connectDragSource: connect.dragSource(),
- // You can ask the monitor about the current drag state:
- isDragging: monitor.isDragging()
- };
-})(RoomTile));
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss
index 842228b9..c9e7022e 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss
@@ -20,6 +20,8 @@ limitations under the License.
font-size: 13px;
display: block;
height: 34px;
+
+ background-color: $secondary-accent-color;
}
.mx_RoomTile_tooltip {
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index d5e862ae..35fc1a79 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -104,6 +104,7 @@ $roomtile-name-color: rgba(69, 69, 69, 0.8);
$roomtile-selected-bg-color: rgba(255, 255, 255, 0.8);
$roomtile-focused-bg-color: rgba(255, 255, 255, 0.9);
+$roomsublist-background: #badece;
$roomsublist-label-fg-color: $h3-color;
$roomsublist-label-bg-color: $tertiary-accent-color;
$roomsublist-chevron-color: $accent-color;
diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss
index 60ffeca8..b0ca76b8 100644
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/src/skins/vector/css/themes/_dark.scss
@@ -100,9 +100,10 @@ $rte-code-bg-color: #000;
// ********************
$roomtile-name-color: rgba(186, 186, 186, 0.8);
-$roomtile-selected-bg-color: rgba(255, 255, 255, 0.05);
+$roomtile-selected-bg-color: #333;
$roomtile-focused-bg-color: rgba(255, 255, 255, 0.2);
+$roomsublist-background: #222;
$roomsublist-label-fg-color: $h3-color;
$roomsublist-label-bg-color: $tertiary-accent-color;
$roomsublist-chevron-color: $accent-color;
diff --git a/src/skins/vector/css/vector-web/structures/_RoomSubList.scss b/src/skins/vector/css/vector-web/structures/_RoomSubList.scss
index db1fb170..a2863460 100644
--- a/src/skins/vector/css/vector-web/structures/_RoomSubList.scss
+++ b/src/skins/vector/css/vector-web/structures/_RoomSubList.scss
@@ -18,6 +18,8 @@ limitations under the License.
display: table;
table-layout: fixed;
width: 100%;
+
+ background-color: $roomsublist-background;
}
.mx_RoomSubList_labelContainer {
@@ -155,6 +157,8 @@ limitations under the License.
position: relative;
cursor: pointer;
font-size: 13px;
+
+ background-color: $secondary-accent-color;
}
.collapsed .mx_RoomSubList_ellipsis {
diff --git a/src/skins/vector/themes/status/css/_status.scss b/src/skins/vector/themes/status/css/_status.scss
index ed60b83d..be4c3c7f 100644
--- a/src/skins/vector/themes/status/css/_status.scss
+++ b/src/skins/vector/themes/status/css/_status.scss
@@ -160,6 +160,7 @@ $roomtile-name-color: #ffffff;
$roomtile-selected-bg-color: #465561;
$roomtile-focused-bg-color: #6d8597;
+$roomsublist-background: #465561;
$roomsublist-label-fg-color: #ffffff;
$roomsublist-label-bg-color: $secondary-accent-color;
$roomsublist-chevron-color: #ffffff;
From d55d3658f08563daa8ccf1511dd4f67423f2f8fd Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 18 Jan 2018 18:08:18 +0000
Subject: [PATCH 61/71] Use classNames instead of inline `style`
Theres no benefit to using inline styles
---
src/components/views/rooms/DNDRoomTile.js | 17 +++++++++--------
.../matrix-react-sdk/views/rooms/_RoomTile.scss | 9 +++++++++
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/components/views/rooms/DNDRoomTile.js b/src/components/views/rooms/DNDRoomTile.js
index 1adb2a79..129e3f45 100644
--- a/src/components/views/rooms/DNDRoomTile.js
+++ b/src/components/views/rooms/DNDRoomTile.js
@@ -18,18 +18,19 @@ import React from 'react';
import { Draggable } from 'react-beautiful-dnd';
import RoomTile from 'matrix-react-sdk/lib/components/views/rooms/RoomTile';
+import classNames from 'classnames';
+
export default class DNDRoomTile extends React.Component {
constructor() {
super();
- this.getStyle = this.getStyle.bind(this);
+ this.getClassName = this.getClassName.bind(this);
}
- getStyle(isDragging) {
- const result = {
- transform: isDragging ? "scale(1.05, 1.05)" : "none",
- transition: "transform 0.2s",
- };
- return result;
+ getClassName(isDragging) {
+ return classNames({
+ "mx_DNDRoomTile": true,
+ "mx_DNDRoomTile_dragging": isDragging,
+ });
}
render() {
@@ -49,7 +50,7 @@ export default class DNDRoomTile extends React.Component {
{...provided.draggableProps}
{...provided.dragHandleProps}
>
- <div style={this.getStyle(snapshot.isDragging)}>
+ <div className={this.getClassName(snapshot.isDragging)}>
<RoomTile {...props} />
</div>
</div>
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss
index c9e7022e..a59cd3e8 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss
@@ -157,6 +157,15 @@ limitations under the License.
background-color: $roomtile-selected-bg-color;
}
+.mx_DNDRoomTile {
+ transform: none;
+ transition: transform 0.2s;
+}
+
+.mx_DNDRoomTile_dragging {
+ transform: scale(1.05, 1.05);
+}
+
.mx_RoomTile:focus {
filter: none ! important;
background-color: $roomtile-focused-bg-color;
From 4504ff954aeb44225f4eee9efadba246a8e1a1c3 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 19 Jan 2018 10:10:13 +0000
Subject: [PATCH 62/71] Add `sudo: required` to travis config
---
.travis.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 94ed745c..bc3fce38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,10 @@ dist: trusty
# we don't need sudo, so can run in a container, which makes startup much
# quicker.
-sudo: false
+#
+# unfortunately we do temporarily require sudo as a workaround for
+# https://github.com/travis-ci/travis-ci/issues/8836
+sudo: required
language: node_js
node_js:
From 883ee4ec754c8cdf13879aed0f0e4e44ec931c88 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 19 Jan 2018 13:35:11 +0000
Subject: [PATCH 63/71] Remove react-dnd
---
package.json | 2 --
1 file changed, 2 deletions(-)
diff --git a/package.json b/package.json
index 65f866dc..87d2aa43 100644
--- a/package.json
+++ b/package.json
@@ -75,8 +75,6 @@
"prop-types": "^15.5.10",
"react": "^15.6.0",
"react-beautiful-dnd": "^4.0.1",
- "react-dnd": "^2.1.4",
- "react-dnd-html5-backend": "^2.1.2",
"react-dom": "^15.6.0",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
"sanitize-html": "^1.11.1",
From 8855cc294e732777a986a37069584b6a0dd58eeb Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 13 Dec 2017 22:57:24 +0000
Subject: [PATCH 64/71] converge on 'noisy' to mean noisy notifs
---
src/components/views/context_menus/RoomTileContextMenu.js | 2 +-
src/i18n/strings/ar.json | 2 +-
src/i18n/strings/be.json | 2 +-
src/i18n/strings/ca.json | 2 +-
src/i18n/strings/cs.json | 2 +-
src/i18n/strings/de_DE.json | 2 +-
src/i18n/strings/el.json | 2 +-
src/i18n/strings/en_EN.json | 2 +-
src/i18n/strings/en_US.json | 2 +-
src/i18n/strings/eo.json | 2 +-
src/i18n/strings/es.json | 2 +-
src/i18n/strings/eu.json | 2 +-
src/i18n/strings/fa.json | 2 +-
src/i18n/strings/fi.json | 2 +-
src/i18n/strings/fr.json | 2 +-
src/i18n/strings/gl.json | 2 +-
src/i18n/strings/he.json | 2 +-
src/i18n/strings/hu.json | 2 +-
src/i18n/strings/id.json | 2 +-
src/i18n/strings/it.json | 2 +-
src/i18n/strings/ja.json | 2 +-
src/i18n/strings/ko.json | 2 +-
src/i18n/strings/lv.json | 2 +-
src/i18n/strings/ml.json | 2 +-
src/i18n/strings/nb_NO.json | 2 +-
src/i18n/strings/nl.json | 2 +-
src/i18n/strings/pl.json | 2 +-
src/i18n/strings/pt.json | 2 +-
src/i18n/strings/pt_BR.json | 2 +-
src/i18n/strings/ru.json | 2 +-
src/i18n/strings/sk.json | 2 +-
src/i18n/strings/sv.json | 2 +-
src/i18n/strings/ta.json | 2 +-
src/i18n/strings/te.json | 2 +-
src/i18n/strings/th.json | 2 +-
src/i18n/strings/tr.json | 2 +-
src/i18n/strings/uk.json | 2 +-
src/i18n/strings/zh_Hans.json | 2 +-
src/i18n/strings/zh_Hant.json | 2 +-
39 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index 1518bb22..36602cfa 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -275,7 +275,7 @@ module.exports = React.createClass({
<div className={ alertMeClasses } onClick={this._onClickAlertMe} >
<img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
<img className="mx_RoomTileContextMenu_notif_icon mx_filterFlipColor" src="img/icon-context-mute-off-copy.svg" width="16" height="12" />
- { _t('All messages (loud)') }
+ { _t('All messages (noisy)') }
</div>
<div className={ allNotifsClasses } onClick={this._onClickAllNotifs} >
<img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index d5952825..edd99017 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -8,7 +8,7 @@
"All Rooms": "كل الغُرف",
"<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">متصفح سافاري</a> و <a href=\"http://opera.com\">متصفح أوبرا</a> يعملان أيضاً.",
"Add an email address above to configure email notifications": "أضف بريداً إلكترونياً أعلاه من أجل تعديل إعدادت تنبيهات البريد الإلكتروني",
- "All messages (loud)": "كل الرسائل (صوت مرتفع)",
+ "All messages (noisy)": "كل الرسائل (صوت مرتفع)",
"All notifications are currently disabled for all targets.": "كل التنبيهات غير مفعلة حالياً للجميع.",
"An error occurred whilst saving your email notification preferences.": "حدث خطأ ما خلال حفظ إعدادات التنبيهات للبريد الإلكتروني.",
"Call invitation": "دعوة لمحادثة",
diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json
index 479c5c65..fe8cd434 100644
--- a/src/i18n/strings/be.json
+++ b/src/i18n/strings/be.json
@@ -1,7 +1,7 @@
{
"Add an email address above to configure email notifications": "Дадайце адрас электроннай пошты вышэй, каб наладзіць апавяшчэнні",
"All messages": "Усе паведамленні",
- "All messages (loud)": "Усе паведамленні (гучна)",
+ "All messages (noisy)": "Усе паведамленні (гучна)",
"All notifications are currently disabled for all targets.": "Усе апавяшчэнні ў цяперашні час адключаныя для ўсіх мэтаў.",
"An error occurred whilst saving your email notification preferences.": "Адбылася памылка падчас захавання налады апавяшчэнняў па электроннай пошце.",
"Cancel Sending": "Адмяніць адпраўку",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index fe82e814..fdfa90b9 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -14,7 +14,7 @@
"Failed to remove tag %(tagName)s from room": "No s'ha pogut esborrar l'etiqueta %(tagName)s de la sala",
"Filter room names": "Filtra els noms de les sales",
"Couldn't load home page": "No s'ha pogut carregar la pàgina d'inici",
- "All messages (loud)": "Tots els missatges (sorollós)",
+ "All messages (noisy)": "Tots els missatges (sorollós)",
"Mentions only": "Només mencions",
"Mute": "Silenciat",
"Direct Chat": "Xat directe",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 8b855026..47bb8062 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -42,7 +42,7 @@
"Messages sent by bot": "Zprávy poslané robotem",
"more": "více",
"Mute": "Ztlumit",
- "All messages (loud)": "Všechny zprávy (hlasitě)",
+ "All messages (noisy)": "Všechny zprávy (hlasitě)",
"Couldn't load home page": "Nepodařilo se nahrát úvodní stránku",
"All notifications are currently disabled for all targets.": "Veškeré notifikace jsou aktuálně pro všechny cíle vypnuty.",
"Cancel Sending": "Zrušit odesílání",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 196bdc9a..bc45c240 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -62,7 +62,7 @@
"On": "An",
"You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Matrix-Client und nicht in Riot konfiguriert. Sie können in Riot nicht verändert werden, gelten aber trotzdem",
"All messages": "Alle Nachrichten",
- "All messages (loud)": "Alle Nachrichten (laut)",
+ "All messages (noisy)": "Alle Nachrichten (laut)",
"Cancel Sending": "Senden abbrechen",
"Close": "Schließen",
"Delete the room alias %(alias)s and remove %(name)s from the directory?": "Soll der Raum-Alias %(alias)s gelöscht und der %(name)s aus dem Verzeichnis entfernt werden?",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index a3d72487..1e8cf01b 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -29,7 +29,7 @@
"Collecting app version information": "Συγκέντρωση πληροφοριών σχετικά με την έκδοση της εφαρμογής",
"customServer_text": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις για να εισέλθετε σε άλλους διακομιστές Matrix επιλέγοντας μια διαφορετική διεύθυνση για το διακομιστή.<br/> Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή Riot με έναν υπάρχοντα λογαριασμό σε διαφορετικό διακομιστή.<br/><br/>Επίσης μπορείτε να επιλέξετε ένα διαφορετικό διακομιστή ταυτότητας αλλά δεν θα έχετε τη δυνατότητα να προσκαλέσετε άλλους χρήστες ή να σας προσκαλέσουν μέσω μηνυμάτων ηλεκτρονικής αλληλογραφίας.",
"%(appName)s via %(browserName)s on %(osName)s": "%(appName)s μέσω %(browserName)s σε %(osName)s",
- "All messages (loud)": "Όλα τα μηνύματα (δυνατά)",
+ "All messages (noisy)": "Όλα τα μηνύματα (δυνατά)",
"delete the alias.": "διέγραψε το ψευδώνυμο.",
"Delete the room alias %(alias)s and remove %(name)s from the directory?": "Διαγραφή του ψευδώνυμου %(alias)s και αφαίρεση του %(name)s από το ευρετήριο;",
"Dismiss": "Απόρριψη",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cdca2570..e3db4e76 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -137,7 +137,7 @@
"Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
"unknown error code": "unknown error code",
"Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
- "All messages (loud)": "All messages (loud)",
+ "All messages (noisy)": "All messages (noisy)",
"All messages": "All messages",
"Mentions only": "Mentions only",
"Mute": "Mute",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 012b1f5d..5d24c945 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -5,7 +5,7 @@
"Add an email address above to configure email notifications": "Add an email address above to configure email notifications",
"Advanced notification settings": "Advanced notification settings",
"All messages": "All messages",
- "All messages (loud)": "All messages (loud)",
+ "All messages (noisy)": "All messages (noisy)",
"All Rooms": "All Rooms",
"All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
"An error occurred whilst saving your email notification preferences.": "An error occurred while saving your email notification preferences.",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 6dcf0809..d9f88cae 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1,7 +1,7 @@
{
"A new version of Riot is available.": "Nova versio de \"Riot\" haveblas.",
"All messages": "Ĉiuj mesaĝoj",
- "All messages (loud)": "Ĉiuj mesaĝoj (lauta)",
+ "All messages (noisy)": "Ĉiuj mesaĝoj (lauta)",
"All Rooms": "Ĉiuj babilejoj",
"Cancel": "Nuligi",
"delete the alias.": "Forviŝi la kromnomon.",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index b0fbdaa8..5a7505a7 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -135,7 +135,7 @@
"You have successfully set a password and an email address!": "¡Ha establecido exitosamente la contraseña y la dirección de email!",
"You have successfully set a password!": "¡Ha establecido exitosamente una contraseña!",
"%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s en %(osName)s",
- "All messages (loud)": "Todos los mensajes (ruidoso)",
+ "All messages (noisy)": "Todos los mensajes (ruidoso)",
"All notifications are currently disabled for all targets.": "Las notificaciones estan desactivadas para todos los objetivos.",
"Collecting app version information": "Recolectando información de la versión de la aplicación",
"Collecting logs": "Recolectando registros",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 140f3498..bd5e5c84 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -5,7 +5,7 @@
"Add an email address above to configure email notifications": "Gehitu e-mail helbide bat goian e-mail bidezko jakinarazpenak konfiguratzeko",
"Advanced notification settings": "Jakinarazpen aurreratuen ezarpenak",
"All messages": "Mezu guztiak",
- "All messages (loud)": "Mezu guztiak (ozen)",
+ "All messages (noisy)": "Mezu guztiak (ozen)",
"All Rooms": "Gela guztiak",
"All notifications are currently disabled for all targets.": "Une honetan jakinarazpen guztiak helburu guztietarako desgaituta daude.",
"An error occurred whilst saving your email notification preferences.": "Errore bat gertatu da zure e-mail bidezko jakinarazpenen hobespenak gordetzean.",
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 2ecdd445..6570b021 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -1,7 +1,7 @@
{
"A new version of Riot is available.": "نسخهی جدید از رایوت موجود است.",
"All messages": "همهی پیامها",
- "All messages (loud)": "همهی پیامها(بلند)",
+ "All messages (noisy)": "همهی پیامها(بلند)",
"All Rooms": "همهی گپها",
"Cancel Sending": "فرستادن را لغو کن",
"Changelog": "تغییراتِ بهوجودآمده",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 9b63f984..7e8c0dd3 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -4,7 +4,7 @@
"Add an email address above to configure email notifications": "Lisää sähköpostiosoite yllä saadaksesi ilmoituksia sähköpostiisi",
"Advanced notification settings": "Lisäasetukset ilmoituksille",
"All messages": "Kaikki viestit",
- "All messages (loud)": "Kaikki viestit (äänekkäästi)",
+ "All messages (noisy)": "Kaikki viestit (äänekkäästi)",
"All Rooms": "Kaikki huoneet",
"All notifications are currently disabled for all targets.": "Kaikki ilmoitukset on kytketty pois kaikilta kohteilta.",
"An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9e365cde..294e4fbd 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1,7 +1,7 @@
{
"Add an email address above to configure email notifications": "Ajouter une adresse e-mail pour la configuration des notifications par e-mail",
"All messages": "Tous les messages",
- "All messages (loud)": "Tous les messages (fort)",
+ "All messages (noisy)": "Tous les messages (fort)",
"All notifications are currently disabled for all targets.": "Toutes les notifications sont désactivées pour tous les appareils.",
"An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notification par e-mail.",
"Cancel Sending": "Annuler l'envoi",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 3fec05e9..0c7f1830 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -5,7 +5,7 @@
"Add an email address above to configure email notifications": "Engada un enderezo de correo electrónico para configurar as notificacións",
"Advanced notification settings": "Axustes avanzados de notificación",
"All messages": "Todas as mensaxes",
- "All messages (loud)": "Todas as mensaxes (alto)",
+ "All messages (noisy)": "Todas as mensaxes (alto)",
"All Rooms": "Todas as Salas",
"All notifications are currently disabled for all targets.": "Todas as notificacións están deshabilitadas para todos os destinos.",
"An error occurred whilst saving your email notification preferences.": "Algo fallou mentras se gardaban as súas preferencias de notificaicón.",
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 44363527..6026f2d9 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -3,7 +3,7 @@
"Add an email address above to configure email notifications": "הוסף כתובת דואר אלקטורני למעלה בכדי להגדיר התראות",
"Advanced notification settings": "הגדרות מתקדמות להתראות",
"All messages": "כל ההודעות",
- "All messages (loud)": "כל ההודעות (צעקה)",
+ "All messages (noisy)": "כל ההודעות (צעקה)",
"All Rooms": "כל החדרים",
"All notifications are currently disabled for all targets.": "התראות מנוטרלות לכלל המערכת.",
"An error occurred whilst saving your email notification preferences.": "קרתה שגיאה בזמן שמירת הגדרות התראה באמצעות הדואר האלקטרוני.",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 4fe42337..c6a6e6db 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2,7 +2,7 @@
"Add an email address above to configure email notifications": "E-mail értesítés beállításához írd be az e-mail címed",
"Advanced notification settings": "Haladó értesítési beállítások",
"All messages": "Minden üzenet",
- "All messages (loud)": "Minden üzenet (hangos)",
+ "All messages (noisy)": "Minden üzenet (hangos)",
"All notifications are currently disabled for all targets.": "Minden céleszközön minden értesítés tiltva van.",
"An error occurred whilst saving your email notification preferences.": "Hiba történt az e-mail értesítés beállításánál.",
"Call invitation": "Hívás meghívó",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 28c65ffd..f2d8804b 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -5,7 +5,7 @@
"Add an email address above to configure email notifications": "Tambahkan alamat email di atas untuk konfigurasi notifikasi email",
"Advanced notification settings": "Pengaturan notifikasi lanjutan",
"All messages": "Semua pesan",
- "All messages (loud)": "Semua pesan (keras)",
+ "All messages (noisy)": "Semua pesan (keras)",
"All Rooms": "Semua Ruang",
"All notifications are currently disabled for all targets.": "Semua notifikasi saat ini dinonaktifkan untuk semua target.",
"An error occurred whilst saving your email notification preferences.": "Terjadi kesalahan saat menyimpan preferensi notifikasi email Anda.",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index a162340f..bd70c958 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -4,7 +4,7 @@
"Add an email address above to configure email notifications": "Aggiungi un indirizzo email sopra per configurare le notifiche via email",
"Advanced notification settings": "Impostazioni di notifica avanzate",
"All messages": "Tutti i messaggi",
- "All messages (loud)": "Tutti i messaggi (rumoroso)",
+ "All messages (noisy)": "Tutti i messaggi (rumoroso)",
"All Rooms": "Tutte le stanze",
"An error occurred whilst saving your email notification preferences.": "Si è verificato un errore durante il salvataggio delle tue preferenze sulle notifiche email.",
"Call invitation": "Invito ad una chiamata",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 97a0640e..e5812923 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1,6 +1,6 @@
{
"All messages": "全ての発言",
- "All messages (loud)": "全ての発言(通知音あり)",
+ "All messages (noisy)": "全ての発言(通知音あり)",
"Cancel": "取消",
"Close": "閉じる",
"Direct Chat": "対話",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 62bea2eb..c769e4ea 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -3,7 +3,7 @@
"Add an email address above to configure email notifications": "이메일 알림을 설정하기 위해 이메일 주소를 추가해주세요",
"Advanced notification settings": "고급 알림 설정",
"All messages": "모든 메시지",
- "All messages (loud)": "모든 메시지 (크게)",
+ "All messages (noisy)": "모든 메시지 (크게)",
"All Rooms": "모든 방",
"All notifications are currently disabled for all targets.": "현재 모든 알림이 모든 상대에게서 꺼졌어요.",
"An error occurred whilst saving your email notification preferences.": "이메일 알림을 설정하다가 오류가 일어났어요.",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 7114e9d5..c71e991f 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -5,7 +5,7 @@
"Add an email address above to configure email notifications": "Pievieno augšā epasta adresi, lai konfigurētu epasta notifikāciju paziņojumus",
"Advanced notification settings": "Īpašie notifikāciju uzstādījumi",
"All messages": "Visas ziņas",
- "All messages (loud)": "Visas ziņas (skaļi)",
+ "All messages (noisy)": "Visas ziņas (skaļi)",
"All Rooms": "Visas istabas",
"All notifications are currently disabled for all targets.": "Visi notifikāciju paziņojumi ir atspējoti visiem saņēmējiem.",
"An error occurred whilst saving your email notification preferences.": "Radās kļūda saglabājot tavus epasta notifikāciju ziņu uzstādījumus.",
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index 47bdfd8e..76084502 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -1,7 +1,7 @@
{
"Add an email address above to configure email notifications": "ഇ മെയില് അറിയിപ്പുകൾ ലഭിക്കാന് മുകളില് ഇ-മെയില് വിലാസം നല്കൂ",
"All messages": "എല്ലാ സന്ദേശങ്ങളും",
- "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)",
+ "All messages (noisy)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)",
"%(appName)s via %(browserName)s on %(osName)s": "%(osName)sല് %(browserName)s വഴി %(appName)s",
"<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">സഫാരിയിലും</a>പിന്നെ <a href=\"http://opera.com\">ഓപ്പേറയിലും</a>പ്രവര്ത്തിക്കുന്നു.",
"A new version of Riot is available.": "റയട്ടിന്റെ ഒരു പുതിയ പതിപ്പ് ലഭ്യമാണ്.",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 91bb33d8..71980bd2 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -2,7 +2,7 @@
"Add an email address above to configure email notifications": "Legg til en epost adresse for å sette opp epost varsling",
"Advanced notification settings": "Avanserte varslingsinnstillinger",
"All messages": "Alle meldinger",
- "All messages (loud)": "Alle meldinger (høy)",
+ "All messages (noisy)": "Alle meldinger (høy)",
"All notifications are currently disabled for all targets.": "Alle varsler er deaktivert for alle mottakere.",
"An error occurred whilst saving your email notification preferences.": "En feil oppsto i forbindelse med lagring av epost varsel innstillinger.",
"Cancel Sending": "Avbryt sending",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 558f9c68..938e7714 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -2,7 +2,7 @@
"Add an email address above to configure email notifications": "Voeg een e-mailadres toe om e-mailmeldingen te ontvangen",
"Advanced notification settings": "Geavanceerde meldingsinstellingen",
"All messages": "Alle berichten",
- "All messages (loud)": "Alle berichten (luid)",
+ "All messages (noisy)": "Alle berichten (luid)",
"All notifications are currently disabled for all targets.": "Alle meldingen zijn momenteel uitgeschakeld voor alle doelen.",
"An error occurred whilst saving your email notification preferences.": "Er is een fout opgetreden tijdens het opslaan van uw e-mailmeldingsvoorkeuren.",
"Call invitation": "Oproep-uitnodiging",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 7566963c..31fdfbe6 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -5,7 +5,7 @@
"Add an email address above to configure email notifications": "Dodaj adres e-mail powyżej, aby skonfigurować powiadomienia e-mailowe",
"Advanced notification settings": "Zaawansowane ustawienia powiadomień",
"All messages": "Wszystkie wiadomości",
- "All messages (loud)": "Wszystkie wiadomości (głośno)",
+ "All messages (noisy)": "Wszystkie wiadomości (głośno)",
"All Rooms": "Wszystkie pokoje",
"All notifications are currently disabled for all targets.": "Wszystkie powiadomienia są obecnie wyłączone dla wszystkich celów.",
"An error occurred whilst saving your email notification preferences.": "Podczas zapisywania ustawień powiadomień e-mail wystąpił błąd.",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 6d4274f1..d8f31499 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -1,7 +1,7 @@
{
"Add an email address above to configure email notifications": "Insira um endereço de email no campo acima para configurar as notificações por email",
"All messages": "Todas as mensagens",
- "All messages (loud)": "Todas as mensagens (alto)",
+ "All messages (noisy)": "Todas as mensagens (alto)",
"An error occurred whilst saving your email notification preferences.": "Ocorreu um erro ao guardar as suas preferências de notificação por email.",
"Call invitation": "Convite para chamada",
"Cancel Sending": "Cancelar o envio",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 681339d1..40df7d60 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -1,7 +1,7 @@
{
"Add an email address above to configure email notifications": "Insira um endereço de email no campo acima para configurar suas notificações por email",
"All messages": "Todas as mensagens",
- "All messages (loud)": "Todas as mensagens (alto)",
+ "All messages (noisy)": "Todas as mensagens (alto)",
"An error occurred whilst saving your email notification preferences.": "Um erro ocorreu enquanto o sistema estava salvando suas preferências de notificação por email.",
"Call invitation": "Convite para chamada",
"Cancel Sending": "Cancelar o envio",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 48415323..2d033fb9 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -63,7 +63,7 @@
"You are not receiving desktop notifications": "Вы не получаете уведомления на рабочем столе",
"You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Возможно вы настроили их не в Riot, а в другом Matrix-клиенте. Настроить их в Riot не удастся, но они будут в нем применяться",
"All messages": "Все сообщения",
- "All messages (loud)": "Все сообщения (со звуком)",
+ "All messages (noisy)": "Все сообщения (со звуком)",
"Cancel Sending": "Отменить отправку",
"Close": "Закрыть",
"Download this file": "Скачать этот файл",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 01ecc788..5aaedc9b 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -135,7 +135,7 @@
"Failed to set Direct Message status of room": "Nepodarilo sa nastaviť stav miestnosti priama konverzácia",
"unknown error code": "neznámy kód chyby",
"Failed to forget room %(errCode)s": "Nepodarilo sa zabudnuť miestnosť %(errCode)s",
- "All messages (loud)": "Všetky správy (hlučné)",
+ "All messages (noisy)": "Všetky správy (hlučné)",
"All messages": "Všetky správy",
"Mentions only": "Len zmienky",
"Mute": "Umlčať",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 75b060c2..79a97362 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -2,7 +2,7 @@
"Add an email address above to configure email notifications": "Lägg till en epostadress här för att konfigurera epostaviseringar",
"Advanced notification settings": "Avancerade aviseringsinställingar",
"All messages": "Alla meddelanden",
- "All messages (loud)": "Alla meddelanden (högljudd)",
+ "All messages (noisy)": "Alla meddelanden (högljudd)",
"All notifications are currently disabled for all targets.": "Alla aviseringar är för tillfället avstängda för alla mål.",
"An error occurred whilst saving your email notification preferences.": "Ett fel uppstod då epostaviseringsinställningarna sparades.",
"Call invitation": "Inbjudan till samtal",
diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json
index dc6a593e..8fe8a443 100644
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -4,7 +4,7 @@
"Add an email address above to configure email notifications": "மின்னஞ்சல் மூலம் அறிவிப்புகளை பெற உங்கள் மின்னஞ்சல் முகவரியை மேலே இணைக்கவும்",
"Advanced notification settings": "மேம்பட்ட அறிவிப்பிற்கான அமைப்புகள்",
"All messages": "அனைத்து செய்திகள்",
- "All messages (loud)": "அனைத்து செய்திகள் (உரக்க)",
+ "All messages (noisy)": "அனைத்து செய்திகள் (உரக்க)",
"All Rooms": "அனைத்து அறைகள்",
"All notifications are currently disabled for all targets.": "அனைத்து இலக்குகளுக்கான அனைத்து அறிவுப்புகளும் தற்போது முடக்கி வைக்கப்பட்டுள்ளது.",
"An error occurred whilst saving your email notification preferences.": "உங்கள் மின்னஞ்சல் அறிவிப்பு விருப்பங்களை சேமிப்பதில் ஏதோ பிழை ஏற்பட்டுள்ளது.",
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index b7af70a2..e50d78fa 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -16,7 +16,7 @@
"Add an email address above to configure email notifications": "ఇమెయిల్ ప్రకటనలను రూపశిల్పం చేయడానికి ఎగువ ఇమెయిల్ చిరునామాను జోడించండి",
"Advanced notification settings": "ఆధునిక తాఖీదు అమరిక",
"All messages": "అన్ని సందేశాలు",
- "All messages (loud)": "అన్ని సందేశాలు (గట్టిగ)",
+ "All messages (noisy)": "అన్ని సందేశాలు (గట్టిగ)",
"All Rooms": "అన్ని గదులు",
"Call invitation": "మాట్లాడడానికి ఆహ్వానం",
"Cancel Sending": "పంపడాన్ని ఆపేయండి",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 973f4319..5b27b810 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -81,7 +81,7 @@
"Riot is not supported on mobile web. Install the app?": "Riot ไม่รองรับเว็บบนอุปกรณ์พกพา ติดตั้งแอป?",
"Riot does not know how to join a room on this network": "Riot ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้",
"Direct Chat": "แชทโดยตรง",
- "All messages (loud)": "ทุกข้อความ (เสียงดัง)",
+ "All messages (noisy)": "ทุกข้อความ (เสียงดัง)",
"Custom Server Options": "กำหนดเซิร์ฟเวอร์เอง",
"Directory": "ไดเรกทอรี",
"Enable audible notifications in web client": "เปิดใช้งานเสียงแจ้งเตือนบนเว็บไคลเอนต์",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 23537b99..b0fcc46b 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -5,7 +5,7 @@
"Add an email address above to configure email notifications": "E-posta bildirimlerini yapılandırmak için yukarıya bir e-posta adresi ekleyin",
"Advanced notification settings": "Gelişmiş bildirim ayarları",
"All messages": "Tüm mesajlar",
- "All messages (loud)": "Tüm mesajlar (uzun)",
+ "All messages (noisy)": "Tüm mesajlar (uzun)",
"All Rooms": "Tüm Odalar",
"All notifications are currently disabled for all targets.": "Tüm bildirimler şu anda tüm hedefler için devre dışı bırakılmıştır.",
"An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 2e3cf612..5cf95b38 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -1,7 +1,7 @@
{
"A new version of Riot is available.": "Доступне оновлення для Riot.",
"All messages": "Усі повідомлення",
- "All messages (loud)": "Усі повідомлення (гучно)",
+ "All messages (noisy)": "Усі повідомлення (гучно)",
"All Rooms": "Усі кімнати",
"All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей на даний момент вимкнені.",
"An error occurred whilst saving your email notification preferences.": "Під час збереження налаштувань сповіщень е-поштою трапилася помилка.",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 0a1465b4..4a7b3a32 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -10,7 +10,7 @@
"Add an email address above to configure email notifications": "请在上方输入电子邮件地址以接收邮件通知",
"Advanced notification settings": "通知高级设置",
"All messages": "全部消息",
- "All messages (loud)": "全部消息（高亮）",
+ "All messages (noisy)": "全部消息（高亮）",
"All Rooms": "全部聊天室",
"All notifications are currently disabled for all targets.": "当前所有目标的通知均已禁用。",
"An error occurred whilst saving your email notification preferences.": "保存邮件通知首选项设定时出现错误。",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index fc5dd6ec..ab35f46c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -8,7 +8,7 @@
"<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> 與 <a href=\"http://opera.com\">Opera</a> 也能使用。",
"Advanced notification settings": "進階通知設定",
"All messages": "所有訊息",
- "All messages (loud)": "所有訊息（吵鬧）",
+ "All messages (noisy)": "所有訊息（吵鬧）",
"All Rooms": "所有的聊天室",
"Call invitation": "通話邀請",
"Cancel": "取消",
From 37b5de2251902d3974ebde1a6c4ceba5e8a4127e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 19 Jan 2018 16:52:24 +0000
Subject: [PATCH 65/71] update triaging a bit
---
README.md | 38 +++++++++++++++++++++++++++++---------
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 273f448b..b32bbea7 100644
--- a/README.md
+++ b/README.md
@@ -319,31 +319,51 @@ For a developer guide, see the [translating dev doc](docs/translating-dev.md).
Triaging issues
===============
-Issues will be triaged by the core team using the following primary set of tags:
+Issues will be triaged by the core team using the below set of tags.
-priority:
+Tags are meant to be used in combination - e.g.:
+ * P1 critical bug == really urgent stuff that should be next in the bugfixing todo list
+ * "release blocker" == stuff which is blocking us from cutting the next release.
+ * P1 feature type:voip == what VoIP features should we be working on next?
-* P1: top priority; typically blocks releases
+priority: **compulsory**
+
+* P1: top priority - i.e. pool of stuff which we should be working on next
* P2: still need to fix, but lower than P1
* P3: non-urgent
-* P4: intereseting idea - bluesky some day
+* P4: interesting idea - bluesky some day
* P5: recorded for posterity/to avoid duplicates. No intention to resolves right now.
-bug or feature:
+bug or feature: **compulsory**
* bug
* feature
-bug severity:
+bug severity: **compulsory, if bug**
-* cosmetic - feature works functionally but UI/UX is broken
* critical - whole app doesn't work
* major - entire feature doesn't work
* minor - partially broken feature (but still usable)
+* cosmetic - feature works functionally but UI/UX is broken
-additional categories:
+types
+* type:* - refers to a particular part of the app; used to filter bugs
+ on a given topic - e.g. VOIP, signup, timeline, etc.
+
+additional categories (self-explanatory):
* release blocker
* ui/ux (think of this as cosmetic)
* network (specific to network conditions)
-* platform (platform specific)
+* platform specific
+* accessibility
+* maintenance
+* performance
+* i18n
+* blocked - whether this issue currently can't be progressed due to outside factors
+
+community engagement
+* easy
+* hacktoberfest
+* bounty? - proposal to be included in a bounty programme
+* bounty - included in Status Open Bounty
From 202f0e2163b5f909aca572e5ccac0eebee80f234 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Jan 2018 16:42:08 +0000
Subject: [PATCH 66/71] Add EventTile_quote styling for less margin-right when
in QuotePreview
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.../vector/css/matrix-react-sdk/views/rooms/_EventTile.scss | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index 33edd045..48afc86d 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -96,6 +96,10 @@ limitations under the License.
line-height: 22px;
}
+.mx_EventTile_quote {
+ margin-right: 10px;
+}
+
.mx_EventTile_info .mx_EventTile_line {
padding-left: 83px;
}
@@ -115,7 +119,7 @@ limitations under the License.
background-color: $event-selected-color;
}
-.mx_EventTile:hover .mx_EventTile_line,
+.mx_EventTile:hover .mx_EventTile_line:not(.mx_EventTile_quote),
.mx_EventTile.menu .mx_EventTile_line
{
background-color: $event-selected-color;
From 321f16d8a33af0aa8354441d5c8f8d68a346e867 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Jan 2018 18:54:22 +0000
Subject: [PATCH 67/71] rename variable as it was horrible to read camelCased
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/RightPanel.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 82933c74..55f588f2 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -271,15 +271,15 @@ module.exports = React.createClass({
) {
const cli = this.context.matrixClient;
const room = cli.getRoom(this.props.roomId);
- let userIsInRoom;
+ let isUserInRoom;
if (room) {
const numMembers = room.getJoinedMembers().length;
membersTitle = _t('%(count)s Members', { count: numMembers });
membersBadge = <div title={membersTitle}>{ formatCount(numMembers) }</div>;
- userIsInRoom = room.hasMembershipState(this.context.matrixClient.credentials.userId, 'join');
+ isUserInRoom = room.hasMembershipState(this.context.matrixClient.credentials.userId, 'join');
}
- if (userIsInRoom) {
+ if (isUserInRoom) {
inviteGroup =
<AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteButtonClick}>
<div className="mx_RightPanel_icon" >
From f5fc86258fc039c8f18e45cffb8770d0f827026a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Jan 2018 18:59:18 +0000
Subject: [PATCH 68/71] s/Highlight/SyntaxHighlight/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/ViewSource.js | 6 +++---
src/components/views/dialogs/DevtoolsDialog.js | 10 +++++-----
.../elements/{Highlight.js => SyntaxHighlight.js} | 4 ++--
src/skins/vector/css/_components.scss | 2 +-
.../{_Highlight.scss => _SyntaxHighlight.scss} | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
rename src/components/views/elements/{Highlight.js => SyntaxHighlight.js} (89%)
rename src/skins/vector/css/vector-web/views/elements/{_Highlight.scss => _SyntaxHighlight.scss} (96%)
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index 8f60ae88..3a5d35a5 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -18,7 +18,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
-import Highlight from '../views/elements/Highlight';
+import SyntaxHighlight from '../views/elements/SyntaxHighlight';
module.exports = React.createClass({
@@ -48,9 +48,9 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_ViewSource">
- <Highlight className="json">
+ <SyntaxHighlight className="json">
{ JSON.stringify(this.props.content, null, 2) }
- </Highlight>
+ </SyntaxHighlight>
</div>
);
}
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 1b2af377..1d8f616c 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import sdk from 'matrix-react-sdk';
-import Highlight from '../elements/Highlight';
+import SyntaxHighlight from '../elements/SyntaxHighlight';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
@@ -344,9 +344,9 @@ class RoomStateExplorer extends DevtoolsComponent {
return <div className="mx_ViewSource">
<div className="mx_Dialog_content">
- <Highlight className="json">
+ <SyntaxHighlight className="json">
{ JSON.stringify(this.state.event.event, null, 2) }
- </Highlight>
+ </SyntaxHighlight>
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.onBack}>{ _t('Back') }</button>
@@ -462,9 +462,9 @@ class AccountDataExplorer extends DevtoolsComponent {
return <div className="mx_ViewSource">
<div className="mx_Dialog_content">
- <Highlight className="json">
+ <SyntaxHighlight className="json">
{ JSON.stringify(this.state.event.event, null, 2) }
- </Highlight>
+ </SyntaxHighlight>
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.onBack}>{ _t('Back') }</button>
diff --git a/src/components/views/elements/Highlight.js b/src/components/views/elements/SyntaxHighlight.js
similarity index 89%
rename from src/components/views/elements/Highlight.js
rename to src/components/views/elements/SyntaxHighlight.js
index 8706bb05..a7d8f894 100644
--- a/src/components/views/elements/Highlight.js
+++ b/src/components/views/elements/SyntaxHighlight.js
@@ -18,7 +18,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import {highlightBlock} from 'highlight.js';
-export default class Highlight extends React.Component {
+export default class SyntaxHighlight extends React.Component {
static propTypes = {
className: PropTypes.string,
children: PropTypes.node,
@@ -42,7 +42,7 @@ export default class Highlight extends React.Component {
render() {
const { className, children } = this.props;
- return <pre className={`${className} mx_Highlight`} ref={this._ref}>
+ return <pre className={`${className} mx_SyntaxHighlight`} ref={this._ref}>
<code>{ children }</code>
</pre>;
}
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 8ac66270..a3783786 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -93,7 +93,7 @@
@import "./vector-web/views/dialogs/_SetEmailDialog.scss";
@import "./vector-web/views/dialogs/_SetPasswordDialog.scss";
@import "./vector-web/views/directory/_NetworkDropdown.scss";
-@import "./vector-web/views/elements/_Highlight.scss";
+@import "./vector-web/views/elements/_SyntaxHighlight.scss";
@import "./vector-web/views/elements/_ImageView.scss";
@import "./vector-web/views/elements/_InlineSpinner.scss";
@import "./vector-web/views/elements/_Spinner.scss";
diff --git a/src/skins/vector/css/vector-web/views/elements/_Highlight.scss b/src/skins/vector/css/vector-web/views/elements/_SyntaxHighlight.scss
similarity index 96%
rename from src/skins/vector/css/vector-web/views/elements/_Highlight.scss
rename to src/skins/vector/css/vector-web/views/elements/_SyntaxHighlight.scss
index 9b35844f..e97401a1 100644
--- a/src/skins/vector/css/vector-web/views/elements/_Highlight.scss
+++ b/src/skins/vector/css/vector-web/views/elements/_SyntaxHighlight.scss
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-.mx_Highlight {
+.mx_SyntaxHighlight {
/* inhibit hljs styling */
background: none !important;
color: $light-fg-color !important;
From d9409232f9f833d6e5a7ddb5384dd355ec9c60d9 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Tue, 23 Jan 2018 12:15:08 +0200
Subject: [PATCH 69/71] default url, not domain
https://github.com/matrix-org/matrix-react-sdk/blob/master/src/components/views/messages/MFileBody.js#L116
Signed-off-by: Ander Punnar <ander@kvlt.ee>
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b32bbea7..708912cf 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,7 @@ You can configure the app by copying `config.sample.json` to
1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display
encrypted file attachments. This MUST be hosted on a completely separate domain to
anything else since it is used to isolate the privileges of file attachments to this
- domain. Default: `usercontent.riot.im`. This needs to contain v1.html from
+ domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
https://github.com/matrix-org/usercontent/blob/master/v1.html
1. `piwik`: an object containing the following properties:
1. `url`: The URL of the Piwik instance to use for collecting Analytics
From c2aa8137bb3cea61bdfa38c55d68704d7f43249e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 23 Jan 2018 20:02:47 +0000
Subject: [PATCH 70/71] sort components scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/skins/vector/css/_components.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index a3783786..2319ebee 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -93,10 +93,10 @@
@import "./vector-web/views/dialogs/_SetEmailDialog.scss";
@import "./vector-web/views/dialogs/_SetPasswordDialog.scss";
@import "./vector-web/views/directory/_NetworkDropdown.scss";
-@import "./vector-web/views/elements/_SyntaxHighlight.scss";
@import "./vector-web/views/elements/_ImageView.scss";
@import "./vector-web/views/elements/_InlineSpinner.scss";
@import "./vector-web/views/elements/_Spinner.scss";
+@import "./vector-web/views/elements/_SyntaxHighlight.scss";
@import "./vector-web/views/globals/_MatrixToolbar.scss";
@import "./vector-web/views/messages/_DateSeparator.scss";
@import "./vector-web/views/messages/_MessageTimestamp.scss";
From 22b72985429ee79e882497b6f300879122f36d30 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 23 Jan 2018 20:28:39 +0000
Subject: [PATCH 71/71] add comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/elements/SyntaxHighlight.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/components/views/elements/SyntaxHighlight.js b/src/components/views/elements/SyntaxHighlight.js
index a7d8f894..82b5ae57 100644
--- a/src/components/views/elements/SyntaxHighlight.js
+++ b/src/components/views/elements/SyntaxHighlight.js
@@ -30,10 +30,14 @@ export default class SyntaxHighlight extends React.Component {
this._ref = this._ref.bind(this);
}
+ // componentDidUpdate used here for reusability
+ // componentWillReceiveProps fires too early to call highlightBlock on.
componentDidUpdate() {
if (this._el) highlightBlock(this._el);
}
+ // call componentDidUpdate because _ref is fired on initial render
+ // which does not fire componentDidUpdate
_ref(el) {
this._el = el;
this.componentDidUpdate();