From 4f0a2785da3c7764b3115a13b64e6e2dbfbd58e9 Mon Sep 17 00:00:00 2001
From: muxator <a.mux@inwind.it>
Date: Sat, 26 Jan 2019 00:16:03 +0100
Subject: [PATCH] release: prepare for 1.7.5

Written the changelog and updated package.json.
---
 CHANGELOG.md     | 17 +++++++++++++++++
 doc/skins.md     |  2 +-
 src/package.json |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc6688dc5..5f95accf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# 1.7.5
+* FEATURE: introduced support for multiple skins. See http://etherpad.org/doc/v1.7.5/#index_skins
+* FEATURE: added a new, optional skin. It can be activated choosing `skinName: "colibris"` in `settings.json`
+* FEATURE: allow file import using LibreOffice
+* SECURITY: updated many dependencies. No known high or moderate risk dependencies remain.
+* SECURITY: generate better random pad names
+* FIX: don't nuke all installed plugins if `npm install` fails
+* FIX: improved LibreOffice export
+* FIX: allow debug mode on node versions >= 6.3
+* MINOR: started making Etherpad less dependent on current working directory when running
+* MINOR: started simplifying the code structure, flattening complex conditions
+* MINOR: simplified a bit the startup scripts
+
+*UPGRADE NOTES*: if you have custom files in `src/static/custom`, save them
+somewhere else, revert the directory contents, update to Etherpad 1.7.5, and
+finally put them back in their new location, uder `src/static/skins/no-skin`.
+
 # 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
diff --git a/doc/skins.md b/doc/skins.md
index 1431dac8d..90a786f84 100644
--- a/doc/skins.md
+++ b/doc/skins.md
@@ -13,7 +13,7 @@ A skin is a directory located under `static/skins/<skin_name>`, with the followi
 
 You can choose a skin changing the parameter `skinName` in `settings.json`.
 
-Since Etherpad **1.8**, two skins are included:
+Since Etherpad **1.7.5**, two skins are included:
 
 * `no-skin`: an empty skin, leaving the default Etherpad appearance unchanged, that you can use as a guidance to develop your own.
 * `colibris`: a new, experimental skin, that will become the default in Etherpad 2.0.
diff --git a/src/package.json b/src/package.json
index 887ba1d30..1b9060942 100644
--- a/src/package.json
+++ b/src/package.json
@@ -83,6 +83,7 @@
   "scripts": {
     "test": "nyc mocha --timeout 5000 ../tests/backend/specs/api"
   },
-  "version": "1.7.0",
+  "version": "1.7.5",
   "license": "Apache-2.0"
 }
+