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

merge of '83421e247100566d2b53cc3aabf6af4e829a9145' 

and 'f06b5c51d33b49e9e8e5c1bd337b720f3d1f28e0'

Monotone-Parent: 83421e247100566d2b53cc3aabf6af4e829a9145
Monotone-Parent: f06b5c51d33b49e9e8e5c1bd337b720f3d1f28e0
Monotone-Revision: 8c454beced4065ab33a74905784cb670a0285959

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-20T18:48:21
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Jean Raby 2012-01-20 18:48:21 +00:00
parent 7dc9e4b9e6 11a22d590b
commit 31de3448c4
6 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
SOPE/GDLContentStore/ChangeLog
View File

@ -1,3 +1,8 @@
2012-01-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* GCSSpecialQueries.m (-createSessionsFolderWithName:): declare
c_id as primary key to make sure it's indexed.
2011-12-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* GCSFolder.m (-releaseChannel:): perform the debug logging BEFORE

6
SOPE/GDLContentStore/GCSSpecialQueries.m
View File

@ -190,7 +190,7 @@
{
static NSString *sqlFolderFormat
= (@"CREATE TABLE %@ ("
@" c_id VARCHAR(255) NOT NULL,"
@" c_id VARCHAR(255) NOT NULL PRIMARY KEY,"
@" c_value VARCHAR(255) NOT NULL,"
@" c_creationdate INT4 NOT NULL,"
@" c_lastseen INT4 NOT NULL)");
@ -284,7 +284,7 @@
{
static NSString *sqlFolderFormat
= (@"CREATE TABLE %@ ("
@" c_id VARCHAR(255) NOT NULL,"
@" c_id VARCHAR(255) NOT NULL PRIMARY KEY,"
@" c_value VARCHAR(255) NOT NULL,"
@" c_creationdate INT NOT NULL,"
@" c_lastseen INT NOT NULL)");
@ -377,7 +377,7 @@
{
static NSString *sqlFolderFormat
= (@"CREATE TABLE %@ ("
@" c_id VARCHAR2(255) NOT NULL,"
@" c_id VARCHAR2(255) NOT NULL PRIMARY KEY,"
@" c_value VARCHAR2(255) NOT NULL,"
@" c_creationdate INTEGER NOT NULL,"
@" c_lastseen INTEGER NOT NULL)");

2
Tests/Integration/GNUmakefile.preamble
View File

@ -15,3 +15,5 @@ ADDITIONAL_LIB_DIRS += \
-L../../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
-L/usr/local/lib -L/usr/lib -lEOControl -lNGStreams -lNGMime -lNGExtensions
ADDITIONAL_LDFLAGS += -Wl,--no-as-needed

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) {