From 98974e4bb339f8b3a2788c4fc9fd064a2693b212 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Thu, 22 Nov 2018 02:23:16 +0900 Subject: [PATCH 1/6] Tweak release markdown --- scripts/generate_release_markdown.sh | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/scripts/generate_release_markdown.sh b/scripts/generate_release_markdown.sh index 4059d7a8..83de967a 100755 --- a/scripts/generate_release_markdown.sh +++ b/scripts/generate_release_markdown.sh @@ -4,7 +4,7 @@ set -eu function print_link() { local URL="${1}" local CHECKSUM="$(curl -s -S -L "${URL}" | sha256sum | awk '{print $1}')" - echo "${URL}" + echo "- ${URL}" echo " - SHA-256 Checksum: \`${CHECKSUM}\`" } @@ -15,18 +15,26 @@ cat <<-MD ### Mattermost Desktop ${VERSION} has been cut! The download links can be found below. +#### Windows +$(print_link "${BASE_URL}/mattermost-setup-${VERSION}-ia32.exe") +$(print_link "${BASE_URL}/mattermost-setup-${VERSION}-x64.exe") + +#### Windows - zip files +$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-win-ia32.zip") +$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-win-x64.zip") + +#### Mac +$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-mac.dmg") + #### Linux $(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-linux-ia32.tar.gz") $(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-linux-x64.tar.gz") -$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-linux-amd64.deb") + +#### Linux (Unofficial) - deb files $(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-linux-i386.deb") +$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-linux-amd64.deb") -#### Mac -$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-osx.tar.gz") - -#### Windows -$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-win32.zip") -$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-win64.zip") -$(print_link "${BASE_URL}/mattermost-setup-${VERSION}-win32.exe") -$(print_link "${BASE_URL}/mattermost-setup-${VERSION}-win64.exe") +#### Linux (Unofficial) - AppImage files +$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-linux-i386.AppImage") +$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-linux-x86_64.AppImage") MD From e7f546ab4351fd2367fe87495014023114e797e7 Mon Sep 17 00:00:00 2001 From: amyblais Date: Fri, 23 Nov 2018 15:10:42 -0500 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afc26444..f626363d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,47 +1,43 @@ # Mattermost Desktop Application Changelog -## UNDER DEVELOPMENT - -The "UNDER DEVELOPMENT" section of the Mattermost Desktop changelog appears -in the product's `master` branch to note key changes committed to `master` -and are on their way to the next stable release. -When a stable release is pushed, "UNDER DEVELOPMENT" heading is removed -from the final changelog of the release. +## Release v4.2.0 Release date: TBD ### Improvements #### All Platforms - - Added English (UK), Portuguese (BR), Spanish (ES) and Spanish (MX) spell checker + - Added English (UK), Portuguese (BR), Spanish (ES) and Spanish (MX) to the spell checker. [#843](https://github.com/mattermost/desktop/pull/843) [#875](https://github.com/mattermost/desktop/pull/875) - Added `Ctrl/Cmd+F` shortcut to work as browser-like search. [#399](https://github.com/mattermost/desktop/issues/399) - Preserved case of first letter in spellcheck. [#869](https://github.com/mattermost/desktop/pull/869) + - Added support for session expiry notification. + [#866](https://github.com/mattermost/desktop/pull/866) #### Windows - - Set "app start on login" preference to default on and synchronize its state with config.json. + - Set "app start on login" preference as enabled by default and synchronized its state with config.json. [#846](https://github.com/mattermost/desktop/pull/846) - Removed the ability to open UNC path and file:// links. [#881](https://github.com/mattermost/desktop/pull/881) #### Mac - - Add **.dmg** package to support installation. + - Added **.dmg** package to support installation. [#588](https://github.com/mattermost/desktop/pull/588) - - Support "Hide" option of Login Items in Preferences. + - Added "Hide" option to Login Items in Preferences. [#853](https://github.com/mattermost/desktop/pull/853) #### Linux - - [tar.gz] Use SVG icon for Linux application menus in place of PNG icon + - [tar.gz] Added support for using SVG icons for Linux application menus in place of PNG icons. [#815](https://github.com/mattermost/desktop/pull/815) - Updated categories in order to be listed under the appropriate submenu of the application starter. [#816](https://github.com/mattermost/desktop/pull/816) [#818](https://github.com/mattermost/desktop/pull/818) - - Set "app start on login" preference to default on and synchronize its state with config.json. + - Set "app start on login" preference as enabled by default and synchronized its state with config.json. [#846](https://github.com/mattermost/desktop/pull/846) - - Added AppImage packages as unofficial build + - Added AppImage packages as an unofficial build. [#864](https://github.com/mattermost/desktop/pull/864) ### Architectural Changes @@ -49,10 +45,14 @@ Release date: TBD [#820](https://github.com/mattermost/desktop/pull/820) [#847](https://github.com/mattermost/desktop/pull/847) [#882](https://github.com/mattermost/desktop/pull/882) - - Artifact names are configured via `electron-builder.json`. + - Artifact names are now configured via `electron-builder.json`. [#825](https://github.com/mattermost/desktop/pull/825) -### Bug Fixes +### Contributors + +Many thanks to all our contributors. In alphabetical order: + + - [danmaas](https://github.com/danmaas), [hmhealey](https://github.com/hmhealey), [j1mc](https://github.com/j1mc),[jasonblais](https://github.com/jasonblais), [lieut-data](https://github.com/lieut-data), [rodcorsi](https://github.com/rodcorsi), [scherno2](https://github.com/scherno2), [sudheerDev](https://github.com/sudheerDev), [svelle](https://github.com/svelle), [torlenor](https://github.com/torlenor), [yuya-oc](https://github.com/yuya-oc) ---- From 8d878d7ae269092766a3096e14711a0a2ab44d86 Mon Sep 17 00:00:00 2001 From: amyblais Date: Mon, 26 Nov 2018 09:22:06 -0500 Subject: [PATCH 3/6] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f626363d..8ee9a155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Release date: TBD +- Mattermost v4.2.0 contains a high level security fix. [Upgrading](http://docs.mattermost.com/administration/upgrade.html) is highly recommended. Details will be posted on our [security updates page](https://about.mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://www.mattermost.org/responsible-disclosure-policy/). + ### Improvements #### All Platforms @@ -20,8 +22,6 @@ Release date: TBD #### Windows - Set "app start on login" preference as enabled by default and synchronized its state with config.json. [#846](https://github.com/mattermost/desktop/pull/846) - - Removed the ability to open UNC path and file:// links. - [#881](https://github.com/mattermost/desktop/pull/881) #### Mac - Added **.dmg** package to support installation. From b5228f87798194094f1db817c3f16ca56f7ac23d Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Mon, 26 Nov 2018 23:49:59 +0900 Subject: [PATCH 4/6] Tweak artifact name for release --- scripts/cp_artifacts.sh | 8 ++++---- scripts/generate_release_markdown.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/cp_artifacts.sh b/scripts/cp_artifacts.sh index 1bb25c50..e939484d 100644 --- a/scripts/cp_artifacts.sh +++ b/scripts/cp_artifacts.sh @@ -5,10 +5,10 @@ VERSION=`cat package.json | jq -r '.version'` SRC=$1 DEST=$2 -cp "${SRC}/mattermost-${VERSION}-win-ia32.zip" "${DEST}/mattermost-desktop-${VERSION}-win-ia32.zip" -cp "${SRC}/mattermost-${VERSION}-win-x64.zip" "${DEST}/mattermost-desktop-${VERSION}-win-x64.zip" -cp "${SRC}/squirrel-windows/mattermost-setup-${VERSION}.exe" "${DEST}/mattermost-setup-${VERSION}-x64.exe" -cp "${SRC}"/squirrel-windows-ia32/*.exe "${DEST}/" +cp "${SRC}/mattermost-${VERSION}-win-ia32.zip" "${DEST}/mattermost-desktop-${VERSION}-win32.zip" +cp "${SRC}/mattermost-${VERSION}-win-x64.zip" "${DEST}/mattermost-desktop-${VERSION}-win64.zip" +cp "${SRC}/squirrel-windows/mattermost-setup-${VERSION}.exe" "${DEST}/mattermost-setup-${VERSION}-win64.exe" +cp "${SRC}/squirrel-windows-ia32/mattermost-setup-${VERSION}-ia32.exe" "${DEST}/mattermost-setup-${VERSION}-win32.exe" cp "${SRC}"/mattermost-desktop-*.zip "${DEST}/" cp "${SRC}"/*.tar.gz "${DEST}/" cp "${SRC}"/*.deb "${DEST}/" diff --git a/scripts/generate_release_markdown.sh b/scripts/generate_release_markdown.sh index 83de967a..500fe8f4 100755 --- a/scripts/generate_release_markdown.sh +++ b/scripts/generate_release_markdown.sh @@ -16,12 +16,12 @@ cat <<-MD The download links can be found below. #### Windows -$(print_link "${BASE_URL}/mattermost-setup-${VERSION}-ia32.exe") -$(print_link "${BASE_URL}/mattermost-setup-${VERSION}-x64.exe") +$(print_link "${BASE_URL}/mattermost-setup-${VERSION}-win32.exe") +$(print_link "${BASE_URL}/mattermost-setup-${VERSION}-win64.exe") #### Windows - zip files -$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-win-ia32.zip") -$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-win-x64.zip") +$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-win32.zip") +$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-win64.zip") #### Mac $(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-mac.dmg") From 046a8488dba41ff6d72bbbe716d7813eeabbd871 Mon Sep 17 00:00:00 2001 From: amyblais Date: Mon, 26 Nov 2018 10:24:18 -0500 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ee9a155..a8403d47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Release v4.2.0 -Release date: TBD +Release date: Nov 27, 2018 - Mattermost v4.2.0 contains a high level security fix. [Upgrading](http://docs.mattermost.com/administration/upgrade.html) is highly recommended. Details will be posted on our [security updates page](https://about.mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://www.mattermost.org/responsible-disclosure-policy/). From e99af55f6070314c07d1828746aa94f80277fdb6 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Tue, 27 Nov 2018 00:47:30 +0900 Subject: [PATCH 6/6] Version 4.2.0 --- package.json | 2 +- src/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dedcef3a..2519a991 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "mattermost-desktop", "productName": "Mattermost", - "version": "4.2.0-rc1", + "version": "4.2.0", "description": "Mattermost", "main": "main.js", "author": "Mattermost, Inc. ", diff --git a/src/package.json b/src/package.json index 21fcc2bf..ed8b1ca7 100644 --- a/src/package.json +++ b/src/package.json @@ -2,7 +2,7 @@ "name": "mattermost-desktop", "productName": "Mattermost", "desktopName": "Mattermost.desktop", - "version": "4.2.0-rc1", + "version": "4.2.0", "description": "Mattermost", "main": "main_bundle.js", "author": "Mattermost, Inc. ",