LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge of '366dd63bc8cb90bda841f039b5d9e177f4dc3bbc'

Browse source 
and 'bde131451e61cf9c2c9b12131c6ea839e28e3bf2'

Monotone-Parent: 366dd63bc8cb90bda841f039b5d9e177f4dc3bbc
Monotone-Parent: bde131451e61cf9c2c9b12131c6ea839e28e3bf2
Monotone-Revision: 200696af293fef0e2e6002c56a321834f165a2ec

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-02T14:12:54
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2009-07-02 14:12:54 +00:00
parent 4695f1a464 aebc17edf0
commit d3ab38ff3d
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -8,6 +8,8 @@
* SoObjects/SOGo/SOGoGCSFolder.m: Remove color from user settings on * SoObjects/SOGo/SOGoGCSFolder.m: Remove color from user settings on
unsubscribe. unsubscribe.
* SoObjects/SOGo/SOGoGCSFolder.m: Re-fixed to also remove from InactiveFolders
and FolderSyncTags.
* UI/MailerUI/UIxMailFolderActions.m (_trashedURLOfFolder:withCO:): Fixed * UI/MailerUI/UIxMailFolderActions.m (_trashedURLOfFolder:withCO:): Fixed
issue when deleting a folder with the same name as one already in the Trash. issue when deleting a folder with the same name as one already in the Trash.

7
NEWS
View file

@ -3,14 +3,17 @@
- improved search behavior of users folders (UIxContactsUserFolders) - improved search behavior of users folders (UIxContactsUserFolders)
- the editor window in the web interface now appears directly when editing an exception occurence of a repeating event (no more dialog window, as in Lightning) - the editor window in the web interface now appears directly when editing an exception occurence of a repeating event (no more dialog window, as in Lightning)
- implemented the webdav sync spec from Cyrus Daboo, in order to reduce useless payload on databases - implemented the webdav sync spec from Cyrus Daboo, in order to reduce useless payload on databases
- greatly reduced the number of SQL requests performed in many situations
- added HTML composition in the web mail module - added HTML composition in the web mail module
- added drag and drop in the addressbook module - added drag and drop in the address book and email modules
- improved the attendees modification dialog by implementing slots management
- added the capability to display the size of messages in the mail module
1.0-20090605 (1.0.2) 1.0-20090605 (1.0.2)
-------------------- --------------------
- basic alarm implementation for the web interface - basic alarm implementation for the web interface
- added Welsh translation, thanks to Iona Bailey - added Welsh translation, thanks to Iona Bailey
- added Russh translation, thanks to Alex Kabakaev - added Russian translation, thanks to Alex Kabakaev
- added support for Oracle RAC - added support for Oracle RAC
- added "scope" parameter to LDAP sources - added "scope" parameter to LDAP sources
- now possible to use SSL (or TLS) for LDAP sources - now possible to use SSL (or TLS) for LDAP sources

16
SoObjects/SOGo/SOGoGCSFolder.m
View file

@ -658,7 +658,7 @@ static NSArray *childRecordFields = nil;
NSMutableArray *folderSubscription; NSMutableArray *folderSubscription;
NSString *subscriptionPointer, *mailInvitationURL; NSString *subscriptionPointer, *mailInvitationURL;
NSUserDefaults *ud; NSUserDefaults *ud;
NSMutableDictionary *moduleSettings; NSMutableDictionary *moduleSettings, *tmp;
if ([owner isEqualToString: [subscribingUser login]]) if ([owner isEqualToString: [subscribingUser login]])
{ {
@ -692,8 +692,18 @@ static NSArray *childRecordFields = nil;
[folderSubscription addObjectUniquely: subscriptionPointer]; [folderSubscription addObjectUniquely: subscriptionPointer];
else else
{ {
[[moduleSettings objectForKey: @"FolderColors"] tmp = [moduleSettings objectForKey: @"FolderColors"];
removeObjectForKey: subscriptionPointer]; if (tmp)
[tmp removeObjectForKey: subscriptionPointer];
tmp = [moduleSettings objectForKey: @"InactiveFolders"];
if (tmp)
[tmp removeObjectForKey: subscriptionPointer];
tmp = [moduleSettings objectForKey: @"FolderSyncTags"];
if (tmp)
[tmp removeObjectForKey: subscriptionPointer];
[folderSubscription removeObject: subscriptionPointer]; [folderSubscription removeObject: subscriptionPointer];
} }