From 85040a2e6d77c2a33262df92f8cf2cbfa5cc01e3 Mon Sep 17 00:00:00 2001 From: rubo77 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 fd3f486b7d..cbae864396 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 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 dda87767a6..3a8dd91dc0 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 ( - { DateUtils.formatTime(date) } + { DateUtils.formatTime(date)+' ' } ); }, }); - 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 a7155ad12d..5d9168f5c2 100644 --- a/src/components/views/dialogs/DevtoolsDialog.js +++ b/src/components/views/dialogs/DevtoolsDialog.js @@ -60,7 +60,7 @@ class GenericEditor extends DevtoolsComponent {
- +
; } 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 1da2063212..273f448b29 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 016517cd2c..6e83cec2d1 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 29da3413b3..fc380e7d58 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 = ( {throw new Error("unimplemented");}} diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js index a7e7c9851b..dab616577a 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( 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 8568d96a92..f930b6d23f 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -1,5 +1,5 @@ - + Riot diff --git a/src/vector/index.js b/src/vector/index.js index 46ef706eeb..fe326e16e3 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 Date: Sun, 26 Nov 2017 09:49:39 +1300 Subject: [PATCH 07/71] Change html root id Change the root 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 f930b6d23f..172ccfabe6 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -1,5 +1,5 @@ - + Riot diff --git a/src/vector/index.js b/src/vector/index.js index fe326e16e3..c154919bd4 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 Date: Sun, 26 Nov 2017 13:46:47 +1300 Subject: [PATCH 08/71] Use documentElement instead of getElementById Use documentElement to get the root 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 172ccfabe6..8568d96a92 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -1,5 +1,5 @@ - + Riot diff --git a/src/vector/index.js b/src/vector/index.js index c154919bd4..5ac42d8a64 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 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 67ca096608..0dd6a1b1b7 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 64dec8260a..6f08fd47b2 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 0000000000..6c8f7197d7 --- /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 62d7af0640..327f2e4a28 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 1a78e51731..bc04abcae0 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 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 bc04abcae0..db1fb170e5 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 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 8083306ba5..0c909b7cf7 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 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 327f2e4a28..d5e862aec6 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 c140f7079f..60ffeca8ee 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 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 6c8f7197d7..b557710b26 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 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 60f07a62c8..fa3a593c6b 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 c3f51bc815..e1b2f96eb5 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 7de3958a59..2d6e6ae04c 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 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 29786fadda..8ae1fe152c 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 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 bd05efa020..ed60b83d63 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 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 e1b2f96eb5..9ad265dc0b 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 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 9ad265dc0b..251c65226c 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 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 0000000000..5aae5502cd --- /dev/null +++ b/src/skins/vector/img/camera_green.svg @@ -0,0 +1,15 @@ + + + + + + From 1a0c0af447a908377fd526f9eacfdde84d06ccfa Mon Sep 17 00:00:00 2001 From: Luke Barnard 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 e6d3e1f253..a4ca44ad6b 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 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 e6d3e1f253..a4ca44ad6b 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 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 85e7358b2a..ad237ebe8a 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 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 1d683290cb..c72ea8da07 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 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 a4ca44ad6b..050c9f32a1 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 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 8376cea739..975d16f623 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 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 0000000000..4f9e10191f --- /dev/null +++ b/src/skins/vector/img/maximize.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/src/skins/vector/img/minimize.svg b/src/skins/vector/img/minimize.svg new file mode 100644 index 0000000000..410b0bc08e --- /dev/null +++ b/src/skins/vector/img/minimize.svg @@ -0,0 +1,8 @@ + + + + + + From 0ff5d6118981b6a9f4f50405f7eaba65b07fdb41 Mon Sep 17 00:00:00 2001 From: Richard Lewis 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 975d16f623..2d61ca7743 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 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 fa3a593c6b..f78835b45b 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 d8f9a4daa2..dfff031fc9 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 6bf3f3b60a..8ce81c0dea 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 cfc46e85ab..b4a4242025 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 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 7e1d380cba..ba4adf39f0 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,3 +1,5 @@ + +