From 54511a6ceaf8889441fdb0ef4482c9ca2e47f212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Tue, 22 May 2012 09:27:08 +0200
Subject: [PATCH 1/8] fix #722 by better argument checking in
 PadMessageHandler.js

---
 node/handler/PadMessageHandler.js | 39 +++++++++++++++----------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/node/handler/PadMessageHandler.js b/node/handler/PadMessageHandler.js
index 48f0aa98..135b4b63 100644
--- a/node/handler/PadMessageHandler.js
+++ b/node/handler/PadMessageHandler.js
@@ -170,26 +170,25 @@ exports.handleMessage = function(client, message)
   {
     handleClientReady(client, message);
   }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "USER_CHANGES")
-  {
-    handleUserChanges(client, message);
-  }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "USERINFO_UPDATE")
-  {
-    handleUserInfoUpdate(client, message);
-  }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "CHAT_MESSAGE")
-  {
-    handleChatMessage(client, message);
-  }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "CLIENT_MESSAGE" &&
-          message.data.payload.type == "suggestUserName")
-  {
-    handleSuggestUserName(client, message);
+  else if(message.type == "COLLABROOM" && typeof message.data == 'object'){
+    if (message.data.type == "USER_CHANGES")
+    {
+      handleUserChanges(client, message);
+    }
+    else if (message.data.type == "USERINFO_UPDATE")
+    {
+      handleUserInfoUpdate(client, message);
+    }
+    else if(message.data.type == "CHAT_MESSAGE")
+    {
+      handleChatMessage(client, message);
+    }
+    else if(message.data.type == "CLIENT_MESSAGE" &&
+            typeof message.data.payload == 'object' &&
+            message.data.payload.type == "suggestUserName")
+    {
+      handleSuggestUserName(client, message);
+    }
   }
   //if the message type is unknown, throw an exception
   else

From afb868fd2b4e28b7ae8edefb5c40e7854fb297cb Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 30 May 2012 00:20:03 +0200
Subject: [PATCH 2/8] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f53fa3b9..5810ed25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v1.1
+* Introduced Plugin framework
+* Many bugfixes
+* Faster page loading
+* Various UI polishes
+* Saved Revisions
+* Read only Real time view
+* More API functionality
+
 # v 1.0.1
 
 * Updated MySQL driver, this fixes some problems with mysql

From e23da5127b2d279124a3783255cc8099439856f4 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 30 May 2012 23:59:06 +0200
Subject: [PATCH 3/8] No longer need bin/installDeps.sh

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2a30b970..6cdb623f 100644
--- a/README.md
+++ b/README.md
@@ -72,9 +72,8 @@ Here is the **[FAQ](https://github.com/Pita/etherpad-lite/wiki/FAQ)**
 **As any user (we recommend creating a separate user called etherpad-lite):**
 
 <ol start="3">
-  <li>Move to a folder where you want to install Etherpad Lite. Clone the git repository <code>git clone 'git://github.com/Pita/etherpad-lite.git'</code><br>&nbsp;</li>
-  <li>Change into the directory containing the Etherpad Lite source code clone with <code>cd etherpad-lite</code><br> </li>
-  <li>Install the dependencies with <code>bin/installDeps.sh</code><br>&nbsp;</li>
+  <li>Move to a folder where you want to install Etherpad Lite. Clone the git repository <code>git clone 'git://github.com/Pita/etherpad-lite.git'</code><br></li>
+  <li>Change into the directory containing the Etherpad Lite source code clone with <code>cd etherpad-lite</code><br></li>
   <li>Start it with <code>bin/run.sh</code><br>&nbsp;</li>
   <li>Open your web browser and visit <a href="http://localhost:9001">http://localhost:9001</a>. You like it? Look at the 'Next Steps' section below</li>
 </ol>

From ae179ba01ddba0b717c71aab232ecff3337a9b2d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 7 Jun 2012 10:58:29 -0700
Subject: [PATCH 4/8] Fix pad.js' customStart.

Appears that sourcing of static/custom/pad.js was removed from
templates/pad.html. This prevented static/custom/pad.js:customStart
from running. Add it back to get customStart working again.
---
 src/templates/pad.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index daca671e..1f9526ea 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -319,6 +319,8 @@
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script>
 
+        <script type="text/javascript" src="../static/custom/pad.js"></script>
+
         <!-- Bootstrap page -->
         <script type="text/javascript">
             var clientVars = {};

From 6653a3b6f09a6a1ea33c5b23315f9ebf3b60e431 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Sat, 9 Jun 2012 11:32:05 -0400
Subject: [PATCH 5/8] Bugfix to setPadHTML. resolves #764

---
 src/node/utils/ImportHtml.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js
index 4b50b032..5c6bb634 100644
--- a/src/node/utils/ImportHtml.js
+++ b/src/node/utils/ImportHtml.js
@@ -50,9 +50,7 @@ function setPadHTML(pad, html, callback)
   }
 
   // Get the new plain text and its attributes
-  var newText = map(result.lines, function (e) {
-    return e + '\n';
-  }).join('');
+  var newText = result.lines.join('\n');
   apiLogger.debug('newText:');
   apiLogger.debug(newText);
   var newAttribs = result.lineAttribs.join('|1+1') + '|1+1';

From b118903f4e76d9ee086f44a59601e9d71c264fa6 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Mon, 11 Jun 2012 23:34:28 -0400
Subject: [PATCH 6/8] Bugfix to setHTML - it was ignoring the last letter of
 each line. fixes issue #768

---
 src/node/utils/ImportHtml.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js
index 5c6bb634..7c638fb8 100644
--- a/src/node/utils/ImportHtml.js
+++ b/src/node/utils/ImportHtml.js
@@ -20,7 +20,6 @@ var log4js = require('log4js');
 
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var contentcollector = require("ep_etherpad-lite/static/js/contentcollector");
-var map = require("ep_etherpad-lite/static/js/ace2_common").map;
 
 function setPadHTML(pad, html, callback)
 {
@@ -60,7 +59,7 @@ function setPadHTML(pad, html, callback)
     var attribsIter = Changeset.opIterator(attribs);
     var textIndex = 0;
     var newTextStart = 0;
-    var newTextEnd = newText.length - 1;
+    var newTextEnd = newText.length;
     while (attribsIter.hasNext())
     {
       var op = attribsIter.next();

From e0540122fef772860423ccc31d88381ff5160414 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Tue, 12 Jun 2012 10:59:11 -0400
Subject: [PATCH 7/8] Lock down npm version to avaoid bug in later version

---
 src/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/package.json b/src/package.json
index c46abbbf..48750fbc 100644
--- a/src/package.json
+++ b/src/package.json
@@ -25,7 +25,7 @@
                       "log4js"              : "0.4.1",
                       "jsdom-nocontextifiy" : "0.2.10",
                       "async-stacktrace"    : "0.0.2",
-                      "npm"                 : "1.1",
+                      "npm"                 : "1.1.24",
                       "ejs"                 : "0.6.1",
                       "graceful-fs"         : "1.1.5",
                       "slide"               : "1.1.3",

From 08a00af6171b9bae0365d8d9a9fdf7d7bf5b605a Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Wed, 13 Jun 2012 15:48:58 -0400
Subject: [PATCH 8/8] The pad name sanitizer shouldn't drop query params. issue
 #779

---
 src/node/hooks/express/padurlsanitize.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/node/hooks/express/padurlsanitize.js b/src/node/hooks/express/padurlsanitize.js
index 4f5dd7a5..957da42a 100644
--- a/src/node/hooks/express/padurlsanitize.js
+++ b/src/node/hooks/express/padurlsanitize.js
@@ -1,4 +1,5 @@
 var padManager = require('../../db/PadManager');
+var url = require('url');
 
 exports.expressCreateServer = function (hook_name, args, cb) {
   //redirects browser to the pad's sanitized url if needed. otherwise, renders the html
@@ -14,9 +15,11 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 	//the pad id was sanitized, so we redirect to the sanitized version
 	if(sanitizedPadId != padId)
 	{
-	  var real_path = req.path.replace(/^\/p\/[^\/]+/, '/p/' + sanitizedPadId);
-	  res.header('Location', real_path);
-	  res.send('You should be redirected to <a href="' + real_path + '">' + real_path + '</a>', 302);
+          var real_url = req.url.replace(/^\/p\/[^\/]+/, '/p/' + sanitizedPadId);
+          var query = url.parse(req.url).query;
+          if ( query ) real_url += '?' + query;
+          res.header('Location', real_url);
+          res.send('You should be redirected to <a href="' + real_url + '">' + real_url + '</a>', 302);
 	}
 	//the pad id was fine, so just render it
 	else