libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'release/releases-1.2.6'

Browse source
This commit is contained in:
John McLear 2013-01-20 13:46:07 +00:00
commit 6b13bfa1e8
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
# 1.2.6
* Fix: Package file UeberDB reference
* New #users EEJS block for plugins
# 1.2.5
* Create timeslider EEJS blocks for plugins
* Allow for "more messages" to be loaded in chat

2
src/node/db/API.js
View file

@ -46,7 +46,7 @@ exports.createGroupPad = groupManager.createGroupPad;
/**PADLIST FUNCTION****/
/**********************/
exports.listAllPads = padManager.getPads;
exports.listAllPads = padManager.listAllPads;
/**********************/
/**AUTHOR FUNCTIONS****/

6
src/node/db/PadManager.js
View file

@ -158,12 +158,12 @@ exports.getPad = function(id, text, callback)
}
}
exports.getPads = function(callback)
exports.listAllPads = function(callback)
{
if(callback != null){
callback(null,padList.getPads());
callback(null,{padIDs: padList.getPads()});
}else{
return padList.getPads();
return {padIDs: padList.getPads()};
}
}

4
src/package.json
View file

@ -16,7 +16,7 @@
"require-kernel" : "1.0.5",
"resolve" : "0.2.x",
"socket.io" : "0.9.x",
"ueberDB" : "0.1.x",
"ueberDB" : "0.1.9",
"async" : "0.1.x",
"express" : "3.x",
"connect" : "2.4.x",
@ -46,5 +46,5 @@
"engines" : { "node" : ">=0.6.0",
"npm" : ">=1.0"
},
"version" : "1.2.5"
"version" : "1.2.6"
}

2
src/templates/pad.html
View file

@ -153,6 +153,7 @@
</div>
<div id="users">
<% e.begin_block("userlist"); %>
<div id="connectionstatus"></div>
<div id="myuser">
<div id="mycolorpicker">
@ -173,6 +174,7 @@
<div id="nootherusers"></div>
</div>
<div id="userlistbuttonarea"></div>
<% e.end_block(); %>
</div>
<div id="editorcontainerbox">