Merge branch '2.3.x' into devel

This commit is contained in:
Naomi 2013-02-15 17:05:36 -05:00
commit 542553bbc1
18 changed files with 303 additions and 13049 deletions

View file

@ -93,6 +93,8 @@ function checkCalendarSCUploadStatus(){
else if (json.sc_id == "-3") {
span.removeClass("progress").addClass("sc-error");
}
setTimeout(checkCalendarSCUploadStatus, 5000);
}
function checkSCUploadStatusRequest() {
@ -328,7 +330,7 @@ function alertShowErrorAndReload(){
}
$(document).ready(function() {
setInterval(checkCalendarSCUploadStatus, 5000);
checkCalendarSCUploadStatus();
$.contextMenu({
selector: 'div.fc-event',