release v2.6

vnotex · May 31, 2019 · ae3f764 · ae3f764
1 parent 72748bb
commit ae3f764
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 11 deletions.
diff --git a/.linux_bintray.json b/.linux_bintray.json
@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "2.5",
+        "name": "2.6",
         "desc": "VNote Releases",
-        "released": "2019-05-11",
-        "vcs_tag": "2.5",
+        "released": "2019-05-31",
+        "vcs_tag": "2.6",
         "gpgSign": false
     },
 

diff --git a/.macos_bintray.json b/.macos_bintray.json
@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "2.5",
+        "name": "2.6",
         "desc": "VNote Releases",
-        "released": "2019-05-11",
-        "vcs_tag": "2.5",
+        "released": "2019-05-31",
+        "vcs_tag": "2.6",
         "gpgSign": false
     },
 

diff --git 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.5"
+- export version="2.6"
 
 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/README.md b/README.md
@@ -61,6 +61,9 @@ makepkg -sic
 
 There is also a development version that tracks the latest master [vnote-git](https://aur.archlinux.org/packages/vnote-git/).
 
+### NixOS
+Thank @kuznero for packaging VNote in NixOS. It should be available in `unstable` and `unstable-small` channels.
+
 ## MacOS
 [![Build Status](https://travis-ci.org/tamlok/vnote.svg?branch=master)](https://travis-ci.org/tamlok/vnote)
 

diff --git a/README_ja.md b/README_ja.md
@@ -61,6 +61,9 @@ makepkg -sic
 
 また、最新のマスター[vnote git](https://aur.archlinux.org/packages/vnote-git/)を追跡する開発バージョンもあります。
 
+### NixOS
+Thank @kuznero for packaging VNote in NixOS. It should be available in `unstable` and `unstable-small` channels.
+
 ## MacOS
 [![Build Status](https://travis-ci.org/tamlok/vnote.svg?branch=master)](https://travis-ci.org/tamlok/vnote)
 

diff --git a/README_zh.md b/README_zh.md
@@ -73,6 +73,11 @@ AUR也提供一个和最新master分支同步的开发版本 [vnote-git](https:/
 brew cask install vnote
 ```
 
+### NixOS
+@kuznero packaged VNote in NixOS. It should be available in `unstable` and `unstable-small` channels.
+
+感谢 @kuznero 在NixOS上打包VNote。可以在`unstable`和`unstable-small`频道中找到VNote。
+
 # 简介
 
 **VNote**是一个基于Qt框架的、免费的开源笔记软件。VNote专注于Markdown的编辑与阅读，以提供舒适的编辑体验为设计目标。

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 image: Visual Studio 2015
 
-version: 2.5.{build}
+version: 2.6.{build}
 
 branches:
     only:
@@ -39,7 +39,7 @@ build_script:
 
 # scripts that run after build
 after_build:
-    - set vnote_version=2.5
+    - set vnote_version=2.6
     # 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.5
+      version: 2.6
       publish: true
       override: true
       artifact: portable
diff --git a/changes.md b/changes.md
@@ -1,4 +1,7 @@
 # Changes History
+## v2.6
+- Version-specific user track;
+
 ## v2.5
 - Do not open unknown type file when creating a new note;
 - Support Right-To-Left text in edit mode (with Vim mode disabled);

diff --git 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.5");
+const QString VConfigManager::c_version = QString("2.6");
 
 const QString VConfigManager::c_dirConfigFile = QString("_vnote.json");