From 74bc2bd761342d7079140459b2b64390985ee8ae Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 12 Oct 2013 14:16:06 +0200 Subject: [PATCH 1/2] Prepare release --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ src/package.json | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d25d5b4406..80e89c51b76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,29 @@ +# 1.2.12 + * NEW: Add explanations for more disconnect scenarios + * NEW: export sessioninfos so plugins can access it + * NEW: pass pad in postAceInit hook + * NEW: Add trustProxy setting. ALlows to make ep use X-forwarded-for as remoteAddress + * NEW: userLeave hook (UNDOCUMENTED) + * NEW: Plural macro for translations + * NEW: backlinks to main page in Admin pages + * NEW: New translations from translatewiki.net + * SECURITY FIX: Filter author data sent to clients + * FIX: Never keep processing a changeset if it's corrupted + * FIX: Some client-side performance fixes for webkit browsers + * FIX: Only execute listAllPads query on demand (not on start-up) + * FIX: HTML import (don't crash on malformed or blank HTML input; strip title out of html during import) + * FIX: check if uploaded file only contains ascii chars when abiword disabled + * FIX: Plugin search in /admin/plugins + * FIX: API: fix createGroupFor endpoint, if mapped group is deleted + * FIX: Import form for other locales + * FIX: Don't stop processing changeset queue if there is an error + * FIX: Caret movement. Chrome detects blank rows line heights as incorrect + * FIX: allow colons in password + * FIX: Polish logging of client-side errors on the server + * FIX: Username url param + * FIX: Make start script POSIX ompatible + + # 1.2.11 * NEW: New Hook for outer_ace dynamic css manager and author style hook * NEW: Bump log4js for improved logging diff --git a/src/package.json b/src/package.json index 586720d4dfa..4cded19ab7b 100644 --- a/src/package.json +++ b/src/package.json @@ -50,5 +50,5 @@ "repository" : { "type" : "git", "url" : "http://github.com/ether/etherpad-lite.git" }, - "version" : "1.2.11" + "version" : "1.2.12" } From b9cc91e6add9b3cc0aa09c50fa62519390ccf34d Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 12 Oct 2013 20:35:23 +0200 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80e89c51b76..7cb09603473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ * FIX: HTML import (don't crash on malformed or blank HTML input; strip title out of html during import) * FIX: check if uploaded file only contains ascii chars when abiword disabled * FIX: Plugin search in /admin/plugins + * FIX: Don't create new pad if a non-existant read-only pad is accessed + * FIX: Drop messages from unknown connections (would lead to a crash after a restart) * FIX: API: fix createGroupFor endpoint, if mapped group is deleted * FIX: Import form for other locales * FIX: Don't stop processing changeset queue if there is an error