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

merge of '173ccf9cd4cd08cdc361da9d58df641be065e5a5'

Browse source 
and '7eb19f1f060daa6cb0a2421481ec351910c3af68'

Monotone-Parent: 173ccf9cd4cd08cdc361da9d58df641be065e5a5
Monotone-Parent: 7eb19f1f060daa6cb0a2421481ec351910c3af68
Monotone-Revision: a7a764a2e6fd01790136451d2f144d9b934d1e8e

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-20T18:21:20
This commit is contained in:
Ludovic Marcotte 2012-07-20 18:21:20 +00:00
parent f363ddf101 8f31821e1d
commit 3e980d12af
3 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,11 +1,25 @@
<<<<<<< variant A
2012-07-20 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/MailPartViewers/UIxMailRenderingContext.m
(_shouldDisplayAsAttachment:): refactored to consider
the "bodyId" parameter only for non text/* parts.
>>>>>>> variant B
2012-07-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(_appendCycleException:firstInstanceCalendarDateRange:fromRow:forRange:withTimeZone:toArray:):
return immediately if the occurrence does not have a valid
recurrence-id.
####### Ancestor
======= end
2012-07-20 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/MailerUI.js (onEmailTo): append the email
address from the href attribute if it doesn't appear in the link content.
* UI/MailPartViewers/UIxMailPartHTMLViewer.m
(-startElement:namespace:rawName:attributes:): don't skip "mailto:"
href.

5
SoObjects/Appointments/SOGoAppointmentFolder.m
View file

@ -863,6 +863,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
newRecord = nil;
recurrenceId = [component recurrenceId];
if (!recurrenceId)
{
[self errorWithFormat: @"ignored component with an empty EXCEPTION-ID"];
return;
}
if (tz)
{

6
UI/WebServerResources/MailerUI.js
View file

@ -1790,7 +1790,11 @@ function newContactFromEmail(event) {
}
function onEmailTo(event) {
openMailTo(this.innerHTML.strip());
var s = this.innerHTML.strip();
if (!/@/.test(s)) {
s += ' <' + this.href.substr(7) + '>';
}
openMailTo(s);
Event.stop(event);
return false;
}