summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan <stefan@stefans-entwicklerecke.de>2015-03-15 15:27:35 +0100
committerStefan <stefan@stefans-entwicklerecke.de>2015-03-15 15:27:35 +0100
commit6c933a1296ac0a093090875dc68153e44c8fcf20 (patch)
treedfc3eb947a19d229b8109a15bbf6b1e2c07c18cb
parentd991dab8b2e1409646d0359c407f7b423a2d1f3e (diff)
parentb9cdf4352b957b9127b6404af8b0078cb3309f0b (diff)
downloadetherpad-lite-6c933a1296ac0a093090875dc68153e44c8fcf20.zip
Merge pull request #2553 from ether/master
Merge branch master back to develop
-rw-r--r--CHANGELOG.md11
1 files changed, 11 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75a9f327..bf27f292 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 1.5.2
+ * NEW: Support for node version 0.12.x
+ * NEW: API endpoint saveRevision, getSavedRevisionCount and listSavedRevisions
+ * NEW: setting to allow load testing
+ * Fix: Rare scroll issue
+ * Fix: Handling of custom pad path
+ * Fix: Better error handling of imports and exports of type "etherpad"
+ * Fix: Walking caret in chrome
+ * Fix: Better handling for changeset problems
+ * SECURITY Fix: Information leak for etherpad exports (CVE-2015-2298)
+
# 1.5.1
* NEW: High resolution Icon
* NEW: Use HTTPS for plugins.json download