amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-20 19:05:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix-some-warnings

Browse Source 
Conflicts:
	SoObjects/Appointments/SOGoAppointmentObject.m
This commit is contained in:
Patrice Levesque
2016-02-15 11:23:27 -05:00
parent 9e83ff9f04 f2ffb52318
commit a5cc2bb5d5
66 changed files with 676 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoDateFormatter.h
+4 -19
View File
@@ -1,14 +1,14 @@
/*
Copyright (C) 2004 SKYRIX Software AG
Copyright (C) 2005-2016 Inverse inc.
This file is part of OpenGroupware.org.
This file is part of SOGo.
OGo 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
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -48,21 +48,6 @@
- (NSString *) stringForObjectValue: (id) date;
// - (void) setFullWeekdayNameAndDetails;
// - (NSString *) date: (NSCalendarDate *) date
// withFormat: (unsigned int) format;
// - (NSString *) date: (NSCalendarDate *) date
// withNSFormat: (NSNumber *) format;
// - (NSString *) shortDayOfWeek: (int)_day;
// - (NSString *) fullDayOfWeek: (int)_day;
// - (NSString *) shortMonthOfYear: (int)_month;
// - (NSString *) fullMonthOfYear: (int)_month;
// - (NSString *) fullWeekdayNameAndDetailsForDate: (NSCalendarDate *)_date;
@end
#endif /* __SOGoDateFormatter_H_ */
SoObjects/SOGo/SOGoDateFormatter.m
+5 -5
View File
@@ -1,14 +1,14 @@
/*
Copyright (C) 2004 SKYRIX Software AG
Copyright (C) 2005-2016 Inverse inc.
This file is part of OpenGroupware.org.
This file is part of SOGo.
OGo 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
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -21,7 +21,7 @@
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSUserDefaults.h> /* for NSXXXFormatString, ... */
#import <Foundation/NSUserDefaults.h>
#import "SOGoDateFormatter.h"
SoObjects/SOGo/SOGoDefaults.plist
+1
View File
@@ -72,6 +72,7 @@
SOGoTrashFolderName = "Trash";
SOGoJunkFolderName = "Junk";
SOGoMailComposeMessageType = "html";
SOGoMailComposeFontSize = 0;
SOGoMailDisplayRemoteInlineImages = "never";
SOGoMailAutoSave = "5";
SoObjects/SOGo/SOGoUserDefaults.h
+3
View File
@@ -132,6 +132,9 @@ extern NSString *SOGoWeekStartFirstFullWeek;
- (void) setMailComposeMessageType: (NSString *) newValue;
- (NSString *) mailComposeMessageType;
- (void) setMailComposeFontSize: (NSString *) newValue;
- (NSString *) mailComposeFontSize;
- (void) setMailDisplayRemoteInlineImages: (NSString *) newValue;
- (NSString *) mailDisplayRemoteInlineImages;
SoObjects/SOGo/SOGoUserDefaults.m
+10
View File
@@ -534,6 +534,16 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
return [self stringForKey: @"SOGoMailComposeMessageType"];
}
- (void) setMailComposeFontSize: (NSString *) newValue
{
[self setObject: newValue forKey: @"SOGoMailComposeFontSize"];
}
- (NSString *) mailComposeFontSize
{
return [self stringForKey: @"SOGoMailComposeFontSize"];
}
- (void) setMailDisplayRemoteInlineImages: (NSString *) newValue
{
[self setObject: newValue forKey: @"SOGoMailDisplayRemoteInlineImages"];