Allow alarms to be snoozed for 1 day

pull/56/head
Francis Lachapelle 2014-09-11 11:55:20 -04:00
parent 38cb86bdb1
commit ed85a09ff0
3 changed files with 17 additions and 4 deletions

12
NEWS
View File

@ -1,3 +1,15 @@
2.2.9 (YYYY-MM-DD)
------------------
New features
-
Enchancements
- alarms can now be snoozed for 1 day
Bug fixes
-
2.2.8 (2014-09-10) 2.2.8 (2014-09-10)
------------------ ------------------

View File

@ -1,7 +1,6 @@
/* generic.js - this file is part of SOGo /* generic.js - this file is part of SOGo
Copyright (C) 2005 SKYRIX Software AG Copyright (C) 2006-2014 Inverse
Copyright (C) 2006-2012 Inverse
SOGo is free software; you can redistribute it and/or modify it under SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the the terms of the GNU Lesser General Public License as published by the
@ -1484,7 +1483,9 @@ function showAlarmCallback(http) {
'15': _('15 minutes'), '15': _('15 minutes'),
'30': _('30 minutes'), '30': _('30 minutes'),
'45': _('45 minutes'), '45': _('45 minutes'),
'60': _('1 hour') }, _('OK'), '60': _('1 hour'),
'1440': _('1 day') },
_('OK'),
snoozeAlarm, url, snoozeAlarm, url,
'10'); '10');
} }

View File

@ -4,4 +4,4 @@
MAJOR_VERSION=2 MAJOR_VERSION=2
MINOR_VERSION=2 MINOR_VERSION=2
SUBMINOR_VERSION=8 SUBMINOR_VERSION=9