summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe <rubberduckie3554@gmail.com>2019-02-08 14:49:53 -0500
committerJoe <rubberduckie3554@gmail.com>2019-02-08 14:49:53 -0500
commit440d0b81cad69135d7c898a25c86ac1032e65f4e (patch)
tree8998a2c60c06655ecf7f2a4e46b60e98370447ab
parentebe5b19e76648019cc1128c05b428a863479f5d3 (diff)
Release Nheko 0.6.3v0.6.3
- Update version numbers and documentation - Fix github releases oauth key
-rw-r--r--.travis.yml4
-rw-r--r--CHANGELOG.md16
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.md20
-rw-r--r--appveyor.yml12
-rw-r--r--deploy/installer/config.xml2
-rw-r--r--resources/nheko.appdata.xml5
7 files changed, 39 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml
index afe6fb6a..c5cd84c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,7 +92,7 @@ deploy:
overwrite: true
provider: releases
api_key:
- secure: "JROFCxI1Dj0j8GKftCk1M16PovGmbCQb/i6JKm+YKWIhoYoMJBFl3TzhN0D0KlT8VeClZ0WV4MOom6elAkxlYTGR1kcoJ5ESt/AS0B1ULxq2exbmqzqJgJJBb65JVo4nglLHZPnUHOY5s/QGtg05nPeexcK8b3lFvhMRI+Y5jqX9i4FGsEBk6tG2OLfXB0odU8f6rhEeIGWgJw1LVyiTk3VoQcJtBi7Vsg3p4othMaLDlkVHsepNY+xSO14NbNpUjXSzYWZJEM9HqCOaOlAjZR5Q0Ad365TqN9zj6NOVwxEdN4Zl3/Ux838Or6TobhdhGjqqO2JmWt6C+xV4XJ9wX+8LPb+hYYVBrItp32g3grtW/e4nNsp4j3nm1P87kzKPxC4oAaskyn0dlwC4Vo3LH67beQiceAIuM9ywej4Zwr94+MeKjIVtqI6Qz7Tjlt1pFGI1lmfkKQOXiFlkwPbyCPV3smpJ1WSOC4Npkht6tFPBlLV2DFySYUMRAdH2RwBxWhjzwsSJlx/dEKUUL5yffKtg2tANM6aCCyXMEqEXXVkFe9e9ymPbGmmQuf56xo3rYQj5BcQWA9JHAancqLkxoR0rbRBBmai5qDQP7rBss/HR7Uec5xSnYkS6YYI9zpZ+FTfPa7lnVI3c8hj+ukua1EnsYytB8F8l95jrO8fnTxU="
+ secure: "rDFG4DIwIG+A9R8seQ3SIXfWOWhJgJHlNQHtAsnfRrPOSIpI7kMebHLDO5sBPNaJ+9MH9acVTJZOabVLf0DdPqRsDUw/PN28aiiqbaH9+zAGOTxahaQ222Gz/ROf/iXvDoTDUnUzURqQUA0YlHy89Z1CnO7TKwlsYhA5A8n0biG7d8i7vQayvwYXfxlk7CouK+Y86ana4r54j1emGRg97p7BOhORibg54ZD520hN0Iif7EJM2hQDTWKZzTDdBt3mF1kBr7cBbuBHWuvE+eIFO3F3yi+u7ggHzw5FaAv245N4fhkpYUl/mSbhLrQG2NOnkglFCpQ2lLd6mWdXHwUNrxN/j+UPewmLg7CymY25zkiL43deDsT8KmpzYalmdaevCqEaX2VehuBzblmH4Re8wnXqBrab14fq0TNDfPqC+NKxy75mdxszbKBC55nTlTB+hsox43dvfvyXDSON4qAzwe9Q/tfp8mL2mehcM868vhw5cbNIskKT8SrhMwmA+sxoqnqLsmAjNVJVTgg6ppbMhjNMOBTndblRHfH6bxsgpTXPtnzC17o9Mw1WgF63eOWNYBEj2wW5ZvWX95Gvg5YzvsF178ipHZDqZfA62ShB3b89fcqN5SOxBsE8UYoHjQIHxQdWeKv23iFwmT8fWAOD8sKDcRyz0WCgidZ1/RjLqsU="
file_glob: true
file:
- nheko-${VERSION}-x86_64.AppImage
@@ -104,7 +104,7 @@ deploy:
overwrite: true
provider: releases
api_key:
- secure: "JROFCxI1Dj0j8GKftCk1M16PovGmbCQb/i6JKm+YKWIhoYoMJBFl3TzhN0D0KlT8VeClZ0WV4MOom6elAkxlYTGR1kcoJ5ESt/AS0B1ULxq2exbmqzqJgJJBb65JVo4nglLHZPnUHOY5s/QGtg05nPeexcK8b3lFvhMRI+Y5jqX9i4FGsEBk6tG2OLfXB0odU8f6rhEeIGWgJw1LVyiTk3VoQcJtBi7Vsg3p4othMaLDlkVHsepNY+xSO14NbNpUjXSzYWZJEM9HqCOaOlAjZR5Q0Ad365TqN9zj6NOVwxEdN4Zl3/Ux838Or6TobhdhGjqqO2JmWt6C+xV4XJ9wX+8LPb+hYYVBrItp32g3grtW/e4nNsp4j3nm1P87kzKPxC4oAaskyn0dlwC4Vo3LH67beQiceAIuM9ywej4Zwr94+MeKjIVtqI6Qz7Tjlt1pFGI1lmfkKQOXiFlkwPbyCPV3smpJ1WSOC4Npkht6tFPBlLV2DFySYUMRAdH2RwBxWhjzwsSJlx/dEKUUL5yffKtg2tANM6aCCyXMEqEXXVkFe9e9ymPbGmmQuf56xo3rYQj5BcQWA9JHAancqLkxoR0rbRBBmai5qDQP7rBss/HR7Uec5xSnYkS6YYI9zpZ+FTfPa7lnVI3c8hj+ukua1EnsYytB8F8l95jrO8fnTxU="
+ secure: "rDFG4DIwIG+A9R8seQ3SIXfWOWhJgJHlNQHtAsnfRrPOSIpI7kMebHLDO5sBPNaJ+9MH9acVTJZOabVLf0DdPqRsDUw/PN28aiiqbaH9+zAGOTxahaQ222Gz/ROf/iXvDoTDUnUzURqQUA0YlHy89Z1CnO7TKwlsYhA5A8n0biG7d8i7vQayvwYXfxlk7CouK+Y86ana4r54j1emGRg97p7BOhORibg54ZD520hN0Iif7EJM2hQDTWKZzTDdBt3mF1kBr7cBbuBHWuvE+eIFO3F3yi+u7ggHzw5FaAv245N4fhkpYUl/mSbhLrQG2NOnkglFCpQ2lLd6mWdXHwUNrxN/j+UPewmLg7CymY25zkiL43deDsT8KmpzYalmdaevCqEaX2VehuBzblmH4Re8wnXqBrab14fq0TNDfPqC+NKxy75mdxszbKBC55nTlTB+hsox43dvfvyXDSON4qAzwe9Q/tfp8mL2mehcM868vhw5cbNIskKT8SrhMwmA+sxoqnqLsmAjNVJVTgg6ppbMhjNMOBTndblRHfH6bxsgpTXPtnzC17o9Mw1WgF63eOWNYBEj2wW5ZvWX95Gvg5YzvsF178ipHZDqZfA62ShB3b89fcqN5SOxBsE8UYoHjQIHxQdWeKv23iFwmT8fWAOD8sKDcRyz0WCgidZ1/RjLqsU="
file: nheko-${VERSION}.dmg
on:
condition: "$TRAVIS_OS_NAME == osx && $DEPLOYMENT == 1"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c492299..0efbb516 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
## [Unreleased]
+## [0.6.3] - 2019-02-08
+
+### Features
+- Room notifications now distinguish between general and user mentions by using different colors
+- User names are now colored based on both the theme and a hash from their user id.
+- Add font selection preference
+
+
+### Improvements
+- Fix room joining issue by escaping (thanks rnhmjoj)
+- Mild tweaks to the dark and light themes
+- Add paragraph tags back to markdown, fixing #2 / mujx#438
+- Tweak author text to help differentiate it from the message text
+- Some Russian translations have been added/fixed (thanks tim77)
+- Partially address some build issues (related to #10)
+
## [0.6.2] - 2018-10-07
### Features
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad48e7d2..ca343881 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ include(QtCommon)
project(nheko LANGUAGES C CXX)
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "6")
-set(CPACK_PACKAGE_VERSION_PATCH "2")
+set(CPACK_PACKAGE_VERSION_PATCH "3")
set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR})
set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR})
set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH})
diff --git a/README.md b/README.md
index f3fad169..3a7a935b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ nheko
----
[![Build Status](https://travis-ci.org/Nheko-Reborn/nheko.svg?branch=master)](https://travis-ci.org/Nheko-Reborn/nheko)
[![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/redsky17/nheko/branch/master)
-[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/v0.6.2)
+[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/v0.6.3)
[![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/nightly)
[![#nheko-reborn:matrix.org](https://img.shields.io/matrix/nheko-reborn:matrix.org.svg?label=%23nheko-reborn:matrix.org)](https://matrix.to/#/#nheko-reborn:matrix.org)
[![AUR: nheko](https://img.shields.io/badge/AUR-nheko-blue.svg)](https://aur.archlinux.org/packages/nheko)
@@ -154,7 +154,7 @@ brew install qt5 lmdb cmake llvm libsodium spdlog boost cmark
Make sure to install the `MSVC 2017 64-bit` toolset for at least Qt 5.9
(lower versions does not support VS2017).
-3. Install dependencies with `vcpkg`. You can simply clone it into a subfolder
+3. Install dependencies with `vcpkg`. You can simply clone it into a subfolder
of the root nheko source directory.
```powershell
@@ -234,14 +234,14 @@ You need to fill out the paths for the `CMAKE_TOOLCHAIN_FILE` and the `Qt5_DIR`.
The toolchain file should point to the `vcpkg.cmake` and the Qt5 dir to the `lib\cmake\Qt5` dir.
Examples for the paths are:
- - `C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake`
- - `C:\\Qt\\5.10.1\\msvc2017_64\\lib\\cmake\\Qt5`
-
-Now right click into the root nheko source directory and choose `Open in Visual Studio`.
-You can choose the build type Release and Debug in the top toolbar.
-After a successful CMake generation you can select the `nheko.exe` as the run target.
-Now choose `Build all` in the CMake menu or press `F7` to compile the executable.
-
+ - `C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake`
+ - `C:\\Qt\\5.10.1\\msvc2017_64\\lib\\cmake\\Qt5`
+
+Now right click into the root nheko source directory and choose `Open in Visual Studio`.
+You can choose the build type Release and Debug in the top toolbar.
+After a successful CMake generation you can select the `nheko.exe` as the run target.
+Now choose `Build all` in the CMake menu or press `F7` to compile the executable.
+
To be able to run the application the last step is to install the needed Qt dependencies next to the
nheko binary.
diff --git a/appveyor.yml b/appveyor.yml
index ec2af885..176c79df 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
---
-version: 0.6.2-{build}
+version: 0.6.3-{build}
configuration: Release
image: Visual Studio 2017
@@ -37,8 +37,8 @@ build_script:
# VERSION format: branch-master/branch-1.2
# INSTVERSION format: x.y.z
# WINVERSION format: 9999.0.0.123/1.2.0.234
- - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.6.2
- - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.6.2
+ - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.6.3
+ - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.6.3
- if "%APPVEYOR_REPO_TAG%"=="false" if "%APPVEYOR_REPO_BRANCH%"=="master" set INSTVERSION=9999.0
- if "%APPVEYOR_REPO_TAG%"=="false" set WINVERSION=%INSTVERSION%.0.%APPVEYOR_BUILD_NUMBER%
# VERSION format: v1.2.3/v1.3.4
@@ -110,9 +110,9 @@ after_build:
- copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\com.mujx.nheko.cleanup\meta
- copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\com.mujx.nheko.cleanup\meta
# Amend version and date
- - sed -i "s/__VERSION__/0.6.2/" installer\config\config.xml
- - sed -i "s/__VERSION__/0.6.2/" installer\packages\com.mujx.nheko\meta\package.xml
- - sed -i "s/__VERSION__/0.6.2/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
+ - sed -i "s/__VERSION__/0.6.3/" installer\config\config.xml
+ - sed -i "s/__VERSION__/0.6.3/" installer\packages\com.mujx.nheko\meta\package.xml
+ - sed -i "s/__VERSION__/0.6.3/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
- sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko\meta\package.xml
- sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
# Copy nheko data
diff --git a/deploy/installer/config.xml b/deploy/installer/config.xml
index 2cf7d99c..c56032dc 100644
--- a/deploy/installer/config.xml
+++ b/deploy/installer/config.xml
@@ -4,7 +4,7 @@
<Version>__VERSION__</Version>
<Title>Nheko Installer</Title>
<Publisher>Mujx</Publisher>
- <ProductUrl>https://github.com/mujx/nheko</ProductUrl>
+ <ProductUrl>https://github.com/Nheko-Reborn/nheko</ProductUrl>
<InstallerWindowIcon>nheko</InstallerWindowIcon>
<InstallerApplicationIcon>nheko</InstallerApplicationIcon>
<Logo>nheko.png</Logo>
diff --git a/resources/nheko.appdata.xml b/resources/nheko.appdata.xml
index 159eb40f..0a83bfe8 100644
--- a/resources/nheko.appdata.xml
+++ b/resources/nheko.appdata.xml
@@ -16,9 +16,10 @@
https://dl.dropboxusercontent.com/s/x638uft1fcnybv9/nheko-gnome.png</image>
</screenshot>
</screenshots>
- <url type="homepage">https://github.com/mujx/nheko</url>
- <update_contact>https://github.com/mujx</update_contact>
+ <url type="homepage">https://github.com/Nheko-Reborn/nheko</url>
+ <update_contact>https://github.com/Nheko-Reborn</update_contact>
<releases>
+ <release version="0.6.3" date="2019-02-08" />
<release version="0.6.2" date="2018-10-07" />
<release version="0.6.1" date="2018-09-26" />
<release version="0.6.0" date="2018-09-21" />