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

propagate from branch 'ca.inverse.sogo.1_3_12' (head e06508d0c983ab0f20c49852cea74409f575b9c0)

Browse source 
to branch 'ca.inverse.sogo' (head 1cafe7a57bb95258d6e78d2bc0a96b00fcdb0325)

Monotone-Parent: 1cafe7a57bb95258d6e78d2bc0a96b00fcdb0325
Monotone-Parent: e06508d0c983ab0f20c49852cea74409f575b9c0
Monotone-Revision: 7350e2dc1cd7b8d9ac3163e46a58367520a711b2

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-01-20T00:42:28
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte 2012-01-20 00:42:28 +00:00
parent b3fc0c1488 9c5070dbe4
commit 35618953d3
5 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-01-19 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxMailToSelection.js
(addressFieldChanged): remove commas before testing email regexp.
2012-01-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/UIxFilterEditor.js (setupNewFilterData):

BIN
Documentation/SOGo Native Microsoft Outlook Configuration.odt
View file

Binary file not shown.

5
UI/WebServerResources/UIxMailToSelection.js
View file

@ -154,6 +154,7 @@ function addressFieldChanged(event) {
// "dude, buddy dude@domain.com; bro" => "dude, buddy <dude@domain.com>" + "bro"
// "dude, buddy, bro <bro@domain.com>" => "dude, buddy, bro <bro@domain.com>"
// "dude, buddy, bro" => "dude" + "buddy" + "bro"
// "dude@domain.com, <buddy@domain.com>" => "<dude@domain.com>" + "<buddy@domain.com>"
var addresses = this.value.split(';');
if (addresses.length > 0) {
var first = true;
@ -161,7 +162,7 @@ function addressFieldChanged(event) {
var words = addresses[i].split(' ');
var phrase = new Array();
for (var j = 0; j < words.length; j++) {
var word = words[j].strip().replace(/<(.+)>/, "$1");
var word = words[j].strip().replace(/<(.+)>/, "$1").replace(',', '');
if (word.length > 0) {
// Use the regexp defined in generic.js
if (emailRE.test(word)) {
@ -176,7 +177,7 @@ function addressFieldChanged(event) {
phrase = new Array();
}
else
phrase.push(word);
phrase.push(words[j].strip());
}
}
if (phrase.length > 0) {

4
debian/control vendored
View file

@ -1,14 +1,14 @@
Source: sogo
Priority: optional
Maintainer: Inverse Support <support@inverse.ca>
Build-Depends: debhelper (>= 7.0.15), gobjc | objc-compiler, libgnustep-base-dev, libsope-appserver4.9-dev, libsope-core4.9-dev, libsope-gdl1-4.9-dev, libsope-ldap4.9-dev, libsope-mime4.9-dev, libsope-xml4.9-dev, libmemcached-dev, libxml2-dev, libsbjson-dev, libssl-dev
Build-Depends: debhelper (>= 7.0.15), gobjc | objc-compiler, libgnustep-base-dev, libsope-appserver4.9-dev, libsope-core4.9-dev, libsope-gdl1-4.9-dev, libsope-ldap4.9-dev, libsope-mime4.9-dev, libsope-xml4.9-dev, libmemcached-dev, libxml2-dev, libsbjson-dev, libssl-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev
Section: web
Standards-Version: 3.9.1
Package: sogo
Section: web
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make
Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3
Suggests: nginx
Description: a modern and scalable groupware
SOGo is a groupware server built around OpenGroupware.org (OGo) and

9
sogo.spec
View file

@ -17,7 +17,14 @@ Prefix: /usr
AutoReqProv: off
Requires: gnustep-base >= 1.23, sope%{sope_major_version}%{sope_minor_version}-core, httpd, sope%{sope_major_version}%{sope_minor_version}-core, sope%{sope_major_version}%{sope_minor_version}-appserver, sope%{sope_major_version}%{sope_minor_version}-ldap, sope%{sope_major_version}%{sope_minor_version}-cards >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-sbjson, memcached, libmemcached
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
BuildPreReq: gcc-objc gnustep-base gnustep-make sope%{sope_major_version}%{sope_minor_version}-appserver-devel sope%{sope_major_version}%{sope_minor_version}-core-devel sope%{sope_major_version}%{sope_minor_version}-ldap-devel sope%{sope_major_version}%{sope_minor_version}-mime-devel sope%{sope_major_version}%{sope_minor_version}-xml-devel sope%{sope_major_version}%{sope_minor_version}-gdl1-devel sope%{sope_major_version}%{sope_minor_version}-sbjson-devel libmemcached-devel %{?oc_build_depends}
BuildRequires: gcc-objc gnustep-base gnustep-make sope%{sope_major_version}%{sope_minor_version}-appserver-devel sope%{sope_major_version}%{sope_minor_version}-core-devel sope%{sope_major_version}%{sope_minor_version}-ldap-devel sope%{sope_major_version}%{sope_minor_version}-mime-devel sope%{sope_major_version}%{sope_minor_version}-xml-devel sope%{sope_major_version}%{sope_minor_version}-gdl1-devel sope%{sope_major_version}%{sope_minor_version}-sbjson-devel libmemcached-devel %{?oc_build_depends}
# Required by MS Exchange freebusy lookups
%{?el5:Requires: curl}
%{?el5:BuildRequires: curl-devel}
%{?el6:Requires: libcurl}
%{?el6:BuildRequires: libcurl-devel}
%description
SOGo is a groupware server built around OpenGroupware.org (OGo) and