mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-25 18:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change

Browse source
This commit is contained in:
John McLear 2014-11-28 17:43:01 +00:00
commit 3bf9f3cf1d
8 changed files with 654 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -450,6 +450,7 @@ exports.handle = function(apiVersion, functionName, fields, req, res)
if(fields["apikey"] != apikey.trim())
{
res.statusCode = 401;
res.send({code: 4, message: "no or wrong API Key", data: null});
return;
}

4
src/package.json
View file

@ -40,7 +40,9 @@
"swagger-node-express" : ">=2.1.0",
"channels" : "0.0.x",
"jsonminify" : "0.2.2",
"measured" : "0.1.3"
"measured" : "0.1.3",
"mocha" : ">=2.0.1",
"supertest" : ">=0.15.0"
},
"bin": { "etherpad-lite": "./node/server.js" },
"devDependencies": {

5
src/static/css/pad.css
View file

@ -1057,6 +1057,7 @@ input[type=checkbox] {
right:20px;
width:301px;
z-index:9999;
background-color:#666;
}
#gritter-notice-wrapper.bottom-right {
top: auto;
@ -1070,14 +1071,12 @@ input[type=checkbox] {
}
.gritter-top {
background:url(../../static/img/gritter.png) no-repeat left -30px;
height:10px;
}
.hover .gritter-top {
background-position:right -30px;
}
.gritter-bottom {
background:url(../../static/img/gritter.png) no-repeat left bottom;
height:8px;
margin:0;
}
@ -1086,7 +1085,6 @@ input[type=checkbox] {
}
.gritter-item {
display:block;
background:url(../../static/img/gritter.png) no-repeat left -40px;
color:#eee;
padding:2px 11px 8px 11px;
font-size: 11px;
@ -1104,7 +1102,6 @@ input[type=checkbox] {
position:absolute;
top:5px;
left:3px;
background:url('../../static/img/gritter.png') no-repeat left top;
cursor:pointer;
width:30px;
height:30px;

4
src/static/js/pad_editbar.js
View file

@ -183,7 +183,11 @@ var padeditbar = (function()
var editbarHeight = $('.menu_left').height() + 2 + "px";
var containerTop = $('.menu_left').height() + 7 + "px";
$('#editbar').css("height", editbarHeight);
$('#editorcontainer').css("top", containerTop);
if($('#options-stickychat').is(":checked")){
$('#chatbox').css("top", $('#editorcontainer').offset().top + "px");
};
},
registerDropdownCommand: function (cmd, dropdown) {
dropdown = dropdown || cmd;