From 87c006da2c2a81296af48a9c5787003f89d8e482 Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Tue, 18 Dec 2018 10:44:49 +0000
Subject: [PATCH 01/16] Update issue templates
---
.github/ISSUE_TEMPLATE/bug_report.md | 55 ++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..6caffdb0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,55 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- 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.
+
+You can also preview your report before submitting it. You may remove sections
+that aren't relevant to your particular case.
+
+Text between <!-- and --> marks will be invisible in the report.
+-->
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+Log: sent/not sent? <!-- You can send us the app's logs via the 'Report bug'
+link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
+file a bug here too! -->
+
+<!-- Include screenshots if possible: you can drag and drop images below. -->
+
+### Version information
+
+<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
+
+- **Platform**: web (in-browser) or desktop?
+
+For the web app:
+
+- **Browser**: Chrome, Safari, Firefox? which version?
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+
+For the desktop app:
+
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **Version**: 0.x.y <!-- check the user settings panel if unsure -->
From e9fa1dd3a91d13e67435d99d5cf290cf45951376 Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Tue, 18 Dec 2018 11:03:55 +0000
Subject: [PATCH 02/16] Update issue templates
---
.github/ISSUE_TEMPLATE/test-template.md | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/test-template.md
diff --git a/.github/ISSUE_TEMPLATE/test-template.md b/.github/ISSUE_TEMPLATE/test-template.md
new file mode 100644
index 00000000..2714836e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/test-template.md
@@ -0,0 +1,10 @@
+---
+name: Test Template
+about: Shortlived test template
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+
From b406da8755241ddf39b7917119b8388971fcaee7 Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Tue, 18 Dec 2018 11:04:34 +0000
Subject: [PATCH 03/16] Update issue templates
---
.github/ISSUE_TEMPLATE/test-template.md | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 .github/ISSUE_TEMPLATE/test-template.md
diff --git a/.github/ISSUE_TEMPLATE/test-template.md b/.github/ISSUE_TEMPLATE/test-template.md
deleted file mode 100644
index 2714836e..00000000
--- a/.github/ISSUE_TEMPLATE/test-template.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Test Template
-about: Shortlived test template
-title: ''
-labels: bug
-assignees: ''
-
----
-
-
From 2f473912ac50a1c5d4765ee2602139820a62e9eb Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Mon, 24 Dec 2018 07:09:41 +0000
Subject: [PATCH 04/16] Update issue templates
---
.github/ISSUE_TEMPLATE/redesign-issue.md | 32 ++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/redesign-issue.md
diff --git a/.github/ISSUE_TEMPLATE/redesign-issue.md b/.github/ISSUE_TEMPLATE/redesign-issue.md
new file mode 100644
index 00000000..162d0a12
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/redesign-issue.md
@@ -0,0 +1,32 @@
+---
+name: Redesign Issue
+about: Bugs, feedback or feature requests specifically associated with the Redesign
+ project (https://riot.im/experimental)
+title: ''
+labels: redesign
+assignees: ''
+
+---
+
+<!-- Thanks for providing feedback on the redesign! By filling out the sections with your information, you will help the us to process your issue.
+-->
+
+- **Browser**: Chrome, Safari, Firefox? which version?
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+Include screenshots if possible: you can drag and drop images below.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+Log: sent/not sent? <!-- You can send us the app's logs via the 'Report bug'
+link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
+file a bug here too! -->
From bb5e78f723c7582e1e50263b97ea0fe2db278b9d Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Mon, 24 Dec 2018 07:13:44 +0000
Subject: [PATCH 05/16] Make the filename match the link
---
.github/ISSUE_TEMPLATE/{redesign-issue.md => redesign_issue.md} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename .github/ISSUE_TEMPLATE/{redesign-issue.md => redesign_issue.md} (100%)
diff --git a/.github/ISSUE_TEMPLATE/redesign-issue.md b/.github/ISSUE_TEMPLATE/redesign_issue.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/redesign-issue.md
rename to .github/ISSUE_TEMPLATE/redesign_issue.md
From ff959529694d427718d0cfb921cb949a9f3af73e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20T=C3=B6tterman?= <ptman@users.noreply.github.com>
Date: Tue, 14 Aug 2018 14:36:53 +0300
Subject: [PATCH 06/16] Start documenting keyboard shortcuts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
I'm sure I don't know all of them.
Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
---
docs/shortcuts.md | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 docs/shortcuts.md
diff --git a/docs/shortcuts.md b/docs/shortcuts.md
new file mode 100644
index 00000000..2c60f6f9
--- /dev/null
+++ b/docs/shortcuts.md
@@ -0,0 +1,9 @@
+# Keyboard Shortcuts
+
+- <kbd>Ctrl</kbd>+<kbd>m</kbd> - toggle markdown
+- <kbd>Ctrl</kbd>+<kbd>d</kbd> - toggle mic mute
+- <kbd>Ctrl</kbd>+<kbd>e</kbd> - toggle video on/off
+- <kbd>Ctrl</kbd>+<kbd>k</kbd> - jump to named room
+- <kbd>↑</kbd>/<kbd>↓</kbd> - navigate within room list
+- <kbd>PageUp</kbd>/<kbd>PageDown</kbd> - scroll timeline up/down
+- <kbd>Ctrl</kbd>+<kbd>Home</kbd>/<kbd>End</kbd> - jump to timeline start/end
From f7f9d8bfc30101f58eb93c7e16f0929c689a36d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20T=C3=B6tterman?= <ptman@users.noreply.github.com>
Date: Fri, 19 Oct 2018 15:49:09 +0300
Subject: [PATCH 07/16] Take Mac into account in keyboard shortcuts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
---
docs/shortcuts.md | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/docs/shortcuts.md b/docs/shortcuts.md
index 2c60f6f9..f29fc2be 100644
--- a/docs/shortcuts.md
+++ b/docs/shortcuts.md
@@ -1,9 +1,11 @@
# Keyboard Shortcuts
-- <kbd>Ctrl</kbd>+<kbd>m</kbd> - toggle markdown
-- <kbd>Ctrl</kbd>+<kbd>d</kbd> - toggle mic mute
-- <kbd>Ctrl</kbd>+<kbd>e</kbd> - toggle video on/off
-- <kbd>Ctrl</kbd>+<kbd>k</kbd> - jump to named room
+The modifier is <kbd>Ctrl</kbd> on Windows & Linux and <kbd>⌘</kbd> on Mac.
+
+- <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>m</kbd> - toggle markdown
+- <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>d</kbd> - toggle mic mute
+- <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>e</kbd> - toggle video on/off
+- <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>k</kbd> - jump to named room
- <kbd>↑</kbd>/<kbd>↓</kbd> - navigate within room list
- <kbd>PageUp</kbd>/<kbd>PageDown</kbd> - scroll timeline up/down
-- <kbd>Ctrl</kbd>+<kbd>Home</kbd>/<kbd>End</kbd> - jump to timeline start/end
+- <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>Home</kbd>/<kbd>End</kbd> - jump to timeline start/end
From b09f0618a94f34b249cf6dd5372518567198b43c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 17 Jan 2019 10:56:34 +0000
Subject: [PATCH 08/16] js-sdk & react-sdk rc.1
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 537f4829..d6ac619f 100644
--- a/package.json
+++ b/package.json
@@ -70,8 +70,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
- "matrix-js-sdk": "0.14.2",
- "matrix-react-sdk": "0.14.7",
+ "matrix-js-sdk": "0.14.3-rc.1",
+ "matrix-react-sdk": "0.14.8-rc.1",
"modernizr": "^3.6.0",
"prop-types": "^15.6.2",
"react": "^15.6.0",
From 021d6c59089cb22b71277ecbbffb79ac65637899 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 17 Jan 2019 11:06:41 +0000
Subject: [PATCH 09/16] Add npm user arg for
https://github.com/matrix-org/matrix-js-sdk/pull/749
---
release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/release.sh b/release.sh
index b5bdb010..67869bc3 100755
--- a/release.sh
+++ b/release.sh
@@ -47,4 +47,4 @@ git commit package.json -m "$tag"
cd ..
-exec ./node_modules/matrix-js-sdk/release.sh -z "$orig_args"
+exec ./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args"
From e94e712d4950acd931c65caaa1eba569d817f60e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 17 Jan 2019 11:07:42 +0000
Subject: [PATCH 10/16] v0.17.9-rc.1
---
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 f9ab1145..8383989e 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.17.8",
+ "version": "0.17.9-rc.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
From 82cd88cf252cea6596e0cce82729c9f06e56e6a2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 17 Jan 2019 11:09:12 +0000
Subject: [PATCH 11/16] Prepare changelog for v0.17.9-rc.1
---
CHANGELOG.md | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2f8d34..771c8fee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+Changes in [0.17.9-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.9-rc.1) (2019-01-17)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.8...v0.17.9-rc.1)
+
+ * Merge develop into experimental
+ [\#8003](https://github.com/vector-im/riot-web/pull/8003)
+ * Electron: Load app from custom protocol
+ [\#7943](https://github.com/vector-im/riot-web/pull/7943)
+ * Fix the IndexedDB worker
+ [\#7920](https://github.com/vector-im/riot-web/pull/7920)
+ * Make clear that the Debian package is for desktop
+ [\#7919](https://github.com/vector-im/riot-web/pull/7919)
+ * Run the Desktop app in a sandbox
+ [\#7907](https://github.com/vector-im/riot-web/pull/7907)
+ * Update to new electron single instance API
+ [\#7908](https://github.com/vector-im/riot-web/pull/7908)
+ * Update the tests to match https://github.com/matrix-org/matrix-react-
+ sdk/pull/2340
+ [\#7834](https://github.com/vector-im/riot-web/pull/7834)
+
Changes in [0.17.8](https://github.com/vector-im/riot-web/releases/tag/v0.17.8) (2018-12-10)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.8-rc.1...v0.17.8)
From e5c0af478d062a3e30ff8e6ee46ff7ff0bc7cb66 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 17 Jan 2019 11:09:13 +0000
Subject: [PATCH 12/16] v0.17.9-rc.1
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index d6ac619f..a3d3384b 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.17.8",
+ "version": "0.17.9-rc.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
From 40d7df793dee3184f53a5de50054d34510eed6a6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 22 Jan 2019 11:31:00 +0000
Subject: [PATCH 13/16] Released js-sdk & react-sdk
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index a3d3384b..c907092d 100644
--- a/package.json
+++ b/package.json
@@ -70,8 +70,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
- "matrix-js-sdk": "0.14.3-rc.1",
- "matrix-react-sdk": "0.14.8-rc.1",
+ "matrix-js-sdk": "0.14.3",
+ "matrix-react-sdk": "0.14.8",
"modernizr": "^3.6.0",
"prop-types": "^15.6.2",
"react": "^15.6.0",
From a0c205e4c92bcf874483589c4063608189d5186d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 22 Jan 2019 11:44:13 +0000
Subject: [PATCH 14/16] v0.17.9
---
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 8383989e..8d881405 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.17.9-rc.1",
+ "version": "0.17.9",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
From 21eb8b91006f9d50c358b2d2d0c0d68e1d5efb94 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 22 Jan 2019 11:45:33 +0000
Subject: [PATCH 15/16] Prepare changelog for v0.17.9
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 771c8fee..ba5de175 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.17.9](https://github.com/vector-im/riot-web/releases/tag/v0.17.9) (2019-01-22)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.9-rc.1...v0.17.9)
+
+ * Bugfix in react-sdk for setting DM rooms
+
Changes in [0.17.9-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.9-rc.1) (2019-01-17)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.8...v0.17.9-rc.1)
From 5a30b02be4319a88a89c6d8a1e020cf148b5cfe7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 22 Jan 2019 11:45:33 +0000
Subject: [PATCH 16/16] v0.17.9
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index c907092d..e5c56cda 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.17.9-rc.1",
+ "version": "0.17.9",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {