merge of 'a116eb415302838655699ddf23cdf5a3930aef29'

and 'a7e7282f1911ceaff2a7f4f96320407cba1085cc'

Monotone-Parent: a116eb415302838655699ddf23cdf5a3930aef29
Monotone-Parent: a7e7282f1911ceaff2a7f4f96320407cba1085cc
Monotone-Revision: d4ca3a4c3a9c4a3555eeb728fdf776d6f9615287

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-10-03T19:33:37
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-10-03 19:33:37 +00:00
11 changed files with 234 additions and 34 deletions
+17
View File
@@ -1,3 +1,20 @@
2011-10-03 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/generic.js (snoozeAlarm): new function to
snooze an alarm for a specific number of minutes.
(showAlarmCallback): offer the user to snooze the alarm right
after triggering the browser-native alert.
(showSelectDialog): new function that construct a dialog box with
a popup menu.
* UI/Scheduler/UIxAppointmentEditor.m (-viewAction): accepts the
new form parameter snoozeAlarm, which delays the alarm to the
specified number of minutes.
* SoObjects/Appointments/SOGoCalendarComponent.m (-snoozeAlarm:):
new method to set the next alarm of the event in a specified
number of minutes. Only affect the quick table, not the original vCalendar.
2011-10-03 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentObject.m (-PUTAction:)