From e23af7e43999b976129379ee8f995f95512050c3 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 26 Mar 2014 15:44:04 +0000
Subject: [PATCH] changelog, package file and fix for redo

---
 CHANGELOG.md                 | 28 ++++++++++++++++++++++++++++
 src/package.json             |  2 +-
 src/static/js/pad_editbar.js |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c156eb25..e5ae13bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+# 1.4
+ * NEW: Disable toolbar items through settings.json
+ * NEW: Internal stats/metrics engine
+ * NEW: Copy/Move Pad API functions
+ * NEW: getAttributeOnSelection method
+ * NEW: CSS function when an attribute is active on caret location
+ * NEW: Various new eejs blocks
+ * NEW: Ace afterEditHook
+ * NEW: Import hook to introduce alternative export methods
+ * NEW: preProcessDomLine allows Domline attributes to be processed before native attributes
+ * Fix: Allow for lighter author colors
+ * Fix: Improved randomness of session tokens
+ * Fix: Don't panic if an author2session/group2session no longer exists
+ * Fix: Gracefully fallback to related languages if chosen language is unavailable
+ * Fix: Various changeset/stability bugs
+ * Fix: Re-enable import buttons after failed import
+ * Fix: Allow browser tabs to be cycled when in editor
+ * Fix: Better Protocol detection
+ * Fix: padList API Fix
+ * Fix: Caret walking issue
+ * Fix: Better settings.json parsing
+ * Fix: Improved import/export handling
+ * Other: Various whitespace/code clean-up
+ * Other: .deb packaging creator
+ * Other: More API Documentation
+ * Other: Lots more translations
+ * Other: Support Node 0.11
+
 # 1.3
  * NEW: We now follow the semantic versioning scheme!
  * NEW: Option to disable IP logging
diff --git a/src/package.json b/src/package.json
index 1953ecf1..f47ec474 100644
--- a/src/package.json
+++ b/src/package.json
@@ -52,5 +52,5 @@
   "repository"     : { "type" : "git",
                        "url" : "http://github.com/ether/etherpad-lite.git"
                      },
-  "version"        : "1.3.0"
+  "version"        : "1.4.0"
 }
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 7892a085..c6dd9ed8 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -297,7 +297,7 @@ var padeditbar = (function()
       ace.ace_doUndoRedo(cmd);
     });
 
-    toolbar.registerAceCommand("redo", function (cmd) {
+    toolbar.registerAceCommand("redo", function (cmd, ace) {
       ace.ace_doUndoRedo(cmd);
     });