From 4408a1e5053977bb889fbda54f81a7967c1fc38f Mon Sep 17 00:00:00 2001
From: muxator <a.mux@inwind.it>
Date: Fri, 17 Aug 2018 00:18:31 +0200
Subject: [PATCH] release: prepare for 1.7.0

Written the changelog and updated package.json.

From now on, releases will be cut from develop, and merged directly into master.

Each release will be a tag on the master branch (e.g. 1.7.0).
A "release/1.7.0" branch will eventually be created only if/when a hotfix will
be needed.
---
 CHANGELOG.md     | 10 ++++++++++
 src/package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fb1035b4..fc6688dc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 1.7.0
+* FIX: `getLineHTMLForExport()` no longer produces multiple copies of a line. **WARNING**: this could potentially break some plugins
+* FIX: authorship of bullet points no longer changes when a second author edits them
+* FIX: improved Firefox compatibility (non printable keys)
+* FIX: `getPadPlainText()` was not working
+* REQUIREMENTS: minimum required Node version is 6.9.0 LTS. The next release will require at least Node 8.9.0 LTS
+* SECURITY: updated MySQL, Elasticsearch and PostgreSQL drivers
+* SECURITY: started updating deprecated code and packages
+* DOCS: documented --credentials, --apikey, --sessionkey. Better detailed contributors guidelines. Added a section on securing the installation
+
 # 1.6.6
  * FIX: line numbers are aligned with text again (broken in 1.6.4)
  * FIX: text entered between connection loss and reconnection was not saved
diff --git a/src/package.json b/src/package.json
index 6aeea6ca8..fcf5b97c0 100644
--- a/src/package.json
+++ b/src/package.json
@@ -79,6 +79,6 @@
   "scripts": {
     "test": "nyc mocha --timeout 5000 ../tests/backend/specs/api"
   },
-  "version": "1.6.6",
+  "version": "1.7.0",
   "license": "Apache-2.0"
 }