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

Revert merge from inverse

Browse Source 
https://github.com/Zentyal/sogo/pull/150

Because the login on web with the use of outlook is broken after
including the DomainLessLogin feature
This commit is contained in:
Jesús García Sáez committed 2015-07-28 12:37:33 +02:00
1 parent 72cbd9a45f
commit 3dc8cc78ea
41 files changed
+284 -767
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/Templates/ContactsUI/UIxContactFoldersView.wox
+5 -5
View File
@@ -149,11 +149,11 @@
<var:foreach list="personalContactInfos" item="currentContact">
<tr var:class="currentContactClasses"
var:categories="currentContact.c_categories.asSafeJSString"
var:id="currentContact.c_name.asCSSIdentifier"
var:contactname="currentContact.c_cn.asSafeJSString">
<td class="displayName" var:title="currentContact.c_cn.asSafeJSString"><var:string value="currentContact.c_cn" const:escapeHTML="YES" /></td>
<td var:title="currentContact.c_mail.asSafeJSString"><var:string value="currentContact.c_mail"/></td>
var:categories="currentContact.c_categories"
var:id="currentContact.c_name"
var:contactname="currentContact.c_cn">
<td class="displayName" var:title="currentContact.c_cn"><var:string value="currentContact.c_cn" const:escapeHTML="YES" /></td>
<td var:title="currentContact.c_mail"><var:string value="currentContact.c_mail"/></td>
<td><var:string value="currentContact.c_screenname"/></td>
<td><var:string value="currentContact.c_o"/></td>
<td><var:string value="currentContact.c_telephonenumber"/></td>
UI/Templates/UIxJSClose.wox
+1 -1
View File
@@ -17,7 +17,7 @@
><script type="text/javascript"
><var:if condition="hasRefreshMethod">
var p = <var:if condition="singleWindowModeEnabled">parent</var:if><var:if condition="singleWindowModeEnabled" const:negate="YES">window.opener</var:if>;
if (p) p.setTimeout(<var:string value="refreshMethod" const:escapeHTML="NO" />, 50);
if (p) p.setTimeout('<var:string value="refreshMethod" const:escapeHTML="NO" />;', 50);
</var:if>
onCloseButtonClick();
</script>