Skip to content

Commit

Permalink
Showing 7 changed files with 20 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .linux_bintray.json
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@
},

"version": {
"name": "2.3",
"name": "2.4",
"desc": "VNote Releases",
"released": "2019-03-04",
"vcs_tag": "2.3",
"released": "2019-04-05",
"vcs_tag": "2.4",
"gpgSign": false
},

6 changes: 3 additions & 3 deletions .macos_bintray.json
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@
},

"version": {
"name": "2.3",
"name": "2.4",
"desc": "VNote Releases",
"released": "2019-03-04",
"vcs_tag": "2.3",
"released": "2019-04-05",
"vcs_tag": "2.4",
"gpgSign": false
},

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -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.3"
- export version="2.4"

install:
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install p7zip-full ; fi
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image: Visual Studio 2015

version: 2.3.{build}
version: 2.4.{build}

branches:
only:
@@ -39,7 +39,7 @@ build_script:

# scripts that run after build
after_build:
- set vnote_version=2.3
- set vnote_version=2.4
# 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.3
version: 2.4
publish: true
override: true
artifact: portable
8 changes: 8 additions & 0 deletions changes.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# Changes History
## v2.4
- Bundle qt5ct in Linux for native look support;
- Use `Return` or `Enter` to confirm selection in macOS (besides `Cmd+O`);
- Support sync note list to current note automatically via config `global/sync_note_list_to_current_tab`;
- Add `Ctrl+E N` to view and edit current note's information;
- Fix Markdown highlighter to handle fenced code block without a leading empty line;
- Prompt for restart after changing theme;

## v2.3
- Add Japanese translations (thanks to @miurahr);
- Editor
2 changes: 1 addition & 1 deletion src/vconfigmanager.cpp
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ const QString VConfigManager::orgName = QString("vnote");

const QString VConfigManager::appName = QString("vnote");

const QString VConfigManager::c_version = QString("2.3");
const QString VConfigManager::c_version = QString("2.4");

const QString VConfigManager::c_dirConfigFile = QString("_vnote.json");

2 changes: 1 addition & 1 deletion src/vmainwindow.cpp
Original file line number Diff line number Diff line change
@@ -3456,7 +3456,7 @@ void VMainWindow::kickOffStartUpTimer(const QStringList &p_files)
m_editArea->openFile(file, OpenFileMode::Read);
}

if (g_config->versionChanged()) {
if (g_config->versionChanged() && !g_config->getAllowUserTrack()) {
// Ask user whether allow tracking.
int ret = VUtils::showMessage(QMessageBox::Information,
tr("Collect User Statistics"),

0 comments on commit 311ed25

Please sign in to comment.