merge of '6e9bec6a824b22501c8cbc518a56410d6d896cb0'

and 'f67fbb0139df60f0e98c0aede6b166d1a8b15d81'

Monotone-Parent: 6e9bec6a824b22501c8cbc518a56410d6d896cb0
Monotone-Parent: f67fbb0139df60f0e98c0aede6b166d1a8b15d81
Monotone-Revision: 99d4bc909bf50d700f93573eaceabb2e45fb55e7

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-08T05:03:45
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2012-02-08 05:03:45 +00:00
commit 3548f1554f

View file

@ -1,4 +1,3 @@
>>>>>>> variant B
2012-02-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Contacts/UIxContactView.m (-photoURL, -hasPhoto): copied code
@ -10,6 +9,16 @@
all simple tag to "VoidTags", based on list from
http://www.w3.org/TR/html4/index/elements.html.
* UI/WebServerResources/JavascriptAPIExtensions.js
(String.asCSSIdentifier): same as below.
* SoObjects/SOGo/NSString+Utilities.m (-setupCSSEscaping): add
"_P_" as escaping sequence for "+".
* UI/MailPartViewers/UIxMailPartHTMLViewer.m (+initialize): added
all simple tag to "VoidTags", based on list from
http://www.w3.org/TR/html4/index/elements.html.
2012-02-10 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/generic.js (openMailTo): recipients are
@ -19,14 +28,6 @@
(-startElement:namespace:rawName:attributes:): we should not add
end tags to void tags (ex: <br>).
2012-02-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/JavascriptAPIExtensions.js
(String.asCSSIdentifier): same as below.
* SoObjects/SOGo/NSString+Utilities.m (-setupCSSEscaping): add
"_P_" as escaping sequence for "+".
2012-02-08 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m (+webdavAclManager): must include