Merge remote-tracking branch 'origin/dev'

agateau · May 11, 2019 · 74664b8 · 74664b8
2 parents a9e60fd + 9b0918b
commit 74664b8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ services:
 - docker
 
 install:
-- ci/build-docker
+- ci/build-docker-image
 
 script:
-- docker run -v $PWD:/root/nanonote nanonote:1 /root/nanonote/ci/build-app
+- ci/docker-build-app
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.2.0 - 2019-05-11
+
+### Added
+- New German translation by Vinzenz Vietzke
+- Allow changing the font size using Ctrl + mouse wheel (Daniel Laidig)
+- Use the link color of the color theme instead of an hardcoded blue (Daniel Laidig)
+- Added a way to reset the font size to the default value (Daniel Laidig)
+
+### Fixed
+- Added explanation of how to open URLs to the welcome text (Robert Barat)
+- Allow '@' in URLs (Aurelien Gateau)
+- Use QSaveFile for safer saving (Aurelien Gateau)
+
 ## 1.1.0 - 2019-02-04
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 project(nanonote
-    VERSION 1.1.0
+    VERSION 1.2.0
     DESCRIPTION "Minimalist note taking application for short-lived notes"
 )
 

diff --git a/RELEASE_CHECK_LIST.md b/RELEASE_CHECK_LIST.md
@@ -2,6 +2,7 @@ Check working tree is up to date and clean:
 
     git checkout dev
     git pull
+    git merge origin/master
     git status
 
 Update CHANGELOG.md:
@@ -14,12 +15,13 @@ Commit and push
 
 Build packages:
 
-    docker run -v $PWD:/root/nanonote nanonote:1 /root/nanonote/ci/build-app
+    ci/docker-build-app
 
 Smoke test binary packages
 
 - Test welcome text is OK
 - Test screenshot matches
+- Test translations are complete
 
 Merge dev in master:
 

diff --git a/ci/build-docker → ci/build-docker-image b/ci/build-docker → ci/build-docker-image
diff --git a/ci/docker-build-app b/ci/docker-build-app
@@ -0,0 +1,2 @@
+#!/bin/sh
+docker run -v $PWD:/root/nanonote nanonote:1 /root/nanonote/ci/build-app
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/sh
		docker run -v $PWD:/root/nanonote nanonote:1 /root/nanonote/ci/build-app