See ChangeLog.
Monotone-Parent: 6bb1bd2b9a63daae8f56da56b2ba72ac8bad2d3e Monotone-Revision: bc6a066b0ed99cc7226c2f6c089a4ed6987ee423 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-09-23T19:25:56 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
a0112fdbf8
commit
0c2d6ddc3e
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
||||||
|
2011-09-23 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
|
* UI/PreferencesUI/UIxPreferences.m (-defaultCalendarList, -itemCalendarText,
|
||||||
|
-userDefaultCalendar, -setUserDefaultCalendar:): new methods to
|
||||||
|
show a popup menu for the new defaults SOGoDefaultCalendar. This
|
||||||
|
option sets which calendar is used when creating an event or a
|
||||||
|
task (selected, personal, first enabled).
|
||||||
|
|
||||||
|
* UI/WebServerResources/SchedulerUI.js (eventsListCallback):
|
||||||
|
events are always editable and erasable for superusers.
|
||||||
|
(newEvent): added supported for the new defaults SOGoDefaultCalendar.
|
||||||
|
|
||||||
2011-09-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2011-09-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* OpenChange/MAPIStoreMailFolder.m (-lastMessageModificationTime):
|
* OpenChange/MAPIStoreMailFolder.m (-lastMessageModificationTime):
|
||||||
|
|
5
NEWS
5
NEWS
|
@ -1,10 +1,11 @@
|
||||||
1.3-2011MMDD (1.3.9)
|
1.3-2011MMDD (1.3.9)
|
||||||
---------------------
|
---------------------
|
||||||
New Features
|
New Features
|
||||||
-
|
- new user defaults SOGoDefaultCalendar to specify which calendar is used when
|
||||||
|
creating an event or a task (selected, personal, first enabled).
|
||||||
|
|
||||||
Enhancements
|
Enhancements
|
||||||
- phone numbers in the contacts web module are now links (tel://).
|
- phone numbers in the contacts web module are now links (tel:).
|
||||||
|
|
||||||
Bug Fixes
|
Bug Fixes
|
||||||
-
|
-
|
||||||
|
|
|
@ -92,6 +92,12 @@
|
||||||
"firstWeekOfYear_First4DayWeek" = "Primeira semana com 4 dias";
|
"firstWeekOfYear_First4DayWeek" = "Primeira semana com 4 dias";
|
||||||
"firstWeekOfYear_FirstFullWeek" = "Primeira semana com 5 dias";
|
"firstWeekOfYear_FirstFullWeek" = "Primeira semana com 5 dias";
|
||||||
|
|
||||||
|
/* Default Calendar */
|
||||||
|
"Default calendar :" = "Default calendar";
|
||||||
|
"selectedCalendar" = "Selected calendar";
|
||||||
|
"personalCalendar" = "Personal calendar";
|
||||||
|
"firstCalendar" = "First enabled calendar";
|
||||||
|
|
||||||
"reminderTime_0000" = "0 minutos";
|
"reminderTime_0000" = "0 minutos";
|
||||||
"reminderTime_0005" = "5 minutos";
|
"reminderTime_0005" = "5 minutos";
|
||||||
"reminderTime_0010" = "10 minutos";
|
"reminderTime_0010" = "10 minutos";
|
||||||
|
|
|
@ -92,6 +92,12 @@
|
||||||
"firstWeekOfYear_First4DayWeek" = "First 4-day week";
|
"firstWeekOfYear_First4DayWeek" = "First 4-day week";
|
||||||
"firstWeekOfYear_FirstFullWeek" = "First full week";
|
"firstWeekOfYear_FirstFullWeek" = "First full week";
|
||||||
|
|
||||||
|
/* Default Calendar */
|
||||||
|
"Default calendar :" = "Default calendar";
|
||||||
|
"selectedCalendar" = "Selected calendar";
|
||||||
|
"personalCalendar" = "Personal calendar";
|
||||||
|
"firstCalendar" = "First enabled calendar";
|
||||||
|
|
||||||
"reminderTime_0000" = "0 minutes";
|
"reminderTime_0000" = "0 minutes";
|
||||||
"reminderTime_0005" = "5 minutes";
|
"reminderTime_0005" = "5 minutes";
|
||||||
"reminderTime_0010" = "10 minutes";
|
"reminderTime_0010" = "10 minutes";
|
||||||
|
|
|
@ -92,6 +92,12 @@
|
||||||
"firstWeekOfYear_First4DayWeek" = "Első 4 napos héttől";
|
"firstWeekOfYear_First4DayWeek" = "Első 4 napos héttől";
|
||||||
"firstWeekOfYear_FirstFullWeek" = "Első teljes héttől";
|
"firstWeekOfYear_FirstFullWeek" = "Első teljes héttől";
|
||||||
|
|
||||||
|
/* Default Calendar */
|
||||||
|
"Default calendar :" = "Default calendar";
|
||||||
|
"selectedCalendar" = "Selected calendar";
|
||||||
|
"personalCalendar" = "Personal calendar";
|
||||||
|
"firstCalendar" = "First enabled calendar";
|
||||||
|
|
||||||
"reminderTime_0000" = "0 perc";
|
"reminderTime_0000" = "0 perc";
|
||||||
"reminderTime_0005" = "5 perc";
|
"reminderTime_0005" = "5 perc";
|
||||||
"reminderTime_0010" = "10 perc";
|
"reminderTime_0010" = "10 perc";
|
||||||
|
|
|
@ -92,6 +92,12 @@
|
||||||
"firstWeekOfYear_First4DayWeek" = "Første 4-dagersuken i året";
|
"firstWeekOfYear_First4DayWeek" = "Første 4-dagersuken i året";
|
||||||
"firstWeekOfYear_FirstFullWeek" = "Første hele uken i året";
|
"firstWeekOfYear_FirstFullWeek" = "Første hele uken i året";
|
||||||
|
|
||||||
|
/* Default Calendar */
|
||||||
|
"Default calendar :" = "Default calendar";
|
||||||
|
"selectedCalendar" = "Selected calendar";
|
||||||
|
"personalCalendar" = "Personal calendar";
|
||||||
|
"firstCalendar" = "First enabled calendar";
|
||||||
|
|
||||||
"reminderTime_0000" = "0 minutter";
|
"reminderTime_0000" = "0 minutter";
|
||||||
"reminderTime_0005" = "5 minutter";
|
"reminderTime_0005" = "5 minutter";
|
||||||
"reminderTime_0010" = "10 minutter";
|
"reminderTime_0010" = "10 minutter";
|
||||||
|
|
|
@ -92,6 +92,12 @@
|
||||||
"firstWeekOfYear_First4DayWeek" = "Första 4-dagarsveckan på året";
|
"firstWeekOfYear_First4DayWeek" = "Första 4-dagarsveckan på året";
|
||||||
"firstWeekOfYear_FirstFullWeek" = "Första hela veckan på året";
|
"firstWeekOfYear_FirstFullWeek" = "Första hela veckan på året";
|
||||||
|
|
||||||
|
/* Default Calendar */
|
||||||
|
"Default calendar :" = "Default calendar";
|
||||||
|
"selectedCalendar" = "Selected calendar";
|
||||||
|
"personalCalendar" = "Personal calendar";
|
||||||
|
"firstCalendar" = "First enabled calendar";
|
||||||
|
|
||||||
"reminderTime_0000" = "0 minuter";
|
"reminderTime_0000" = "0 minuter";
|
||||||
"reminderTime_0005" = "5 minuter";
|
"reminderTime_0005" = "5 minuter";
|
||||||
"reminderTime_0010" = "10 minuter";
|
"reminderTime_0010" = "10 minuter";
|
||||||
|
|
|
@ -421,6 +421,30 @@
|
||||||
[userDefaults setFirstDayOfWeek: [newDay intValue]];
|
[userDefaults setFirstDayOfWeek: [newDay intValue]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSArray *) defaultCalendarList
|
||||||
|
{
|
||||||
|
NSMutableArray *options;
|
||||||
|
|
||||||
|
options = [NSArray arrayWithObjects: @"selected", @"personal", @"first", nil];
|
||||||
|
|
||||||
|
return options;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSString *) itemCalendarText
|
||||||
|
{
|
||||||
|
return [self labelForKey: [NSString stringWithFormat: @"%@Calendar", item]];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSString *) userDefaultCalendar
|
||||||
|
{
|
||||||
|
return [userDefaults defaultCalendar];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void) setUserDefaultCalendar: (NSString *) newValue
|
||||||
|
{
|
||||||
|
[userDefaults setDefaultCalendar: newValue];
|
||||||
|
}
|
||||||
|
|
||||||
- (NSArray *) hoursList
|
- (NSArray *) hoursList
|
||||||
{
|
{
|
||||||
static NSMutableArray *hours = nil;
|
static NSMutableArray *hours = nil;
|
||||||
|
|
|
@ -92,6 +92,12 @@
|
||||||
"firstWeekOfYear_First4DayWeek" = "First 4-day week";
|
"firstWeekOfYear_First4DayWeek" = "First 4-day week";
|
||||||
"firstWeekOfYear_FirstFullWeek" = "Wythnos cyntaf llawn";
|
"firstWeekOfYear_FirstFullWeek" = "Wythnos cyntaf llawn";
|
||||||
|
|
||||||
|
/* Default Calendar */
|
||||||
|
"Default calendar :" = "Default calendar";
|
||||||
|
"selectedCalendar" = "Selected calendar";
|
||||||
|
"personalCalendar" = "Personal calendar";
|
||||||
|
"firstCalendar" = "First enabled calendar";
|
||||||
|
|
||||||
"reminderTime_0000" = "0 munud";
|
"reminderTime_0000" = "0 munud";
|
||||||
"reminderTime_0005" = "5 munud";
|
"reminderTime_0005" = "5 munud";
|
||||||
"reminderTime_0010" = "10 munud";
|
"reminderTime_0010" = "10 munud";
|
||||||
|
|
|
@ -102,6 +102,11 @@
|
||||||
const:id="firstWeek"
|
const:id="firstWeek"
|
||||||
string="itemFirstWeekText" selection="userFirstWeek"
|
string="itemFirstWeekText" selection="userFirstWeek"
|
||||||
/></label><br/>
|
/></label><br/>
|
||||||
|
<label><var:string label:value="Default calendar :"/>
|
||||||
|
<var:popup list="defaultCalendarList" item="item"
|
||||||
|
const:id="defaultCalendar"
|
||||||
|
string="itemCalendarText" selection="userDefaultCalendar"
|
||||||
|
/></label><br/>
|
||||||
<label><var:string label:value="Categories"/></label>
|
<label><var:string label:value="Categories"/></label>
|
||||||
<div id="calendarCategoriesListWrapper" class="listWrapper"
|
<div id="calendarCategoriesListWrapper" class="listWrapper"
|
||||||
><table class="categoriesList" cellspacing="0">
|
><table class="categoriesList" cellspacing="0">
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
xmlns:rsrc="OGo:url"
|
xmlns:rsrc="OGo:url"
|
||||||
xmlns:label="OGo:label"
|
xmlns:label="OGo:label"
|
||||||
className="UIxPageFrame"
|
className="UIxPageFrame"
|
||||||
const:userDefaultsKeys="SOGoCalendarCategoriesColors"
|
const:userDefaultsKeys="SOGoCalendarCategoriesColors,SOGoDefaultCalendar"
|
||||||
const:userSettingsKeys="Calendar,ShowCompletedTasks"
|
const:userSettingsKeys="Calendar,ShowCompletedTasks"
|
||||||
const:jsFiles="SchedulerUIDnD.js"
|
const:jsFiles="SchedulerUIDnD.js"
|
||||||
title="title">
|
title="title">
|
||||||
|
|
|
@ -36,7 +36,24 @@ var clipboard = null;
|
||||||
var eventsToCopy = [];
|
var eventsToCopy = [];
|
||||||
|
|
||||||
function newEvent(type, day, hour, duration) {
|
function newEvent(type, day, hour, duration) {
|
||||||
var folder = getSelectedFolder();
|
var folder = null;
|
||||||
|
if (UserDefaults['SOGoDefaultCalendar'] == 'personal')
|
||||||
|
folder = $("calendarList").down("li");
|
||||||
|
else if (UserDefaults['SOGoDefaultCalendar'] == 'first') {
|
||||||
|
var list = $("calendarList");
|
||||||
|
var inputs = list.select("input");
|
||||||
|
for (var i = 0; i < inputs.length; i++) {
|
||||||
|
var input = inputs[i];
|
||||||
|
if (input.checked) {
|
||||||
|
folder = input.up();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!folder)
|
||||||
|
folder = list.down("li");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
folder = getSelectedFolder();
|
||||||
var folderID = folder.readAttribute("id");
|
var folderID = folder.readAttribute("id");
|
||||||
var urlstr = ApplicationBaseURL + folderID + "/new" + type;
|
var urlstr = ApplicationBaseURL + folderID + "/new" + type;
|
||||||
var params = [];
|
var params = [];
|
||||||
|
@ -908,7 +925,7 @@ function eventsListCallback(http) {
|
||||||
if (rTime)
|
if (rTime)
|
||||||
row.recurrenceTime = escape(rTime);
|
row.recurrenceTime = escape(rTime);
|
||||||
row.isException = data[i][17];
|
row.isException = data[i][17];
|
||||||
row.editable = data[i][18];
|
row.editable = data[i][18] || IsSuperUser;
|
||||||
row.erasable = data[i][19] || IsSuperUser;
|
row.erasable = data[i][19] || IsSuperUser;
|
||||||
var startDate = new Date();
|
var startDate = new Date();
|
||||||
startDate.setTime(data[i][5] * 1000);
|
startDate.setTime(data[i][5] * 1000);
|
||||||
|
|
|
@ -51,7 +51,7 @@ DIV.listWrapper
|
||||||
#calendarCategoriesListWrapper
|
#calendarCategoriesListWrapper
|
||||||
{ bottom: 30px;
|
{ bottom: 30px;
|
||||||
right: 2em;
|
right: 2em;
|
||||||
top: 88px;
|
top: 108px;
|
||||||
left: 2em; }
|
left: 2em; }
|
||||||
|
|
||||||
#contactsCategoriesListWrapper
|
#contactsCategoriesListWrapper
|
||||||
|
|
|
@ -88,7 +88,7 @@ function _setupEvents() {
|
||||||
var widgets = [ "timezone", "shortDateFormat", "longDateFormat",
|
var widgets = [ "timezone", "shortDateFormat", "longDateFormat",
|
||||||
"timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
|
"timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
|
||||||
"firstWeek", "messageCheck", "sortByThreads",
|
"firstWeek", "messageCheck", "sortByThreads",
|
||||||
"subscribedFoldersOnly", "language" ];
|
"subscribedFoldersOnly", "language", "defaultCalendar" ];
|
||||||
for (var i = 0; i < widgets.length; i++) {
|
for (var i = 0; i < widgets.length; i++) {
|
||||||
var widget = $(widgets[i]);
|
var widget = $(widgets[i]);
|
||||||
if (widget) {
|
if (widget) {
|
||||||
|
|
Loading…
Reference in New Issue