amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-14 01:38:51 +00:00
Code Issues Projects Releases Wiki Activity

merge of '29dc700a0a33827e16bd46a8d97f89d5f11630e9'

Browse Source 
and 'b539ed81e839a831ce07b7618690feb8ac799176'

Monotone-Parent: 29dc700a0a33827e16bd46a8d97f89d5f11630e9
Monotone-Parent: b539ed81e839a831ce07b7618690feb8ac799176
Monotone-Revision: a322b26bc82b5d04dfdd3997d676eec971639aec

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-05-05T18:52:51
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-05-05 18:52:51 +00:00
parent 83831abaaa 1a54a38194
commit cb8c1f6522
61 changed files with 1150 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UI/WebServerResources/SchedulerUI.js
View File

@@ -25,7 +25,7 @@ var calendarEvents = null;
var preventAutoScroll = false;
var userStates = [ "needs-action", "accepted", "declined", "tentative" ];
var userStates = [ "needs-action", "accepted", "declined", "tentative", "delegated" ];
var calendarHeaderAdjusted = false;
@@ -297,7 +297,7 @@ function closeInvitationWindow() {
function modifyEventCallback(http) {
if (http.readyState == 4) {
if (http.status == 200) {
if (isHttpStatus204(http.status) || http.status == 200) {
var mailInvitation = queryParameters["mail-invitation"];
if (mailInvitation && mailInvitation.toLowerCase() == "yes")
closeInvitationWindow();