From d4e1f1af7ad5a3b1b9fbba64fd94ae55d5555360 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Mon, 18 Feb 2019 17:05:48 +0000 Subject: [PATCH 01/23] Fix cleanup script not to remove extracted/bundles directories (#8764) --- scripts/cleanup.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index 6c174b3a66..3e7923a5c1 100755 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -9,8 +9,11 @@ live=`dirname $(readlink -f "$HOME/live")` # currently live bundle (just the name of the bundle) live_bundle=`grep 'script src="bundles' live/index.html | sed -e 's#.*bundles/##' -e 's#/.*##'` -# clean up 'extracted': find things which are older than 7 days, exclude the current live one, and remove -find $HOME/extracted -maxdepth 1 -type d -ctime +7 \! -path "$live" -exec rm -r {} \; +# clean up 'extracted': find things which are older than 7 days, exclude the +# current live one, and remove +find $HOME/extracted -mindepth 1 -maxdepth 1 -type d -ctime +7 \ + \! -path "$live" -exec rm -r {} \; # clean up 'bundles': ditto -find $HOME/bundles -maxdepth 1 -type d -ctime +7 \! -name "$live_bundle" -exec rm -r {} \; +find $HOME/bundles -mindepth 1 -maxdepth 1 -type d -ctime +7 \ + \! -name "$live_bundle" -exec rm -r {} \; From f9be0bfb2ee01b5f5f93769442ec2612c7d98ba0 Mon Sep 17 00:00:00 2001 From: Tom Lant Date: Wed, 27 Feb 2019 14:06:00 +0000 Subject: [PATCH 02/23] Update issue templates --- .github/ISSUE_TEMPLATE/redesign_issue.md | 32 ------------------------ 1 file changed, 32 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/redesign_issue.md diff --git a/.github/ISSUE_TEMPLATE/redesign_issue.md b/.github/ISSUE_TEMPLATE/redesign_issue.md deleted file mode 100644 index 162d0a1285..0000000000 --- a/.github/ISSUE_TEMPLATE/redesign_issue.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Redesign Issue -about: Bugs, feedback or feature requests specifically associated with the Redesign - project (https://riot.im/experimental) -title: '' -labels: redesign -assignees: '' - ---- - - - -- **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? From 6206b1d0739112403e5a32399db7ab5a44d64016 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 28 Feb 2019 14:51:51 +0000 Subject: [PATCH 03/23] 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 9c7fe711dd..8957e4f118 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": "1.0.0", - "matrix-react-sdk": "1.0.1", + "matrix-js-sdk": "1.0.1-rc.1", + "matrix-react-sdk": "1.0.2-rc.1", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From 53e25ff2472e2f1bc22613415ad3263c011c187f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 11:32:37 +0000 Subject: [PATCH 04/23] Set a resuire alias for the webapp directory So languagehandler can pull the languages json from there --- scripts/package.sh | 6 +----- webpack.config.js | 9 ++------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/package.sh b/scripts/package.sh index 008803cac9..23d0925b05 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -14,11 +14,7 @@ else fi npm run clean -# riot-web is at `workspace`. -# matrix-react-sdk is at `workspace/node_modules/matrix-react-sdk`, but this is -# symlinked to a repo at `workspace/matrix-react-sdk`. -# To get from `workspace/matrix-react-sdk/lib` up to the lang file, we use: -RIOT_LANGUAGES_FILE="../../webapp/i18n/languages.json" npm run build$dev +npm run build$dev # include the sample config in the tarball. Arguably this should be done by # `npm run build`, but it's just too painful. diff --git a/webpack.config.js b/webpack.config.js index 70ef0574a7..2b3423007f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,12 +6,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); let og_image_url = process.env.RIOT_OG_IMAGE_URL; if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/riot-im-logo-black-text.png'; -// relative to languageHandler.js in matrix-react-sdk -let RIOT_LANGUAGES_FILE = process.env.RIOT_LANGUAGES_FILE; -if (!RIOT_LANGUAGES_FILE) { - RIOT_LANGUAGES_FILE = "../../riot-web/webapp/i18n/languages.json"; -} - module.exports = { entry: { // Load babel-polyfill first to avoid issues where some imports (namely react) @@ -157,6 +151,8 @@ module.exports = { // same goes for js-sdk "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'), + + "Webapp": path.resolve('./webapp'), }, }, plugins: [ @@ -164,7 +160,6 @@ module.exports = { 'process.env': { NODE_ENV: JSON.stringify(process.env.NODE_ENV), }, - 'LANGUAGES_FILE': JSON.stringify(RIOT_LANGUAGES_FILE), }), new ExtractTextPlugin("bundles/[hash]/[name].css", { allChunks: true, From bf1ab7f4204840c658814168b4a6a3b351a3cc5f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:03:19 +0000 Subject: [PATCH 05/23] Use $webapp rather than Webapp --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 2b3423007f..9cdc9cae45 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -152,7 +152,7 @@ module.exports = { // same goes for js-sdk "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'), - "Webapp": path.resolve('./webapp'), + "$webapp": path.resolve('./webapp'), }, }, plugins: [ From 2e3d0e50ec766d1e68401ba78a0a10eaa7720277 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:19:28 +0000 Subject: [PATCH 06/23] react-sdk rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8957e4f118..a4e10da667 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "1.0.1-rc.1", - "matrix-react-sdk": "1.0.2-rc.1", + "matrix-react-sdk": "1.0.2-rc.2", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From ab1ceff242f8eee14bd9320bbe01c4611029d78c Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:20:32 +0000 Subject: [PATCH 07/23] v1.0.2-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 f80f3ad341..412c3248e2 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": "1.0.1", + "version": "1.0.2-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 813fdf4aade7128b1eed97215fe3e8ae6aa08143 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:22:18 +0000 Subject: [PATCH 08/23] Prepare changelog for v1.0.2-rc.1 --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 522b7f5b36..f40e17c728 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +Changes in [1.0.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.1) (2019-03-01) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.1...v1.0.2-rc.1) + + * Set a require alias for the webapp directory + [\#9014](https://github.com/vector-im/riot-web/pull/9014) + * Update from Weblate. + [\#8973](https://github.com/vector-im/riot-web/pull/8973) + * set chrome path for travis CI explicitly + [\#8987](https://github.com/vector-im/riot-web/pull/8987) + * Updated install spinner + [\#8984](https://github.com/vector-im/riot-web/pull/8984) + * Allow disabling update mechanism + [\#8911](https://github.com/vector-im/riot-web/pull/8911) + * Allow configuration of whether closing window closes or minimizes to tray + [\#8908](https://github.com/vector-im/riot-web/pull/8908) + * Fix language file path for Jenkins + [\#8854](https://github.com/vector-im/riot-web/pull/8854) + * Document and recommend `default_server_name` + [\#8832](https://github.com/vector-im/riot-web/pull/8832) + * Cache busting for icons & language files + [\#8710](https://github.com/vector-im/riot-web/pull/8710) + * Remove redesign issue template + [\#8722](https://github.com/vector-im/riot-web/pull/8722) + * Make scripts/make-icons.sh work on linux + [\#8550](https://github.com/vector-im/riot-web/pull/8550) + Changes in [1.0.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.1) (2019-02-15) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0...v1.0.1) From ea959d5994b61fe2bd5a8ee92ff9a4c44d9152d5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:22:19 +0000 Subject: [PATCH 09/23] v1.0.2-rc.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 903d8ccfa2..d7b4d41a97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "1.0.1", + "version": "1.0.2-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a4e10da667..477f25e663 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.1", + "version": "1.0.2-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 20c437277cb4527526faca9528137538490e9404 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 17:38:31 +0000 Subject: [PATCH 10/23] react-sdk rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 477f25e663..287b421ab6 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "1.0.1-rc.1", - "matrix-react-sdk": "1.0.2-rc.2", + "matrix-react-sdk": "1.0.2-rc.3", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From 29ff95ccccb123c915ddb8dd51f82acaba96142e Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 17:39:57 +0000 Subject: [PATCH 11/23] v1.0.2-rc.2 --- 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 412c3248e2..5920ec1610 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": "1.0.2-rc.1", + "version": "1.0.2-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 0d6d7557889c6b3716a86f960f3dc7e6c9f2685d Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 17:42:18 +0000 Subject: [PATCH 12/23] Prepare changelog for v1.0.2-rc.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f40e17c728..8e712c78fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.0.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.2) (2019-03-01) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.1...v1.0.2-rc.2) + + * Update to react-sdk rc.3 + Changes in [1.0.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.1) (2019-03-01) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.1...v1.0.2-rc.1) From d4f29805c3198ce5ca028505a47935b306d90121 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 17:42:19 +0000 Subject: [PATCH 13/23] v1.0.2-rc.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index d7b4d41a97..3b5ba5468b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "1.0.2-rc.1", + "version": "1.0.2-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 287b421ab6..8fb68be4e6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.2-rc.1", + "version": "1.0.2-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 9235b5a861608d927a6e5d9bf413286f19554043 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 16:18:04 +0000 Subject: [PATCH 14/23] Add modular.im hosting link to electron app config --- electron_app/riot.im/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 2a52a5117d..21f47b69a3 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -9,6 +9,7 @@ "https://scalar-staging.riot.im/scalar/api", "https://scalar.vector.im/api" ], + "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web&utm_campaign=riot-web-hosting-link", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "welcomeUserId": "@riot-bot:matrix.org", "roomDirectory": { From 5474a5e0c7e55f2a71027e78229a25770744b7d7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 16:45:46 +0000 Subject: [PATCH 15/23] utm_campaign is now added automatically --- electron_app/riot.im/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 21f47b69a3..de3699891e 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -9,7 +9,7 @@ "https://scalar-staging.riot.im/scalar/api", "https://scalar.vector.im/api" ], - "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web&utm_campaign=riot-web-hosting-link", + "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "welcomeUserId": "@riot-bot:matrix.org", "roomDirectory": { From 95c979de9844d2ed84d8c85a7157089a066dd9e9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 19:20:21 +0000 Subject: [PATCH 16/23] react-sdk & js-sdk rcs --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8fb68be4e6..3ed673afc5 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": "1.0.1-rc.1", - "matrix-react-sdk": "1.0.2-rc.3", + "matrix-js-sdk": "1.0.1-rc.2", + "matrix-react-sdk": "1.0.2-rc.4", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From b7d2159d6068a87e5f32e68325fdc01e2392cdca Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 19:20:57 +0000 Subject: [PATCH 17/23] v1.0.2-rc.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 5920ec1610..62f2c0de87 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": "1.0.2-rc.2", + "version": "1.0.2-rc.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 3ee0789ef744876c0ec143017fd5eba25a5ff25b Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 19:22:12 +0000 Subject: [PATCH 18/23] Prepare changelog for v1.0.2-rc.3 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e712c78fd..8eca482acf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.0.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.3) (2019-03-05) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.2...v1.0.2-rc.3) + + * Add modular.im hosting link to electron app config + [\#9051](https://github.com/vector-im/riot-web/pull/9051) + Changes in [1.0.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.2) (2019-03-01) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.1...v1.0.2-rc.2) From 2b709c6973781d91e75ee57280864ad3884218be Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 19:22:13 +0000 Subject: [PATCH 19/23] v1.0.2-rc.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b5ba5468b..4ab05e9f03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "1.0.2-rc.2", + "version": "1.0.2-rc.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3ed673afc5..4445adfc87 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.2-rc.2", + "version": "1.0.2-rc.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 72014c59be372ae7f1f36a06c4df5424d19663b8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Mar 2019 11:29:55 +0000 Subject: [PATCH 20/23] Released matrix-sdk & js-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4445adfc87..a5ed4290aa 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": "1.0.1-rc.2", - "matrix-react-sdk": "1.0.2-rc.4", + "matrix-js-sdk": "1.0.1", + "matrix-react-sdk": "1.0.2", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From ea86359c417b2d18e975a85ea367e328d7d5827c Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Mar 2019 11:31:02 +0000 Subject: [PATCH 21/23] v1.0.2 --- 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 62f2c0de87..a5c0738c98 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": "1.0.2-rc.3", + "version": "1.0.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From ebf6deeed26bd4ed75902f85508d68b2f5930123 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Mar 2019 11:33:13 +0000 Subject: [PATCH 22/23] Prepare changelog for v1.0.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eca482acf..b259dae5cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.0.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2) (2019-03-06) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.3...v1.0.2) + + * New react-sdk for minor hosting link fixes + Changes in [1.0.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.3) (2019-03-05) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.2...v1.0.2-rc.3) From b6930415ce3450f674151d31b58ff3c6aa2ed024 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Mar 2019 11:33:14 +0000 Subject: [PATCH 23/23] v1.0.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ab05e9f03..4cae817196 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "1.0.2-rc.3", + "version": "1.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a5ed4290aa..355e2727b8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.2-rc.3", + "version": "1.0.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {