From c4bc38f0d75d98946d98fd75f7735aedf356e960 Mon Sep 17 00:00:00 2001 From: Tom Lant Date: Thu, 9 Mar 2017 12:00:54 +0000 Subject: [PATCH 01/18] Fixing triage markdown as per #3382 --- README.md | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index fd6acfd7..a5456c1d 100644 --- a/README.md +++ b/README.md @@ -263,21 +263,28 @@ Triaging issues Issues will be triaged by the core team using the following primary set of tags: priority: - P1: top priority; typically blocks releases. - P2: one below that - P3: non-urgent - P4/P5: bluesky some day, who knows. + +* P1: top priority; typically blocks releases +* P2: still need to fix, but lower than P1 +* P3: non-urgent +* P4: intereseting idea - bluesky some day +* P5: recorded for posterity/to avoid duplicates. No intention to resolves right now. bug or feature: - bug severity: - * 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) - * release blocker +* bug +* feature - * ui/ux (think of this as cosmetic) +bug severity: + +* 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) - * network (specific to network conditions) - * platform (platform specific) +additional categories: + +* release blocker +* ui/ux (think of this as cosmetic) +* network (specific to network conditions) +* platform (platform specific) From a63eb2621bfc15326a1cb3be41bc5d2c908432bf Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Apr 2017 17:12:48 +0100 Subject: [PATCH 02/18] Prerelease js-sdk & react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 28cde389..8738115d 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", - "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "0.7.6-rc.1", + "matrix-react-sdk": "0.8.7-rc.1", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.4.0", From cc87135b28406797bc08e34a9831f19f8d744cbd Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Apr 2017 17:19:08 +0100 Subject: [PATCH 03/18] Prepare changelog for v0.9.8-rc.1 --- CHANGELOG.md | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 659a3742..d3e60445 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,100 @@ +Changes in [0.9.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.1) (2017-04-07) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7...v0.9.8-rc.1) + + * Add support for indexeddb sync in webworker + [\#3578](https://github.com/vector-im/riot-web/pull/3578) + * Add CSS to make Emote sender cursor : pointer + [\#3574](https://github.com/vector-im/riot-web/pull/3574) + * Remove rageshake server + [\#3565](https://github.com/vector-im/riot-web/pull/3565) + * Adjust CSS for matrix-org/matrix-react-sdk#789 + [\#3566](https://github.com/vector-im/riot-web/pull/3566) + * Fix tests to reflect recent changes + [\#3537](https://github.com/vector-im/riot-web/pull/3537) + * Do not assume getTs will return comparable integer + [\#3536](https://github.com/vector-im/riot-web/pull/3536) + * Rename ReactPerf to Perf + [\#3535](https://github.com/vector-im/riot-web/pull/3535) + * Don't show phone number as target for email notifs + [\#3530](https://github.com/vector-im/riot-web/pull/3530) + * Fix people section again + [\#3458](https://github.com/vector-im/riot-web/pull/3458) + * dark theme invert inconsistent across browsers + [\#3479](https://github.com/vector-im/riot-web/pull/3479) + * CSS for adding phone number in UserSettings + [\#3451](https://github.com/vector-im/riot-web/pull/3451) + * Support for phone number registration/signin, mk2 + [\#3426](https://github.com/vector-im/riot-web/pull/3426) + * Confirm redactions with a dialog + [\#3470](https://github.com/vector-im/riot-web/pull/3470) + * Better CSS for redactions + [\#3453](https://github.com/vector-im/riot-web/pull/3453) + * Fix the people section + [\#3448](https://github.com/vector-im/riot-web/pull/3448) + * Merge the two RoomTile context menus into one + [\#3395](https://github.com/vector-im/riot-web/pull/3395) + * Refactor screen set after login + [\#3385](https://github.com/vector-im/riot-web/pull/3385) + * CSS for redacted EventTiles + [\#3379](https://github.com/vector-im/riot-web/pull/3379) + * Height:100% for welcome pages on Safari + [\#3340](https://github.com/vector-im/riot-web/pull/3340) + * `view_room` dispatch from `onClick` RoomTile + [\#3376](https://github.com/vector-im/riot-web/pull/3376) + * Hide statusAreaBox_line entirely when inCall + [\#3350](https://github.com/vector-im/riot-web/pull/3350) + * Set padding-bottom: 0px for .mx_Dialog spinner + [\#3351](https://github.com/vector-im/riot-web/pull/3351) + * Support InteractiveAuth based registration + [\#3333](https://github.com/vector-im/riot-web/pull/3333) + * Expose notification option for username/MXID + [\#3334](https://github.com/vector-im/riot-web/pull/3334) + * Float the toggle in the top right of MELS + [\#3190](https://github.com/vector-im/riot-web/pull/3190) + * More aggressive rageshake log culling + [\#3311](https://github.com/vector-im/riot-web/pull/3311) + * Don't overflow directory network options + [\#3282](https://github.com/vector-im/riot-web/pull/3282) + * CSS for ban / kick reason prompt + [\#3250](https://github.com/vector-im/riot-web/pull/3250) + * Allow forgetting rooms you're banned from + [\#3246](https://github.com/vector-im/riot-web/pull/3246) + * Fix icon paths in manifest + [\#3245](https://github.com/vector-im/riot-web/pull/3245) + * Fix broken tests caused by adding IndexedDB support + [\#3242](https://github.com/vector-im/riot-web/pull/3242) + * CSS for un-ban button in RoomSettings + [\#3227](https://github.com/vector-im/riot-web/pull/3227) + * Remove z-index property on avatar initials + [\#3239](https://github.com/vector-im/riot-web/pull/3239) + * Reposition certain icons in the status bar + [\#3233](https://github.com/vector-im/riot-web/pull/3233) + * CSS for kick/ban confirmation dialog + [\#3224](https://github.com/vector-im/riot-web/pull/3224) + * Style for split-out interactive auth + [\#3217](https://github.com/vector-im/riot-web/pull/3217) + * Use the teamToken threaded through from react sdk + [\#3196](https://github.com/vector-im/riot-web/pull/3196) + * rageshake: Add file server with basic auth + [\#3169](https://github.com/vector-im/riot-web/pull/3169) + * Fix bug with home icon not appearing when logged in as team member + [\#3162](https://github.com/vector-im/riot-web/pull/3162) + * Add ISSUE_TEMPLATE + [\#2836](https://github.com/vector-im/riot-web/pull/2836) + * Store bug reports in separate directories + [\#3150](https://github.com/vector-im/riot-web/pull/3150) + * Quick and dirty support for custom welcome pages. + [\#2575](https://github.com/vector-im/riot-web/pull/2575) + * RTS Welcome Pages + [\#3103](https://github.com/vector-im/riot-web/pull/3103) + * rageshake: Abide by Go standards + [\#3149](https://github.com/vector-im/riot-web/pull/3149) + * Bug report server script + [\#3072](https://github.com/vector-im/riot-web/pull/3072) + * Bump olm version + [\#3125](https://github.com/vector-im/riot-web/pull/3125) + Changes in [0.9.7](https://github.com/vector-im/riot-web/releases/tag/v0.9.7) (2017-02-04) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.3...v0.9.7) From c576e07c852d5c4ba85361d19a9a882bacd703cb Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Apr 2017 17:19:08 +0100 Subject: [PATCH 04/18] v0.9.8-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8738115d..0a32953c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron/src/electron-main.js", - "version": "0.9.7", + "version": "0.9.8-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": { From bced608c48f4c60f95a22d165bd543b474581929 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Apr 2017 17:28:32 +0100 Subject: [PATCH 05/18] Roll back version number to try again --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a32953c..8738115d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron/src/electron-main.js", - "version": "0.9.8-rc.1", + "version": "0.9.7", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": { From 08ee93a57b33294ca5dad70f298009006b313874 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Apr 2017 17:29:12 +0100 Subject: [PATCH 06/18] v0.9.8-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8738115d..0a32953c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron/src/electron-main.js", - "version": "0.9.7", + "version": "0.9.8-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": { From 32c6482dcfc0643a8797540cde772f1fba8ce707 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 10 Apr 2017 16:55:27 +0100 Subject: [PATCH 07/18] Bump js-sdk & react-sdk versions --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 91918b1a..3983eb4e 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", - "matrix-js-sdk": "0.7.6-rc.1", - "matrix-react-sdk": "0.8.7-rc.1", + "matrix-js-sdk": "0.7.6-rc.2", + "matrix-react-sdk": "0.8.7-rc.3", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.4.0", From 7907d41ea8cbd323e7487a57869b67dd60488b01 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 10 Apr 2017 16:56:40 +0100 Subject: [PATCH 08/18] Prepare changelog for v0.9.8-rc.2 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3e60445..26ab2d29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [0.9.8-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.2) (2017-04-10) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.1...v0.9.8-rc.2) + + * Redacted events bg: black lozenge -> torn paper + [\#3596](https://github.com/vector-im/riot-web/pull/3596) + * Add 'app' parameter to rageshake report + [\#3594](https://github.com/vector-im/riot-web/pull/3594) + Changes in [0.9.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.1) (2017-04-07) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7...v0.9.8-rc.1) From 0b266d2e83ceafb88bb3337f85b483e475b7dc36 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 10 Apr 2017 16:56:41 +0100 Subject: [PATCH 09/18] v0.9.8-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3983eb4e..e3b6d920 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron/src/electron-main.js", - "version": "0.9.8-rc.1", + "version": "0.9.8-rc.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": { From b26c460f1355a8d981f6f0f9f1360a8cb4d83cd4 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Mon, 10 Apr 2017 23:22:25 +0100 Subject: [PATCH 10/18] shrink the redacted tear --- .../vector/css/matrix-react-sdk/views/rooms/_EventTile.scss | 3 ++- 1 file changed, 2 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 b59ac0b9..4f01aeee 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 @@ -133,9 +133,10 @@ limitations under the License. .mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody { display: block; width: 100%; - height: 73px; + height: 36px; background-image: $event-redacted-img; background-repeat: no-repeat; + background-size: contain; } .mx_EventTile.mx_EventTile_redacted .mx_EventTile_line { From 8587df1dd9a6e74d3f74953769e394c2a479045e Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 11 Apr 2017 18:49:27 +0100 Subject: [PATCH 11/18] React SDK rc.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3b6d920..6fd05aa6 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", "matrix-js-sdk": "0.7.6-rc.2", - "matrix-react-sdk": "0.8.7-rc.3", + "matrix-react-sdk": "0.8.7-rc.4", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.4.0", From 55ec7dcebc945b3b123f254da04c70c4ac4865d3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 11 Apr 2017 18:50:20 +0100 Subject: [PATCH 12/18] Prepare changelog for v0.9.8-rc.3 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ab2d29..299a34f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.9.8-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.3) (2017-04-11) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.2...v0.9.8-rc.3) + + * Make the clear cache button work on desktop + [\#3598](https://github.com/vector-im/riot-web/pull/3598) + Changes in [0.9.8-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.2) (2017-04-10) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.1...v0.9.8-rc.2) From 4ead2f338d5e42b901cfaa7b5c0248054c9aae51 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 11 Apr 2017 18:50:21 +0100 Subject: [PATCH 13/18] v0.9.8-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6fd05aa6..fba22ace 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron/src/electron-main.js", - "version": "0.9.8-rc.2", + "version": "0.9.8-rc.3", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": { From 6a5d0dda2ff84a5edb287ac8f54275cbf475c1d6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 12 Apr 2017 10:03:43 +0100 Subject: [PATCH 14/18] Use release versions of js-sdk & react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fba22ace..dc8a2cc4 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", - "matrix-js-sdk": "0.7.6-rc.2", - "matrix-react-sdk": "0.8.7-rc.4", + "matrix-js-sdk": "0.7.6", + "matrix-react-sdk": "0.8.7", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.4.0", From 967ebb5f9f3ece2625033ed87253832bfa9c7cbf Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 12 Apr 2017 10:10:52 +0100 Subject: [PATCH 15/18] Prepare changelog for v0.9.8 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 299a34f3..a2ed3149 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.9.8](https://github.com/vector-im/riot-web/releases/tag/v0.9.8) (2017-04-12) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.3...v0.9.8) + + * No changes + Changes in [0.9.8-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.3) (2017-04-11) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.2...v0.9.8-rc.3) From ba8745cb42d609b406df49fc5a1b04006067837f Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 12 Apr 2017 10:10:53 +0100 Subject: [PATCH 16/18] v0.9.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc8a2cc4..8bdb2ba0 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron/src/electron-main.js", - "version": "0.9.8-rc.3", + "version": "0.9.8", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": { From 76f140c62c20a2d92eb28def4ef90b4d691eb75d Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 12 Apr 2017 10:14:58 +0100 Subject: [PATCH 17/18] Back to develop js & react sdks --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8bdb2ba0..62b1f134 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", - "matrix-js-sdk": "0.7.6", - "matrix-react-sdk": "0.8.7", + "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop", + "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.4.0", From 15accf33f59131752d49007ba92d18d0b3fa9721 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sat, 15 Apr 2017 00:30:31 +0100 Subject: [PATCH 18/18] get rid of the evil blue outlines --- src/skins/vector/css/_components.scss | 1 + .../views/elements/_AccessibleButton.scss | 21 +++++++++++++++++++ .../views/rooms/_RoomTile.scss | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/skins/vector/css/matrix-react-sdk/views/elements/_AccessibleButton.scss diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss index c22fbc06..df3c4600 100644 --- a/src/skins/vector/css/_components.scss +++ b/src/skins/vector/css/_components.scss @@ -19,6 +19,7 @@ @import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_SetDisplayNameDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss"; +@import "./matrix-react-sdk/views/elements/_AccessibleButton.scss"; @import "./matrix-react-sdk/views/elements/_AddressSelector.scss"; @import "./matrix-react-sdk/views/elements/_AddressTile.scss"; @import "./matrix-react-sdk/views/elements/_DirectorySearchBox.scss"; diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_AccessibleButton.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_AccessibleButton.scss new file mode 100644 index 00000000..b82ebf01 --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_AccessibleButton.scss @@ -0,0 +1,21 @@ +/* +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_AccessibleButton:focus { + outline: 0; + filter: brightness(200%); +} + 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 08efa145..842228b9 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 @@ -156,7 +156,7 @@ limitations under the License. } .mx_RoomTile:focus { - outline: 0; + filter: none ! important; background-color: $roomtile-focused-bg-color; }