From de753706d17bac7e9c1d0224609e85741cbddf2c Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sat, 5 Sep 2020 10:52:38 +0800 Subject: [PATCH] release v2.10 --- .linux_bintray.json | 6 +++--- .macos_bintray.json | 6 +++--- .travis.yml | 2 +- appveyor.yml | 6 +++--- changes.md | 4 ++++ src/vconfigmanager.cpp | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.linux_bintray.json b/.linux_bintray.json index bd62d2fb..ab8358c4 100644 --- a/.linux_bintray.json +++ b/.linux_bintray.json @@ -16,10 +16,10 @@ }, "version": { - "name": "2.9.1", + "name": "2.10", "desc": "VNote Releases", - "released": "2020-04-12", - "vcs_tag": "2.9.1", + "released": "2020-09-05", + "vcs_tag": "2.10", "gpgSign": false }, diff --git a/.macos_bintray.json b/.macos_bintray.json index 16697c30..c460e449 100644 --- a/.macos_bintray.json +++ b/.macos_bintray.json @@ -16,10 +16,10 @@ }, "version": { - "name": "2.9.1", + "name": "2.10", "desc": "VNote Releases", - "released": "2020-04-12", - "vcs_tag": "2.9.1", + "released": "2020-09-05", + "vcs_tag": "2.10", "gpgSign": false }, diff --git a/.travis.yml b/.travis.yml index 5ccb0cdd..3c88f4b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ branches: before_install: - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo apt-get -qq update ; fi -- export version="2.9.1" +- export version="2.10" install: - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install p7zip-full ; fi diff --git a/appveyor.yml b/appveyor.yml index 2b92e498..f1ad78f6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ image: Visual Studio 2015 -version: 2.9.1.{build} +version: 2.10.{build} branches: only: @@ -39,7 +39,7 @@ build_script: # scripts that run after build after_build: - - set vnote_version=2.9.1 + - set vnote_version=2.10 # Clone OpenSSL DLLs - git clone https://github.com/tamlok/openssl-utils.git openssl-utils.git - mkdir distrib\VNote @@ -72,7 +72,7 @@ deploy: subject: tamlok repo: vnote package: vnote - version: 2.9.1 + version: 2.10 publish: true override: true artifact: portable diff --git a/changes.md b/changes.md index 50b4d655..377c7c5d 100644 --- a/changes.md +++ b/changes.md @@ -1,4 +1,8 @@ # Changes History +## v2.10 +- Add support for Git push/pull; (@musmus9405) +- Bug fixes; (@tootal, @hlyang1992) + ## v2.9.1 - Fix start issue on macOS (no need to add `-m` option); diff --git a/src/vconfigmanager.cpp b/src/vconfigmanager.cpp index cabc6a1e..785d5b39 100644 --- a/src/vconfigmanager.cpp +++ b/src/vconfigmanager.cpp @@ -20,7 +20,7 @@ const QString VConfigManager::orgName = QString("vnote"); const QString VConfigManager::appName = QString("vnote"); -const QString VConfigManager::c_version = QString("2.9.1"); +const QString VConfigManager::c_version = QString("2.10"); const QString VConfigManager::c_dirConfigFile = QString("_vnote.json");