mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

resolve merge conflict

Browse source
This commit is contained in:
John McLear 2013-01-27 17:54:26 +00:00
commit 3fac18f88a
22 changed files with 517 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/node/handler/APIHandler.js
View file

@ -174,13 +174,13 @@ var version =
, "listAllGroups" : []
, "checkToken" : []
}
, "1.2.2":
, "1.2.7":
{ "createGroup" : []
, "createGroupIfNotExistsFor" : ["groupMapper"]
, "deleteGroup" : ["groupID"]
, "listPads" : ["groupID"]
, "listAllPads" : []
, "createDiff" : ["padID", "startRev", "endRev"]
, "createDiff" : ["padID", "startRev", "endRev"]
, "createPad" : ["padID", "text"]
, "createGroupPad" : ["groupID", "padName", "text"]
, "createAuthor" : ["name"]
@ -210,6 +210,9 @@ var version =
, "sendClientsMessage" : ["padID", "msg"]
, "listAllGroups" : []
, "checkToken" : []
, "getChatHistory" : ["padID"]
, "getChatHistory" : ["padID", "start", "end"]
, "getChatHead" : ["padID"]
}
};