Commit c1d6d475 authored by Francis Lachapelle's avatar Francis Lachapelle
Browse files

Merge to 2.3.23

parents 0fe8d0ea 5fbe25e0
......@@ -36,6 +36,7 @@ trans.sr = UI/MailerUI/Serbian.lproj/Localizable.strings
trans.sv = UI/MailerUI/Swedish.lproj/Localizable.strings
trans.tr_TR = UI/MailerUI/TurkishTurkey.lproj/Localizable.strings
trans.uk = UI/MailerUI/Ukrainian.lproj/Localizable.strings
trans.zh_CN = UI/MailerUI/ChineseChina.lproj/Localizable.strings
trans.zh_TW = UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings
[sogo.ui-preferencesui]
......@@ -73,6 +74,7 @@ trans.sr = UI/PreferencesUI/Serbian.lproj/Localizable.strings
trans.sv = UI/PreferencesUI/Swedish.lproj/Localizable.strings
trans.tr_TR = UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings
trans.uk = UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
trans.zh_CN = UI/PreferencesUI/ChineseChina.lproj/Localizable.strings
trans.zh_TW = UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings
[sogo.ui-scheduler]
......@@ -110,6 +112,7 @@ trans.sr = UI/Scheduler/Serbian.lproj/Localizable.strings
trans.sv = UI/Scheduler/Swedish.lproj/Localizable.strings
trans.tr_TR = UI/Scheduler/TurkishTurkey.lproj/Localizable.strings
trans.uk = UI/Scheduler/Ukrainian.lproj/Localizable.strings
trans.zh_CN = UI/Scheduler/ChineseChina.lproj/Localizable.strings
trans.zh_TW = UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings
[sogo.ui-contacts]
......@@ -147,6 +150,7 @@ trans.sr = UI/Contacts/Serbian.lproj/Localizable.strings
trans.sv = UI/Contacts/Swedish.lproj/Localizable.strings
trans.tr_TR = UI/Contacts/TurkishTurkey.lproj/Localizable.strings
trans.uk = UI/Contacts/Ukrainian.lproj/Localizable.strings
trans.zh_CN = UI/Contacts/ChineseChina.lproj/Localizable.strings
trans.zh_TW = UI/Contacts/ChineseTaiwan.lproj/Localizable.strings
[sogo.ui-mainui]
......@@ -184,6 +188,7 @@ trans.sr = UI/MainUI/Serbian.lproj/Localizable.strings
trans.sv = UI/MainUI/Swedish.lproj/Localizable.strings
trans.tr_TR = UI/MainUI/TurkishTurkey.lproj/Localizable.strings
trans.uk = UI/MainUI/Ukrainian.lproj/Localizable.strings
trans.zh_CN = UI/MainUI/ChineseChina.lproj/Localizable.strings
trans.zh_TW = UI/MainUI/ChineseTaiwan.lproj/Localizable.strings
[sogo.ui-common]
......@@ -221,6 +226,7 @@ trans.sr = UI/Common/Serbian.lproj/Localizable.strings
trans.sv = UI/Common/Swedish.lproj/Localizable.strings
trans.tr_TR = UI/Common/TurkishTurkey.lproj/Localizable.strings
trans.uk = UI/Common/Ukrainian.lproj/Localizable.strings
trans.zh_CN = UI/Common/ChineseChina.lproj/Localizable.strings
trans.zh_TW = UI/Common/ChineseTaiwan.lproj/Localizable.strings
[sogo.ui-administrationui]
......@@ -258,6 +264,7 @@ trans.sr = UI/AdministrationUI/Serbian.lproj/Localizable.strings
trans.sv = UI/AdministrationUI/Swedish.lproj/Localizable.strings
trans.tr_TR = UI/AdministrationUI/TurkishTurkey.lproj/Localizable.strings
trans.uk = UI/AdministrationUI/Ukrainian.lproj/Localizable.strings
trans.zh_CN = UI/AdministrationUI/ChineseChina.lproj/Localizable.strings
trans.zh_TW = UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings
[sogo.soobjects-appointments]
......@@ -295,6 +302,7 @@ trans.sr = SoObjects/Appointments/Serbian.lproj/Localizable.strings
trans.sv = SoObjects/Appointments/Swedish.lproj/Localizable.strings
trans.tr_TR = SoObjects/Appointments/TurkishTurkey.lproj/Localizable.strings
trans.uk = SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
trans.zh_CN = SoObjects/Appointments/ChineseChina.lproj/Localizable.strings
trans.zh_TW = SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings
[sogo.soobjects-contacts]
......@@ -332,6 +340,7 @@ trans.sr = SoObjects/Contacts/Serbian.lproj/Localizable.strings
trans.sv = SoObjects/Contacts/Swedish.lproj/Localizable.strings
trans.tr_TR = SoObjects/Contacts/TurkishTurkey.lproj/Localizable.strings
trans.uk = SoObjects/Contacts/Ukrainian.lproj/Localizable.strings
trans.zh_CN = SoObjects/Contacts/ChineseChina.lproj/Localizable.strings
trans.zh_TW = SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings
[sogo.soobjects-mailer]
......@@ -369,6 +378,7 @@ trans.sr = SoObjects/Mailer/Serbian.lproj/Localizable.strings
trans.sv = SoObjects/Mailer/Swedish.lproj/Localizable.strings
trans.tr_TR = SoObjects/Mailer/TurkishTurkey.lproj/Localizable.strings
trans.uk = SoObjects/Mailer/Ukrainian.lproj/Localizable.strings
trans.zh_CN = SoObjects/Mailer/ChineseChina.lproj/Localizable.strings
trans.zh_TW = SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings
[sogo.ui-mailpartviewers]
......@@ -406,4 +416,5 @@ trans.sr = UI/MailPartViewers/Serbian.lproj/Localizable.strings
trans.sv = UI/MailPartViewers/Swedish.lproj/Localizable.strings
trans.tr_TR = UI/MailPartViewers/TurkishTurkey.lproj/Localizable.strings
trans.uk = UI/MailPartViewers/Ukrainian.lproj/Localizable.strings
trans.zh_CN = UI/MailPartViewers/ChineseChina.lproj/Localizable.strings
trans.zh_TW = UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings
......@@ -2592,7 +2592,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{
int t;
[self logWithFormat: @"Sleeping %d seconds while detecting changes in Sync...", internalInterval-total_sleep];
[self logWithFormat: @"Sleeping %d seconds while detecting changes for user %@ in Sync...", internalInterval-total_sleep, [[context activeUser] login]];
for (t = 0; t < sleepInterval; t++)
{
......
......@@ -2465,7 +2465,7 @@ void handle_eas_terminate(int signum)
{
int t;
[self logWithFormat: @"Sleeping %d seconds while detecting changes in Ping...", internalInterval-total_sleep];
[self logWithFormat: @"Sleeping %d seconds while detecting changes for user %@ in Ping...", internalInterval-total_sleep, [[context activeUser] login]];
for (t = 0; t < sleepInterval; t++)
{
......
commit d278fc99250410de6278afd40e41538a13ec3c1a
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed Oct 18 11:11:05 2017 -0400
Preparation for release 2.3.23
M Documentation/docinfo.xml
M Documentation/includes/global-attributes.asciidoc
M NEWS
M Version
commit 5aa36a6d28ca1cf5194dbb84575e5270f7800875
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed Oct 18 11:07:42 2017 -0400
(i18n) Update translations
M SoObjects/Appointments/Croatian.lproj/Localizable.strings
M SoObjects/Appointments/Czech.lproj/Localizable.strings
M SoObjects/Appointments/Slovak.lproj/Localizable.strings
M SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings
M SoObjects/Appointments/TurkishTurkey.lproj/Localizable.strings
M SoObjects/Contacts/Croatian.lproj/Localizable.strings
M UI/AdministrationUI/Croatian.lproj/Localizable.strings
M UI/AdministrationUI/Czech.lproj/Localizable.strings
M UI/AdministrationUI/Slovak.lproj/Localizable.strings
M UI/AdministrationUI/TurkishTurkey.lproj/Localizable.strings
M UI/Common/Croatian.lproj/Localizable.strings
M UI/Common/Czech.lproj/Localizable.strings
M UI/Common/English.lproj/Localizable.strings
M UI/Common/French.lproj/Localizable.strings
M UI/Common/German.lproj/Localizable.strings
M UI/Common/Latvian.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/SpanishSpain.lproj/Localizable.strings
M UI/Common/TurkishTurkey.lproj/Localizable.strings
M UI/Contacts/Croatian.lproj/Localizable.strings
M UI/Contacts/Czech.lproj/Localizable.strings
M UI/Contacts/English.lproj/Localizable.strings
M UI/Contacts/German.lproj/Localizable.strings
M UI/Contacts/Latvian.lproj/Localizable.strings
M UI/Contacts/Polish.lproj/Localizable.strings
M UI/Contacts/Russian.lproj/Localizable.strings
M UI/Contacts/Slovak.lproj/Localizable.strings
M UI/Contacts/SpanishSpain.lproj/Localizable.strings
M UI/Contacts/TurkishTurkey.lproj/Localizable.strings
M UI/MailPartViewers/Croatian.lproj/Localizable.strings
M UI/MailPartViewers/Czech.lproj/Localizable.strings
M UI/MailPartViewers/Slovak.lproj/Localizable.strings
M UI/MailPartViewers/TurkishTurkey.lproj/Localizable.strings
M UI/MailerUI/Croatian.lproj/Localizable.strings
M UI/MailerUI/Czech.lproj/Localizable.strings
M UI/MailerUI/English.lproj/Localizable.strings
M UI/MailerUI/Slovak.lproj/Localizable.strings
M UI/MailerUI/SpanishSpain.lproj/Localizable.strings
M UI/MailerUI/TurkishTurkey.lproj/Localizable.strings
M UI/MainUI/Croatian.lproj/Localizable.strings
M UI/MainUI/English.lproj/Localizable.strings
M UI/PreferencesUI/Croatian.lproj/Localizable.strings
M UI/PreferencesUI/English.lproj/Localizable.strings
M UI/Scheduler/Croatian.lproj/Localizable.strings
M UI/Scheduler/Czech.lproj/Localizable.strings
M UI/Scheduler/French.lproj/Localizable.strings
M UI/Scheduler/German.lproj/Localizable.strings
M UI/Scheduler/Latvian.lproj/Localizable.strings
M UI/Scheduler/Polish.lproj/Localizable.strings
M UI/Scheduler/Russian.lproj/Localizable.strings
M UI/Scheduler/Slovak.lproj/Localizable.strings
M UI/Scheduler/SpanishSpain.lproj/Localizable.strings
M UI/Scheduler/TurkishTurkey.lproj/Localizable.strings
commit ececdda8ceaf1aa4ac9cd5e727e36453861b7792
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed Oct 18 10:37:05 2017 -0400
(js) Update CKEditor to version 4.7.3
M NEWS
M UI/WebServerResources/ckeditor/build-config.js
M UI/WebServerResources/ckeditor/ckeditor.js
M UI/WebServerResources/ckeditor/config.js
M UI/WebServerResources/ckeditor/lang/ar.js
M UI/WebServerResources/ckeditor/lang/ca.js
M UI/WebServerResources/ckeditor/lang/cs.js
M UI/WebServerResources/ckeditor/lang/cy.js
M UI/WebServerResources/ckeditor/lang/da.js
M UI/WebServerResources/ckeditor/lang/de.js
M UI/WebServerResources/ckeditor/lang/en.js
M UI/WebServerResources/ckeditor/lang/es.js
M UI/WebServerResources/ckeditor/lang/eu.js
M UI/WebServerResources/ckeditor/lang/fi.js
M UI/WebServerResources/ckeditor/lang/fr.js
M UI/WebServerResources/ckeditor/lang/he.js
M UI/WebServerResources/ckeditor/lang/hr.js
M UI/WebServerResources/ckeditor/lang/hu.js
M UI/WebServerResources/ckeditor/lang/is.js
M UI/WebServerResources/ckeditor/lang/it.js
M UI/WebServerResources/ckeditor/lang/lt.js
M UI/WebServerResources/ckeditor/lang/lv.js
M UI/WebServerResources/ckeditor/lang/mk.js
M UI/WebServerResources/ckeditor/lang/nb.js
M UI/WebServerResources/ckeditor/lang/nl.js
M UI/WebServerResources/ckeditor/lang/no.js
M UI/WebServerResources/ckeditor/lang/pl.js
M UI/WebServerResources/ckeditor/lang/pt-br.js
M UI/WebServerResources/ckeditor/lang/pt.js
M UI/WebServerResources/ckeditor/lang/ru.js
M UI/WebServerResources/ckeditor/lang/sk.js
M UI/WebServerResources/ckeditor/lang/sl.js
M UI/WebServerResources/ckeditor/lang/sr.js
M UI/WebServerResources/ckeditor/lang/sv.js
M UI/WebServerResources/ckeditor/lang/tr.js
M UI/WebServerResources/ckeditor/lang/uk.js
M UI/WebServerResources/ckeditor/lang/zh-cn.js
M UI/WebServerResources/ckeditor/lang/zh.js
M UI/WebServerResources/ckeditor/plugins/pastefromword/filter/default.js
M UI/WebServerResources/ckeditor/plugins/scayt/dialogs/options.js
M UI/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.js
M UI/WebServerResources/ckeditor/skins/minimalist/editor.css
M UI/WebServerResources/ckeditor/skins/minimalist/editor_gecko.css
M UI/WebServerResources/ckeditor/skins/minimalist/editor_ie.css
M UI/WebServerResources/ckeditor/skins/minimalist/editor_ie7.css
M UI/WebServerResources/ckeditor/skins/minimalist/editor_ie8.css
M UI/WebServerResources/ckeditor/skins/minimalist/editor_iequirks.css
M UI/WebServerResources/ckeditor/styles.js
commit fe80f1e7296b694a8f98b1d5920320c44175144a
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed Oct 18 09:38:08 2017 -0400
Updated NEWS
M NEWS
commit 5cd3a8f245fab623a2eacff606f8936ef83d1302
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed Oct 18 09:33:44 2017 -0400
(fix) generalized HTML sanitization to avoid encoding issues when replying/forwarding mails
M SoObjects/Mailer/NSData+Mail.h
M SoObjects/Mailer/NSData+Mail.m
M SoObjects/Mailer/SOGoMailObject+Draft.m
M UI/MailPartViewers/UIxMailPartHTMLViewer.m
commit a2f84f1358a42b9ae48c985a2605ed78a3e7e30c
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu Oct 12 10:19:01 2017 -0400
Fix yearly recurrences calculator with until date
M NEWS
M SOPE/NGCards/iCalYearlyRecurrenceCalculator.m
commit 388298493fbeb7e23cf2f34528c44db3158b1dfa
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue Oct 3 09:16:12 2017 -0400
Updated NEWS
M NEWS
commit 1085e55f825653230f1a5d5ba812bbd0fa6a826c
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue Oct 3 09:13:56 2017 -0400
(fix) properly extract IMAP folder name (fixes #4275)
M SoObjects/Mailer/SOGoMailAccount.m
commit 5ca9a90a65a0f4ae3f4fcf87685449336145d147
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri Sep 22 10:36:01 2017 -0400
(fix) fixed previous commit
M ActiveSync/SOGoActiveSyncDispatcher+Sync.m
M ActiveSync/SOGoActiveSyncDispatcher.m
commit f5a28ca3255937c140fb902ce12ac3e04549852c
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu Sep 21 14:00:28 2017 -0400
(feat) more verbose output
M ActiveSync/SOGoActiveSyncDispatcher+Sync.m
M ActiveSync/SOGoActiveSyncDispatcher.m
commit c43411ae1e71ec9e9d9b8c1de41d4ad69ff27ec1
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue Sep 12 05:39:47 2017 -0400
Typo
Fixes #4284
M Tools/SOGoToolManageACL.m
commit 71574221250dcc7d6c3d17ea0037cad71b4f9312
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed Sep 6 09:02:59 2017 -0400
Add Latvian (lv) translation (cont'd)
A UI/Templates/SOGoACLLatvianAdditionAdvisory.wox
A UI/Templates/SOGoACLLatvianModificationAdvisory.wox
A UI/Templates/SOGoACLLatvianRemovalAdvisory.wox
A UI/Templates/SOGoFolderLatvianAdditionAdvisory.wox
A UI/Templates/SOGoFolderLatvianRemovalAdvisory.wox
commit 2249562caa6777571a17210976551f357c03ee50
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed Sep 6 09:01:23 2017 -0400
Add Simplified Chinese translation (cont'd)
A SoObjects/Mailer/SOGoMailChineseChinaForward.wo/SOGoMailChineseChinaForward.html
A SoObjects/Mailer/SOGoMailChineseChinaForward.wo/SOGoMailChineseChinaForward.wod
A SoObjects/Mailer/SOGoMailChineseChinaReply.wo/SOGoMailChineseChinaReply.html
A SoObjects/Mailer/SOGoMailChineseChinaReply.wo/SOGoMailChineseChinaReply.wod
A UI/Templates/SOGoACLChineseChinaAdditionAdvisory.wox
A UI/Templates/SOGoACLChineseChinaModificationAdvisory.wox
A UI/Templates/SOGoACLChineseChinaRemovalAdvisory.wox
A UI/Templates/SOGoFolderChineseChinaAdditionAdvisory.wox
A UI/Templates/SOGoFolderChineseChinaRemovalAdvisory.wox
commit fed96dee4274689f0f346ee8e936e1ccaea631d3
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue Sep 5 13:52:52 2017 -0400
Update Welsh translation
M UI/MainUI/Welsh.lproj/Locale
M UI/Scheduler/Welsh.lproj/Localizable.strings
commit 51ebf737dba110811693cc01bed4ec434e86269c
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue Sep 5 13:35:43 2017 -0400
Update README for new ChineseChina translation
M NEWS
commit e80f5b6beb7e552770365b66c29954f792fadee5
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue Sep 5 13:34:29 2017 -0400
Add Simplified Chinese (zh_CN) translation
M .tx/config
A SoObjects/Appointments/ChineseChina.lproj/Localizable.strings
A SoObjects/Contacts/ChineseChina.lproj/Localizable.strings
A SoObjects/Mailer/ChineseChina.lproj/Localizable.strings
M SoObjects/Mailer/GNUmakefile
M SoObjects/Mailer/SOGoMailForward.h
M SoObjects/Mailer/SOGoMailForward.m
M SoObjects/Mailer/SOGoMailReply.h
M SoObjects/Mailer/SOGoMailReply.m
M SoObjects/SOGo/SOGoDefaults.plist
M Tests/Integration/preferences.py
A UI/AdministrationUI/ChineseChina.lproj/Localizable.strings
A UI/Common/ChineseChina.lproj/Localizable.strings
A UI/Contacts/ChineseChina.lproj/Localizable.strings
A UI/MailPartViewers/ChineseChina.lproj/Localizable.strings
A UI/MailerUI/ChineseChina.lproj/Localizable.strings
M UI/MainUI/Arabic.lproj/Localizable.strings
M UI/MainUI/Basque.lproj/Localizable.strings
M UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings
M UI/MainUI/Catalan.lproj/Localizable.strings
A UI/MainUI/ChineseChina.lproj/Locale
A UI/MainUI/ChineseChina.lproj/Localizable.strings
M UI/MainUI/ChineseTaiwan.lproj/Locale
M UI/MainUI/ChineseTaiwan.lproj/Localizable.strings
M UI/MainUI/Croatian.lproj/Localizable.strings
M UI/MainUI/Czech.lproj/Localizable.strings
M UI/MainUI/Danish.lproj/Localizable.strings
M UI/MainUI/Dutch.lproj/Localizable.strings
M UI/MainUI/English.lproj/Localizable.strings
M UI/MainUI/Finnish.lproj/Localizable.strings
M UI/MainUI/French.lproj/Localizable.strings
M UI/MainUI/German.lproj/Localizable.strings
M UI/MainUI/Hebrew.lproj/Localizable.strings
M UI/MainUI/Hungarian.lproj/Localizable.strings
M UI/MainUI/Icelandic.lproj/Localizable.strings
M UI/MainUI/Italian.lproj/Localizable.strings
M UI/MainUI/Latvian.lproj/Localizable.strings
M UI/MainUI/Lithuanian.lproj/Localizable.strings
M UI/MainUI/Macedonian.lproj/Localizable.strings
M UI/MainUI/NorwegianBokmal.lproj/Localizable.strings
M UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings
M UI/MainUI/Polish.lproj/Localizable.strings
M UI/MainUI/Portuguese.lproj/Localizable.strings
M UI/MainUI/Russian.lproj/Localizable.strings
M UI/MainUI/Serbian.lproj/Localizable.strings
M UI/MainUI/Slovak.lproj/Localizable.strings
M UI/MainUI/Slovenian.lproj/Localizable.strings
M UI/MainUI/SpanishArgentina.lproj/Localizable.strings
M UI/MainUI/SpanishSpain.lproj/Localizable.strings
M UI/MainUI/Swedish.lproj/Localizable.strings
M UI/MainUI/TurkishTurkey.lproj/Localizable.strings
M UI/MainUI/Ukrainian.lproj/Localizable.strings
M UI/MainUI/Welsh.lproj/Localizable.strings
M UI/PreferencesUI/Arabic.lproj/Localizable.strings
M UI/PreferencesUI/Basque.lproj/Localizable.strings
M UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
M UI/PreferencesUI/Catalan.lproj/Localizable.strings
A UI/PreferencesUI/ChineseChina.lproj/Localizable.strings
M UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings
M UI/PreferencesUI/Croatian.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/Hebrew.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/Latvian.lproj/Localizable.strings
M UI/PreferencesUI/Lithuanian.lproj/Localizable.strings
M UI/PreferencesUI/Macedonian.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/Portuguese.lproj/Localizable.strings
M UI/PreferencesUI/Russian.lproj/Localizable.strings
M UI/PreferencesUI/Serbian.lproj/Localizable.strings
M UI/PreferencesUI/Slovak.lproj/Localizable.strings
M UI/PreferencesUI/Slovenian.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/TurkishTurkey.lproj/Localizable.strings
M UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
M UI/PreferencesUI/Welsh.lproj/Localizable.strings
A UI/Scheduler/ChineseChina.lproj/Localizable.strings
M UI/Scheduler/English.lproj/Localizable.strings
M configure
commit e62fd3665350d9186ea7366755a458aaea958e11
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue Aug 29 15:09:53 2017 -0400
(js) Add @ prefix to group id prior to removal
This fixes the issue of deleting an unknown group.
M UI/WebServerResources/UIxAclEditor.js
commit 88f964cebd8e7f33dae2a11fbe41db430165240a
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue Aug 29 15:09:08 2017 -0400
Improve cache cleanup when removing a group ACL
M SoObjects/SOGo/SOGoGCSFolder.m
commit 4309b08c756bbae1a2335378936986970ebe4ff7
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue Aug 29 11:07:55 2017 -0400
Updated NEWS
M NEWS
commit f3cf29ea1fa0d12c8b7fa28cc35f90f8adfcea22
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue Aug 29 11:06:36 2017 -0400
(fix) correctly handle "Day of the month" constraint
M UI/Scheduler/UIxComponentEditor.m
commit 7d190e537e0f6421c810e3066992728d1bea0fad
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed Aug 23 15:45:14 2017 -0400
(fix) properly encode MIME parts with embedded images in HTML parts (fixes #4150)
Conflicts:
SoObjects/Mailer/NSString+Mail.m
SoObjects/Mailer/SOGoDraftObject.m
M SoObjects/Mailer/NSString+Mail.m
M SoObjects/Mailer/SOGoDraftObject.m
commit c915bc7c9554631cd1f118c11577db809d25be07
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue Aug 22 10:02:28 2017 -0400
Simplify sanitization of accepted HTML attributes
M UI/MailPartViewers/UIxMailPartHTMLViewer.m
commit 630befd23baefbf78a54458ba4a8b2ea3f45c82d
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue Aug 15 09:18:37 2017 -0400
Updated NEWS
M NEWS
commit edaa0f3956c71bc692c321e81c71bbc49426cdd8
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon Aug 14 14:25:52 2017 -0400
(fix) use NSInteger instead, more clean
M SoObjects/Appointments/SOGoAppointmentFolder.m
commit e1791ac8f54f61ca4afe6b2b04f947b841795815
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon Aug 14 13:59:16 2017 -0400
(fix) offset can be negative (fixes #4237)
M SoObjects/Appointments/SOGoAppointmentFolder.m
commit 44dbb30ffe5947cb32211335c57a105b59553946
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon Jul 31 12:16:05 2017 -0400
(js) Disable autogrow plugin in CKEditor
Fixes #4239
M UI/WebServerResources/ckeditor/config.js
commit b5bb9e86e3549bcffebd9db7b9239ce4995e2ffe
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu Jul 20 14:02:54 2017 -0400
Update ChangeLog
M ChangeLog
commit 938fd3a6f44973de06a4e897e46ebbab3c368beb
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu Jul 20 14:02:37 2017 -0400
<!-- TODO have the build system take care of this -->
<releaseinfo>Version 2.3.22 - July 2017</releaseinfo>
<subtitle>for version 2.3.22</subtitle>
<date>2017-07-20</date>
<releaseinfo>Version 2.3.23 - October 2017</releaseinfo>
<subtitle>for version 2.3.23</subtitle>
<date>2017-10-18</date>
<legalnotice>
<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".</para>
......
......@@ -13,6 +13,6 @@
// TODO have the build system take care of this
:release_version: 2.3.22
:release_version: 2.3.23
// vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
2.3.23 (2017-10-18)
-------------------
Enhancements
- [web] added Simplified Chinese (zh_CN) translation - thanks to Thomas Kuiper
- [web] updated CKEditor to version 4.7.3
Bug fixes
- [core] yearly repeating events are not shown in web calendar (#4237)
- [core] correctly handle "Last day of the month" recurrence rule
- [core] fixed yearly recurrence calculator with until date
- [core] generalized HTML sanitization to avoid encoding issues when replying/forwarding mails
- [eas] avoid sync requests for shared folders every second (#4275)
2.3.22 (2017-07-20)
-------------------
......
......@@ -91,7 +91,7 @@
if ([lastDate compare: rStart] == NSOrderedAscending)
// Range starts after last occurrence
return nil;
if ([lastDate compare: rEnd] == NSOrderedDescending)
if ([lastDate compare: rEnd] == NSOrderedAscending)
// Range ends after last occurence; adjust end date
rEnd = lastDate;
}
......@@ -212,14 +212,17 @@
months: 0
days: 0];
[start setTimeZone: [firStart timeZone]];
end = [start addTimeInterval: [firstRange duration]];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: start
endDate: end];
if ([_r doesIntersectWithDateRange: r] && (repeatCount == 0 || count < repeatCount))
{
[ranges addObject: r];
count++;
}
if ([start compare: rEnd] == NSOrderedAscending)
{
end = [start addTimeInterval: [firstRange duration]];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: start
endDate: end];
if ([_r doesIntersectWithDateRange: r] && (repeatCount == 0 || count < repeatCount))
{
[ranges addObject: r];
count++;
}
}
}
}
else
......
"Inviting the following persons is prohibited:" = "禁止邀请下列人员:";
"Personal Calendar" = "个人日程";
vevent_class0 = "(公开事件)";
vevent_class1 = "(私人事件)";
vevent_class2 = "(机密事件)";
vtodo_class0 = "(公开任务)";
vtodo_class1 = "(私人任务)";
vtodo_class2 = "(机密任务)";
/* Receipts */
"The event \"%{Summary}\" was created" = "事件\"%{Summary}\"已创建";