summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan <stefan@stefans-entwicklerecke.de>2018-02-03 13:01:24 +0100
committerGitHub <noreply@github.com>2018-02-03 13:01:24 +0100
commit0c9475e366622e784737f6bdaec14c00bd0765d7 (patch)
tree6a7bc87024e315846f8ae66d3da42968d9f9dd13
parentb292e137ed3360a360ef084044debd3454ebf53c (diff)
parent1e25e7fc773eb360b2fed52c39c3a14bc2a443ff (diff)
downloadetherpad-lite-0c9475e366622e784737f6bdaec14c00bd0765d7.zip
Merge pull request #3316 from ether/release/1.6.3
Release version 1.6.3
-rw-r--r--CHANGELOG.md8
-rw-r--r--src/package.json2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a96b9b3c..74d06f45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 1.6.3
+ * SECURITY: Update ejs
+ * SECURITY: xss vulnerability when reading window.location.href
+ * SECURITY: sanitize jsonp
+ * NEW: Catch SIGTERM for graceful shutdown
+ * NEW: Show actual applied text formatting for caret position
+ * NEW: Add settings to improve scrolling of viewport on line changes
+
# 1.6.2
* NEW: Added pad shortcut disabling feature
* NEW: Create option to automatically reconnect after a few seconds
diff --git a/src/package.json b/src/package.json
index 8f083890..a29c06e5 100644
--- a/src/package.json
+++ b/src/package.json
@@ -56,6 +56,6 @@
"repository" : { "type" : "git",
"url" : "http://github.com/ether/etherpad-lite.git"
},
- "version" : "1.6.2",
+ "version" : "1.6.3",
"license" : "Apache-2.0"
}