From b5e77ad86c9c3939470c47669c413b4b3a0f9e72 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 22 Nov 2013 15:16:20 -0500 Subject: [PATCH] Bump version to 2.1.1a --- ChangeLog | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Version | 2 +- 2 files changed, 158 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 393bf3486..4d6273ab4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,123 @@ +commit 5bc0a0a932e55ce6e1d02885501198e3b725551e +Author: Francis Lachapelle +Date: Fri Nov 22 15:03:57 2013 -0500 + + Update NEWS file + +M NEWS + +commit 582af53af0e3cb8619e61d72d622fae94382a047 +Author: Francis Lachapelle +Date: Fri Nov 22 14:42:16 2013 -0500 + + Cleanup wox templates + +M UI/Templates/MailerUI/UIxMailWindowCloser.wox +M UI/Templates/PreferencesUI/UIxFilterEditor.wox + +commit 13f01b512b182069edcf11c0d2bb33ad08b43fca +Author: Francis Lachapelle +Date: Fri Nov 22 14:39:24 2013 -0500 + + Move mail tags strings to UI/Common + +M SoObjects/Mailer/SOGoMailLabel.m +M UI/Common/Arabic.lproj/Localizable.strings +M UI/Common/BrazilianPortuguese.lproj/Localizable.strings +M UI/Common/Catalan.lproj/Localizable.strings +M UI/Common/Czech.lproj/Localizable.strings +M UI/Common/Danish.lproj/Localizable.strings +M UI/Common/Dutch.lproj/Localizable.strings +M UI/Common/English.lproj/Localizable.strings +M UI/Common/Finnish.lproj/Localizable.strings +M UI/Common/French.lproj/Localizable.strings +M UI/Common/German.lproj/Localizable.strings +M UI/Common/Hungarian.lproj/Localizable.strings +M UI/Common/Icelandic.lproj/Localizable.strings +M UI/Common/Italian.lproj/Localizable.strings +M UI/Common/NorwegianBokmal.lproj/Localizable.strings +M UI/Common/NorwegianNynorsk.lproj/Localizable.strings +M UI/Common/Polish.lproj/Localizable.strings +M UI/Common/Russian.lproj/Localizable.strings +M UI/Common/Slovak.lproj/Localizable.strings +M UI/Common/SpanishArgentina.lproj/Localizable.strings +M UI/Common/SpanishSpain.lproj/Localizable.strings +M UI/Common/Swedish.lproj/Localizable.strings +M UI/Common/Ukrainian.lproj/Localizable.strings +M UI/Common/Welsh.lproj/Localizable.strings +M UI/MailerUI/Arabic.lproj/Localizable.strings +M UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/MailerUI/Catalan.lproj/Localizable.strings +M UI/MailerUI/Czech.lproj/Localizable.strings +M UI/MailerUI/Danish.lproj/Localizable.strings +M UI/MailerUI/Dutch.lproj/Localizable.strings +M UI/MailerUI/English.lproj/Localizable.strings +M UI/MailerUI/Finnish.lproj/Localizable.strings +M UI/MailerUI/French.lproj/Localizable.strings +M UI/MailerUI/German.lproj/Localizable.strings +M UI/MailerUI/Hungarian.lproj/Localizable.strings +M UI/MailerUI/Icelandic.lproj/Localizable.strings +M UI/MailerUI/Italian.lproj/Localizable.strings +M UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings +M UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/MailerUI/Polish.lproj/Localizable.strings +M UI/MailerUI/Russian.lproj/Localizable.strings +M UI/MailerUI/Slovak.lproj/Localizable.strings +M UI/MailerUI/SpanishArgentina.lproj/Localizable.strings +M UI/MailerUI/SpanishSpain.lproj/Localizable.strings +M UI/MailerUI/Swedish.lproj/Localizable.strings +M UI/MailerUI/Ukrainian.lproj/Localizable.strings +M UI/MailerUI/Welsh.lproj/Localizable.strings +M UI/PreferencesUI/Arabic.lproj/Localizable.strings +M UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/PreferencesUI/Catalan.lproj/Localizable.strings +M UI/PreferencesUI/Czech.lproj/Localizable.strings +M UI/PreferencesUI/Danish.lproj/Localizable.strings +M UI/PreferencesUI/Dutch.lproj/Localizable.strings +M UI/PreferencesUI/English.lproj/Localizable.strings +M UI/PreferencesUI/Finnish.lproj/Localizable.strings +M UI/PreferencesUI/French.lproj/Localizable.strings +M UI/PreferencesUI/German.lproj/Localizable.strings +M UI/PreferencesUI/Hungarian.lproj/Localizable.strings +M UI/PreferencesUI/Icelandic.lproj/Localizable.strings +M UI/PreferencesUI/Italian.lproj/Localizable.strings +M UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings +M UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/PreferencesUI/Polish.lproj/Localizable.strings +M UI/PreferencesUI/Russian.lproj/Localizable.strings +M UI/PreferencesUI/Slovak.lproj/Localizable.strings +M UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +M UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings +M UI/PreferencesUI/Swedish.lproj/Localizable.strings +M UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +M UI/PreferencesUI/Welsh.lproj/Localizable.strings +M UI/WebServerResources/MailerUI.js + +commit cdb25b141ddd056f16be49fc738ec44782eb252b +Author: Ludovic Marcotte +Date: Fri Nov 22 11:29:24 2013 -0500 + + Init local variable to avoid potential crasher. + +M OpenChange/MAPIStoreGCSBaseContext.m + +commit a9868b1c93e9b7fe77c52f1ef52a28206858f563 +Author: Francis Lachapelle +Date: Thu Nov 21 08:50:24 2013 -0500 + + Fix the Sieve filters editor with new mail flags + +M UI/Templates/PreferencesUI/UIxFilterEditor.wox +M UI/WebServerResources/UIxFilterEditor.js + +commit 6587f4f19319aea549ffdd8b4e6a8752c1b3095d +Author: Jean Raby +Date: Tue Nov 19 13:59:20 2013 -0500 + + Update ChangeLog + +M ChangeLog + commit c8a4ea5548e06de1341312a1cabb00fb0ef232e8 Author: Francis Lachapelle Date: Tue Nov 19 13:57:18 2013 -0500 @@ -1362,6 +1482,17 @@ Date: Thu Jun 27 11:33:44 2013 -0400 M NEWS +commit e26e3d73079890c037e3a1adb267b47d40f74b86 +Author: Ludovic Marcotte +Date: Thu Jun 27 11:15:41 2013 -0400 + + Revert "Properly escape the foldername to avoid XSS issues" + + This reverts commit 045b275b270ec8bc0a82c7d881336db30db274f3. + +M UI/WebServerResources/SchedulerUI.js +M UI/WebServerResources/UIxContactsUserFolders.js + commit 25dbd4849de23b9ceb747ff061dffd0f1cf98cde Author: Ludovic Marcotte Date: Thu Jun 27 11:06:07 2013 -0400 @@ -1371,6 +1502,15 @@ Date: Thu Jun 27 11:06:07 2013 -0400 M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/UIxContactsUserFolders.js +commit 045b275b270ec8bc0a82c7d881336db30db274f3 +Author: Ludovic Marcotte +Date: Thu Jun 27 11:06:07 2013 -0400 + + Properly escape the foldername to avoid XSS issues + +M UI/WebServerResources/SchedulerUI.js +M UI/WebServerResources/UIxContactsUserFolders.js + commit a2a89e8720cfd44f885c34d5626d78b6b20a6b3b Author: Jean Raby Date: Wed Jun 26 16:55:39 2013 -0400 @@ -1905,6 +2045,14 @@ Date: Mon Apr 22 12:31:18 2013 -0400 M Documentation/SOGo Installation Guide.odt +commit f049e2430a2a61c67f1a0e2ba27eb34d9e540e1b +Author: Jean Raby +Date: Mon Apr 22 12:25:22 2013 -0400 + + Added ldap attribute mapping table + +M Documentation/SOGo Installation Guide.odt + commit a53c66e8a449d17f4f4484ef299b7500a8a5612b Author: Jean Raby Date: Thu Apr 18 14:35:56 2013 -0400 @@ -7280,6 +7428,15 @@ M Documentation/SOGo Mobile Devices Configuration.odt M Documentation/SOGo Mozilla Thunderbird Configuration.odt M Documentation/SOGo Native Microsoft Outlook Configuration.odt +commit ce4084e5285b353afa9fc81e47389f9927364d17 +Author: Wolfgang Sourdeau +Date: Fri Oct 12 16:55:27 2012 -0400 + + getNewChangeNumbers: new wrapper for openchangedb_get_new_changeNumbers + +M OpenChange/MAPIStoreContext.h +M OpenChange/MAPIStoreContext.m + commit b1547d7212dfeb23a8d6c936db0a46cad77f8b23 Author: Luc Charland Date: Fri Oct 12 13:34:38 2012 -0400 diff --git a/Version b/Version index cd25039c8..dc89da660 100644 --- a/Version +++ b/Version @@ -4,4 +4,4 @@ MAJOR_VERSION=2 MINOR_VERSION=1 -SUBMINOR_VERSION=1 +SUBMINOR_VERSION=1a