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

merge of '570b17715b63da450bef9fde6d9c95288911034f' 

and '800eec672662916c1befcca1d44eb844a104ca97'

Monotone-Parent: 570b17715b63da450bef9fde6d9c95288911034f
Monotone-Parent: 800eec672662916c1befcca1d44eb844a104ca97
Monotone-Revision: de4fcfa81509a5dd3cc5acd2a1c6ba7c97653649

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-08-15T02:33:59
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-08-15 02:33:59 +00:00
parent 45974ec74b 9d6b1d47bb
commit 19cbe54277
6 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -14,6 +14,12 @@
do not attempt to access targetChangeKeys when NULL, to avoid a
SEGFAULT.
2012-08-14 Jean Raby <jraby@inverse.ca>
* OpenChange/GNUmakefile: use version_info[{0,1}] instead of
version_info.{major,minor} when checking for legacy version
of python since these named attributes where added in python2.7
2012-08-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreSOGo.m (sogo_properties_get_uri): removed
@ -129,6 +135,11 @@
* OpenChange/MAPIStoreSOGoObject.m (-objectId): force generation
of objectId by parent, whether it is a folder or not.
2012-08-07 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Contacts/UIxListEditor.m (-setReferencesValue:): check for
duplicates in the new list, not in the previous version.
2012-08-03 Jean Raby <jraby@inverse.ca>
* SoObjects/SOGo/LDAPSource.m (changePasswordForLogin):

BIN
Documentation/SOGo Installation Guide.odt
View File

Binary file not shown.

2
OpenChange/GNUmakefile
View File

@ -27,7 +27,7 @@ BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
UNRTF_DIR = unrtf-$(UNRTF_VERSION)
PYTHON = /usr/bin/python
PYTHON_IS_GOOD = $(shell $(PYTHON) -c 'from sys import version_info; a=version_info; print a.major == 2 and a.minor >= 6')
PYTHON_IS_GOOD = $(shell $(PYTHON) -c 'from sys import version_info; a=version_info; print a[0] == 2 and a[1] >= 6')
ifeq (${PYTHON_IS_GOOD},False)
PYTHON = /usr/bin/python2.6
endif

2
UI/Contacts/UIxListEditor.m
View File

@ -147,7 +147,7 @@
for (i = 0; i < count; i++)
{
currentReference = [references objectAtIndex: i];
if (![self cardReferences: initialReferences
if (![self cardReferences: [list cardReferences]
contain: currentReference])
{
// Search contact by vCard UID

1
UI/PreferencesUI/English.lproj/Localizable.strings
View File

@ -282,6 +282,7 @@
"Label 4" = "Label 4";
"Label 5" = "Label 5";
"The password was changed successfully." = "The password was changed successfully.";
"Password must not be empty." = "Password must not be empty.";
"The passwords do not match. Please try again." = "The passwords do not match. Please try again.";
"Password change failed" = "Password change failed";

1
UI/PreferencesUI/French.lproj/Localizable.strings
View File

@ -282,6 +282,7 @@
"Label 4" = "étiquette 4";
"Label 5" = "étiquette 5";
"The password was changed successfully." = "Votre mot de passe a bien été changé.";
"Password must not be empty." = "Le mot de passe ne doit pas être vide.";
"The passwords do not match. Please try again." = "Les mots de passe ne sont pas identiques. Essayez de nouveau.";
"Password change failed" = "Échec au changement";