See ChangeLog

Monotone-Parent: 2b96d00aec89e2290a01e1ee04bdc8cee5487139
Monotone-Revision: 478756ffec5abdd24d602d86bbb8fdf091d543bd

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-08-24T13:27:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2010-08-24 13:27:02 +00:00
parent a2b5a5b4bb
commit 7c2eb5394b
4 changed files with 17 additions and 22 deletions
+6
View File
@@ -1,3 +1,9 @@
2010-08-24 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/Templates/PreferencesUI/UIxPreferences.wox
Enabled the UI widgets related to SSL/TLS.
SOPE *must* be updated for them to work properly.
2010-08-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/UIxMailEditor.js: (clickEditorSend): make
+1 -1
View File
@@ -1,5 +1,5 @@
/*
Copyright (C) 2009 Inverse inc.
Copyright (C) 2009-2010 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of SOGo.
+2 -1
View File
@@ -521,6 +521,7 @@ static NSString *sieveScriptName = @"sogo";
mailAccount = [self _mailAccount];
encryption = [mailAccount objectForKey: @"encryption"];
if ([encryption isEqualToString: @"ssl"])
{
protocol = @"imaps";
@@ -543,7 +544,7 @@ static NSString *sieveScriptName = @"sogo";
if (port && port != defaultPort)
[imap4URLString appendFormat: @":%d", port];
[imap4URLString appendString: @"/"];
return imap4URLString;
}
+8 -20
View File
@@ -134,18 +134,6 @@
</div>
<input type="hidden" const:id="categoriesValue"
const:name="categoriesValue" var:value="categoriesValue"/>
<!-- <br/> -->
<!-- <label><input class="checkBox" -->
<!-- type="checkbox" var:selection="reminderEnabled" -->
<!-- var:checked="reminderEnabled"/><var:string -->
<!-- label:value="Enable reminders for Calendar items"/></label><br/> -->
<!-- <label><input class="checkBox" -->
<!-- type="checkbox" var:selection="remindWithASound" -->
<!-- var:checked="remindWithASound"/><var:string -->
<!-- label:value="Play a sound when a reminder comes due"/></label><br/> -->
<!-- <label><var:string label:value="Default reminder :"/> -->
<!-- <var:popup list="reminderTimesList" item="item" -->
<!-- string="itemReminderTimeText" selection="userReminderTime"/></label> -->
</div>
</var:if
><var:if condition="userHasMailAccess">
@@ -244,14 +232,14 @@
<input const:name="password" const:id="password" type="password" const:value=""/></label>
<input const:name="encryption" type="hidden" const:value="none"/>
<!-- <hr/> -->
<!-- <var:string label:value="Encryption:"/> -->
<!-- <label><input const:name="encryption" type="radio" const:value="none"/> -->
<!-- <var:string label:value="None"/></label> -->
<!-- <label><input const:name="encryption" type="radio" const:value="ssl"/> -->
<!-- <var:string label:value="SSL"/></label> -->
<!-- <label><input const:name="encryption" type="radio" const:value="tls"/> -->
<!-- <var:string label:value="TLS"/></label> -->
<hr/>
<var:string label:value="Encryption:"/>
<label><input const:name="encryption" type="radio" const:value="none"/>
<var:string label:value="None"/></label>
<label><input const:name="encryption" type="radio" const:value="ssl"/>
<var:string label:value="SSL"/></label>
<label><input const:name="encryption" type="radio" const:value="tls"/>
<var:string label:value="TLS"/></label>
</fieldset>
<fieldset const:id="identityInfo">
<label><var:string label:value="Full Name:"/>