From b681359dfaebffb2e0c497858e56446e37c07109 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 27 Dec 2012 20:09:14 +0000
Subject: [PATCH 1/2] bump version # in package and update CHANGELOG

---
 CHANGELOG.md     | 19 +++++++++++++++++++
 src/package.json |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2f7586f8..31cd7756d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# 1.2.2
+ * More translations and better language support.  See https://translatewiki.net/wiki/Translating:Etherpad_lite for more details
+ * Add a checkToken Method to the API
+ * Bugfix for Internal Caching issue that was causing some 404s on images.
+ * Bugfix for IE Import
+ * Bugfix for Node 0.6 compatibility
+ * Bugfix for multiple cookie support
+ * Bugfix for API when requireAuth is enabled.
+ * Plugin page now shows plugin version #
+ * Show color of Author in Chat messages
+ * Allow plugin search by description
+ * Allow for different socket IO transports
+ * Allow for custom favicon path
+ * Control S now does Create new Revision functionality
+ * Focus on password when required
+ * Frontend Timeslider test
+ * Allow for basic HTML etc. import without abiword
+ * Native HTTPS support
+
 # 1.2.1
  * Allow ! in urls inside the editor (Not Pad urls)
  * Allow comments in language files
diff --git a/src/package.json b/src/package.json
index d2b03a97a..02073ea1b 100644
--- a/src/package.json
+++ b/src/package.json
@@ -46,5 +46,5 @@
   "engines"        : { "node" : ">=0.6.0",
                        "npm"  : ">=1.0"
                      }, 
-  "version"        : "1.2.1"
+  "version"        : "1.2.2"
 }

From ffc9bcf028e4af5bceb3b3e9123d305d02b193f4 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 27 Dec 2012 22:09:22 +0100
Subject: [PATCH 2/2] Bump API version for checkToken endpoint

---
 doc/api/http_api.md            |  7 +++++--
 src/node/handler/APIHandler.js | 35 +++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/doc/api/http_api.md b/doc/api/http_api.md
index e73109b01..8ce50081e 100644
--- a/doc/api/http_api.md
+++ b/doc/api/http_api.md
@@ -60,9 +60,12 @@ Portal submits content into new blog post
 
 ## Usage
 
+### API version
+The latest version is `1.2`
+
 ### Request Format
 
-The API is accessible via HTTP. HTTP Requests are in the format /api/$APIVERSION/$FUNCTIONNAME. Parameters are transmitted via HTTP GET. $APIVERSION depends on the endpoints you want to use. The latest version is `1.1`
+The API is accessible via HTTP. HTTP Requests are in the format /api/$APIVERSION/$FUNCTIONNAME. Parameters are transmitted via HTTP GET. $APIVERSION depends on the endpoints you want to use.
 
 ### Response Format
 Responses are valid JSON in the following format:
@@ -409,7 +412,7 @@ sends a custom message of type `msg` to the pad
   * `{code: 1, message:"padID does not exist", data: null}`
 
 #### checkToken()
- * API >= 1
+ * API >= 1.2
 
 returns ok when api token is valid
 
diff --git a/src/node/handler/APIHandler.js b/src/node/handler/APIHandler.js
index 198ec97b3..0bcd5f0c9 100644
--- a/src/node/handler/APIHandler.js
+++ b/src/node/handler/APIHandler.js
@@ -68,9 +68,42 @@ var version =
   , "isPasswordProtected"       : ["padID"]
   , "listAuthorsOfPad"          : ["padID"]
   , "padUsersCount"             : ["padID"]
-  , "checkToken"                : []
   }
 , "1.1":
+  { "createGroup"               : []
+  , "createGroupIfNotExistsFor" : ["groupMapper"]
+  , "deleteGroup"               : ["groupID"]
+  , "listPads"                  : ["groupID"]
+  , "createPad"                 : ["padID", "text"]
+  , "createGroupPad"            : ["groupID", "padName", "text"]
+  , "createAuthor"              : ["name"]
+  , "createAuthorIfNotExistsFor": ["authorMapper" , "name"]
+  , "listPadsOfAuthor"          : ["authorID"]
+  , "createSession"             : ["groupID", "authorID", "validUntil"]
+  , "deleteSession"             : ["sessionID"]
+  , "getSessionInfo"            : ["sessionID"]
+  , "listSessionsOfGroup"       : ["groupID"]
+  , "listSessionsOfAuthor"      : ["authorID"]
+  , "getText"                   : ["padID", "rev"]
+  , "setText"                   : ["padID", "text"]
+  , "getHTML"                   : ["padID", "rev"]
+  , "setHTML"                   : ["padID", "html"]
+  , "getRevisionsCount"         : ["padID"]
+  , "getLastEdited"             : ["padID"]
+  , "deletePad"                 : ["padID"]
+  , "getReadOnlyID"             : ["padID"]
+  , "setPublicStatus"           : ["padID", "publicStatus"]
+  , "getPublicStatus"           : ["padID"]
+  , "setPassword"               : ["padID", "password"]
+  , "isPasswordProtected"       : ["padID"]
+  , "listAuthorsOfPad"          : ["padID"]
+  , "padUsersCount"             : ["padID"]
+  , "getAuthorName"             : ["authorID"]
+  , "padUsers"                  : ["padID"]
+  , "sendClientsMessage"        : ["padID", "msg"]
+  , "listAllGroups"             : []
+  }
+, "1.2":
   { "createGroup"               : []
   , "createGroupIfNotExistsFor" : ["groupMapper"]
   , "deleteGroup"               : ["groupID"]