Skip to content

Merge branch master back to develop #2553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gared merged 2 commits into from
Mar 15, 2015
Merged

Merge branch master back to develop #2553

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0260bc
Add changelog for v1.5.2
Gared Mar 15, 2015
b9cdf43
Merge pull request #2552 from ether/release/1.5.2
Gared Mar 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down