From 8bd8af947d42547d6d6cff101a8987b8ff7d1e89 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 19 Jul 2019 13:29:52 -0400 Subject: [PATCH] Update ChangeLog --- ChangeLog | 1162 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 1114 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index f17ba427fa..7362cd6a18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1069 @@ +commit 4cb43552a6fc274581cde90528aeaa15f6d59296 +Author: Francis Lachapelle +Date: Fri Jul 19 13:22:16 2019 -0400 + + Preparation for release 4.0.8 + +M Documentation/docinfo.xml +M Documentation/includes/global-attributes.asciidoc +M NEWS +M UI/WebServerResources/css/theme-default.css +M Version + +commit 94eeca2917748891ed6b2e55f43982e2b1243690 +Author: Francis Lachapelle +Date: Fri Jul 19 13:19:43 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/css/styles.css +M UI/WebServerResources/css/styles.css.map +M UI/WebServerResources/js/Common.js +M UI/WebServerResources/js/Common.js.map +M UI/WebServerResources/js/Scheduler.services.js +M UI/WebServerResources/js/Scheduler.services.js.map + +commit 1351e0953b99a645b48e68ab783fd324398440c8 +Author: Francis Lachapelle +Date: Fri Jul 19 13:15:39 2019 -0400 + + (doc) Remove references to OpenChange + +M Documentation/SOGoInstallationGuide.asciidoc +M Documentation/images/architecture.png + +commit 8b6b9d80af013119c3ae788d4b6b4c5eb287739c +Author: Francis Lachapelle +Date: Fri Jul 19 12:50:18 2019 -0400 + + (i18n) Update translations + +M SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings +M SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings +M SoObjects/Appointments/Dutch.lproj/Localizable.strings +M SoObjects/Appointments/French.lproj/Localizable.strings +M SoObjects/Appointments/Hungarian.lproj/Localizable.strings +M SoObjects/Appointments/Latvian.lproj/Localizable.strings +M SoObjects/Appointments/Macedonian.lproj/Localizable.strings +M SoObjects/Appointments/Polish.lproj/Localizable.strings +M SoObjects/Appointments/Serbian.lproj/Localizable.strings +M SoObjects/Appointments/Swedish.lproj/Localizable.strings +M SoObjects/Contacts/Swedish.lproj/Localizable.strings +M SoObjects/Mailer/BrazilianPortuguese.lproj/Localizable.strings +M SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings +M SoObjects/Mailer/Dutch.lproj/Localizable.strings +M SoObjects/Mailer/French.lproj/Localizable.strings +M SoObjects/Mailer/Hungarian.lproj/Localizable.strings +M SoObjects/Mailer/Latvian.lproj/Localizable.strings +M SoObjects/Mailer/Macedonian.lproj/Localizable.strings +M SoObjects/Mailer/Polish.lproj/Localizable.strings +M SoObjects/Mailer/Serbian.lproj/Localizable.strings +M SoObjects/Mailer/Swedish.lproj/Localizable.strings +M UI/AdministrationUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings +M UI/AdministrationUI/Dutch.lproj/Localizable.strings +M UI/AdministrationUI/French.lproj/Localizable.strings +M UI/AdministrationUI/Hungarian.lproj/Localizable.strings +M UI/AdministrationUI/Latvian.lproj/Localizable.strings +M UI/AdministrationUI/Macedonian.lproj/Localizable.strings +M UI/AdministrationUI/Polish.lproj/Localizable.strings +M UI/AdministrationUI/Serbian.lproj/Localizable.strings +M UI/AdministrationUI/Swedish.lproj/Localizable.strings +M UI/Common/BrazilianPortuguese.lproj/Localizable.strings +M UI/Common/ChineseTaiwan.lproj/Localizable.strings +M UI/Common/Dutch.lproj/Localizable.strings +M UI/Common/French.lproj/Localizable.strings +M UI/Common/Hungarian.lproj/Localizable.strings +M UI/Common/Latvian.lproj/Localizable.strings +M UI/Common/Macedonian.lproj/Localizable.strings +M UI/Common/Polish.lproj/Localizable.strings +M UI/Common/Serbian.lproj/Localizable.strings +M UI/Common/Swedish.lproj/Localizable.strings +M UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings +M UI/Contacts/ChineseTaiwan.lproj/Localizable.strings +M UI/Contacts/Dutch.lproj/Localizable.strings +M UI/Contacts/French.lproj/Localizable.strings +M UI/Contacts/Hungarian.lproj/Localizable.strings +M UI/Contacts/Latvian.lproj/Localizable.strings +M UI/Contacts/Macedonian.lproj/Localizable.strings +M UI/Contacts/Polish.lproj/Localizable.strings +M UI/Contacts/Serbian.lproj/Localizable.strings +M UI/Contacts/Swedish.lproj/Localizable.strings +M UI/MailPartViewers/BrazilianPortuguese.lproj/Localizable.strings +M UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings +M UI/MailPartViewers/Swedish.lproj/Localizable.strings +M UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings +M UI/MailerUI/Dutch.lproj/Localizable.strings +M UI/MailerUI/French.lproj/Localizable.strings +M UI/MailerUI/Hungarian.lproj/Localizable.strings +M UI/MailerUI/Latvian.lproj/Localizable.strings +M UI/MailerUI/Macedonian.lproj/Localizable.strings +M UI/MailerUI/Polish.lproj/Localizable.strings +M UI/MailerUI/Serbian.lproj/Localizable.strings +M UI/MailerUI/Swedish.lproj/Localizable.strings +M UI/MainUI/Latvian.lproj/Localizable.strings +M UI/PreferencesUI/Latvian.lproj/Localizable.strings +M UI/PreferencesUI/Swedish.lproj/Localizable.strings +M UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +M UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings +M UI/Scheduler/Dutch.lproj/Localizable.strings +M UI/Scheduler/Hungarian.lproj/Localizable.strings +M UI/Scheduler/Latvian.lproj/Localizable.strings +M UI/Scheduler/Macedonian.lproj/Localizable.strings +M UI/Scheduler/Serbian.lproj/Localizable.strings +M UI/Scheduler/Swedish.lproj/Localizable.strings + +commit 60247e83e7da798bb7292521694812a6ea12ff0f +Author: Francis Lachapelle +Date: Tue Jul 9 16:15:16 2019 -0400 + + (i18n) Update German translation + +M SoObjects/Appointments/German.lproj/Localizable.strings +M SoObjects/Mailer/German.lproj/Localizable.strings +M UI/AdministrationUI/German.lproj/Localizable.strings +M UI/Common/German.lproj/Localizable.strings +M UI/Contacts/German.lproj/Localizable.strings +M UI/MailerUI/German.lproj/Localizable.strings +M UI/Scheduler/German.lproj/Localizable.strings + +commit 789b4f9c36ee1a6d9b3dd95ea55b7fb5232b3714 +Author: InverseBot +Date: Tue Jul 9 01:51:56 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/css/styles.css +M UI/WebServerResources/css/styles.css.map +M UI/WebServerResources/js/Common.js +M UI/WebServerResources/js/Common.js.map +M UI/WebServerResources/js/Scheduler.services.js +M UI/WebServerResources/js/Scheduler.services.js.map + +commit f2069a61294ace085b0b910b96f4d1591ef723ce +Author: Francis Lachapelle +Date: Mon Jul 8 13:04:15 2019 -0400 + + Reduce usage of calendar color in dialogs + +M NEWS +M UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox +M UI/Templates/MailerUI/UIxMailUserRightsEditor.wox +M UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox +M UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox +M UI/Templates/SchedulerUI/UIxAttendeesEditor.wox +M UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox +M UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox +M UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox +M UI/Templates/UIxAclEditor.wox +M UI/WebServerResources/scss/components/list/list.scss +M UI/WebServerResources/scss/views/SchedulerUI.scss + +commit a0cf84fd0b3fb2a3d8164b8be6f17176c232a41f +Author: Francis Lachapelle +Date: Fri Jul 5 16:36:56 2019 -0400 + + (wox) Remove unused block + +M UI/Templates/ContactsUI/UIxContactsUserFolders.wox + +commit 6e040e418b98f5d4b0ef311f5cf02d8bac3ec4d9 +Author: Francis Lachapelle +Date: Fri Jul 5 16:35:20 2019 -0400 + + (js/css) Fix rendering of material icons + +M UI/Templates/AdministrationUI/UIxAdministration.wox +M UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox +M UI/Templates/ContactsUI/UIxContactEditorTemplate.wox +M UI/Templates/ContactsUI/UIxContactFoldersView.wox +M UI/Templates/ContactsUI/UIxContactViewTemplate.wox +M UI/Templates/ContactsUI/UIxContactsUserFolders.wox +M UI/Templates/MailerUI/UIxMailEditor.wox +M UI/Templates/MailerUI/UIxMailFolderTemplate.wox +M UI/Templates/MailerUI/UIxMailViewTemplate.wox +M UI/Templates/SchedulerUI/UIxCalDayView.wox +M UI/Templates/SchedulerUI/UIxCalMainView.wox +M UI/Templates/SchedulerUI/UIxCalMonthView.wox +M UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox +M UI/Templates/SchedulerUI/UIxCalWeekView.wox +M UI/Templates/UIxTopnavToolbar.wox +M UI/WebServerResources/js/Common/sgColorPicker.directive.js +M UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js +M UI/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js +M UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js +M UI/WebServerResources/scss/components/icon/icon.scss + +commit d835a8165cdd0b85974ecc2ded259f92fb6cc302 +Author: Francis Lachapelle +Date: Fri Jul 5 09:38:51 2019 -0400 + + (css) Update grunt-sass to v3.0 + + This release requires Node.js 8 or later. + +M UI/WebServerResources/Gruntfile.js +M UI/WebServerResources/package.json + +commit 73a3bf143adaa64d6e5258a9b2b2c2b86f49a28e +Author: InverseBot +Date: Fri Jul 5 01:09:56 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/js/Scheduler.services.js +M UI/WebServerResources/js/Scheduler.services.js.map + +commit 06319e3d48e06ea7978fcc8c289a8fbb91d02218 +Author: Francis Lachapelle +Date: Thu Jul 4 15:46:01 2019 -0400 + + (js) Use matching address of attendee + + Fixes #4473 + +M NEWS +M UI/WebServerResources/js/Scheduler/Attendees.service.js + +commit e24082183f5b37426f0368835dfd286f42018be6 +Author: Francis Lachapelle +Date: Thu Jul 4 15:10:41 2019 -0400 + + Reflect attendee type with generic icon + +M NEWS +M SoObjects/Contacts/SOGoContactSourceFolder.m +M UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox +M UI/Templates/SchedulerUI/UIxAttendeesEditor.wox +M UI/WebServerResources/js/Scheduler/Attendees.service.js +M UI/WebServerResources/js/Scheduler/ComponentController.js + +commit 5f08b25d9ccc657b80c4b6a8d38d335357c3c6cf +Author: Francis Lachapelle +Date: Thu Jul 4 14:53:39 2019 -0400 + + (font) Update Material Design icons + +M UI/WebServerResources/fonts/MaterialIcons-Regular.eot +M UI/WebServerResources/fonts/MaterialIcons-Regular.ttf +M UI/WebServerResources/fonts/MaterialIcons-Regular.woff +M UI/WebServerResources/fonts/MaterialIcons-Regular.woff2 + +commit 374e53bfe67aae359a339a3d721bae69b07af221 +Author: Francis Lachapelle +Date: Thu Jul 4 11:34:33 2019 -0400 + + (js) Review md theme example (theme.js) + +M UI/WebServerResources/js/theme.js + +commit bc4d189b55da53690997132a658d109c7a60b4b9 +Author: InverseBot +Date: Thu Jul 4 01:09:01 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/js/Mailer.services.js +M UI/WebServerResources/js/Mailer.services.js.map + +commit 613e59397a366260ffc49c260fb9f7948c1e7301 +Author: Francis Lachapelle +Date: Wed Jul 3 13:33:04 2019 -0400 + + (js) Fix missing curly brace + +M UI/WebServerResources/js/Mailer/Mailbox.service.js + +commit 679b5383682bbeeaaecb190f73ff00e7a2f69269 +Author: Francis Lachapelle +Date: Wed Jul 3 13:03:48 2019 -0400 + + (js) Test threadsCollapsed settings before read + +M UI/WebServerResources/js/Mailer/Mailbox.service.js + +commit 6fb26ee2aa07adf69dcd5ace171deada933975df +Author: InverseBot +Date: Sun Jun 30 00:49:36 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/css/styles.css +M UI/WebServerResources/css/styles.css.map +M UI/WebServerResources/js/Common.js +M UI/WebServerResources/js/Common.js.map +M UI/WebServerResources/js/Mailer.js +M UI/WebServerResources/js/Mailer.js.map +M UI/WebServerResources/js/Mailer.services.js +M UI/WebServerResources/js/Mailer.services.js.map +M UI/WebServerResources/js/Preferences.services.js +M UI/WebServerResources/js/Preferences.services.js.map +M UI/WebServerResources/js/vendor/angular-ui-router.js +M UI/WebServerResources/js/vendor/angular-ui-router.js.map +M UI/WebServerResources/js/vendor/angular-ui-router.min.js +M UI/WebServerResources/js/vendor/angular-ui-router.min.js.map + +commit 0fba247bd660a1143b8a4b5931691bc125f35da9 +Author: Francis Lachapelle +Date: Thu Jun 27 17:51:48 2019 -0400 + + (css) Improve messages list + +M UI/WebServerResources/scss/views/MailerUI.scss + +commit b5949752b4cf9474b3866a655643e51d25a4b9be +Author: Francis Lachapelle +Date: Thu Jun 27 17:43:11 2019 -0400 + + (web) Restore mail threads + + Fixes #3478 + Fixes #4616 + Fixes #4735 + +M NEWS +M UI/MailerUI/UIxMailActions.m +M UI/Templates/MailerUI/UIxMailFolderTemplate.wox +M UI/Templates/PreferencesUI/UIxPreferences.wox +M UI/WebServerResources/js/Common/Common.app.js +M UI/WebServerResources/js/Mailer/Mailbox.service.js +M UI/WebServerResources/js/Mailer/Message.service.js +M UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js +M UI/WebServerResources/js/Preferences/Preferences.service.js +M UI/WebServerResources/scss/components/list/list.scss + +commit cc6fcc5fbd109e5f3227d77371e8c7f620c84d1b +Author: Francis Lachapelle +Date: Thu Jun 27 11:56:44 2019 -0400 + + (js) Fix access to sub mailbox on page reload + +M NEWS +M UI/WebServerResources/js/Mailer/Mailer.app.js +M UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js +M UI/WebServerResources/package.json + +commit fd38816a8c8bb223eaf3e7e420fc8b09705412a8 +Author: Francis Lachapelle +Date: Thu Jun 20 11:51:07 2019 -0400 + + (mail) Fix JSON representation of mail threads + +M UI/MailerUI/UIxMailListActions.m + +commit b4544a54dbf618a4137a027193955a13dcefafe4 +Author: Peter Dave Hello +Date: Sat Apr 13 21:10:35 2019 +0800 + + Optimize UI png images losslessly via Google zopflipng + + UI/WebServerResources/img/cardboard-transp.png | Bin 267247 -> 210429 bytes + UI/WebServerResources/img/felt-transp.png | Bin 173179 -> 140451 bytes + UI/WebServerResources/img/inverse.png | Bin 3101 -> 2426 bytes + UI/WebServerResources/img/sogo-logo.png | Bin 5523 -> 2272 bytes + +M UI/WebServerResources/img/cardboard-transp.png +M UI/WebServerResources/img/felt-transp.png +M UI/WebServerResources/img/inverse.png +M UI/WebServerResources/img/sogo-logo.png + +commit dc76b9c6224fb60c1a1c1a6243d07311b1f0dab6 +Author: InverseBot +Date: Wed Jun 19 16:07:30 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/css/styles.css +M UI/WebServerResources/css/styles.css.map +M UI/WebServerResources/js/Common.js +M UI/WebServerResources/js/Common.js.map +M UI/WebServerResources/js/Contacts.js +M UI/WebServerResources/js/Contacts.js.map +M UI/WebServerResources/js/Contacts.services.js +M UI/WebServerResources/js/Contacts.services.js.map +M UI/WebServerResources/js/Mailer.services.js +M UI/WebServerResources/js/Mailer.services.js.map +M UI/WebServerResources/js/Preferences.js +M UI/WebServerResources/js/Preferences.js.map +M UI/WebServerResources/js/Scheduler.services.js +M UI/WebServerResources/js/Scheduler.services.js.map +M UI/WebServerResources/js/vendor/FileSaver.min.js +M UI/WebServerResources/js/vendor/FileSaver.min.js.map +M UI/WebServerResources/js/vendor/angular-file-upload.min.js +M UI/WebServerResources/js/vendor/angular-file-upload.min.js.map + +commit c7ffaf6adb5f072ac104f20b9b03c30db947f58e +Author: Francis Lachapelle +Date: Wed Jun 19 14:26:10 2019 -0400 + + (i18n) Add Indonesian (id) translation + +M .tx/config + +commit bd76715dcbd388666d2ad094c001d8549cad900f +Author: Francis Lachapelle +Date: Tue Jun 18 14:59:39 2019 -0400 + + Update NEWS file + +M NEWS + +commit 0febc1ef1803d1cd873c0790af30584b2bfd0f93 +Author: Francis Lachapelle +Date: Tue Jun 18 14:47:01 2019 -0400 + + (js) Replace bower packages by npm packages + +M NEWS +M UI/WebServerResources/GNUmakefile +M UI/WebServerResources/Gruntfile.js +D UI/WebServerResources/bower.json +M UI/WebServerResources/js/Scheduler/Attendees.service.js +M UI/WebServerResources/package.json + +commit 211385ff4d5adc96e2c2ddbdf4eedd1a7d457c0b +Author: InverseBot +Date: Tue Jun 18 01:13:43 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/css/styles.css +M UI/WebServerResources/css/styles.css.map +M UI/WebServerResources/js/vendor/angular-material.js +M UI/WebServerResources/js/vendor/angular-material.min.js + +commit 16210fb579c6b2fd7c5e705fc477d05acaff41e6 +Author: Francis Lachapelle +Date: Mon Jun 17 12:40:47 2019 -0400 + + (css,js) Update md to v1.1.19 + +M NEWS +M UI/WebServerResources/angular-material +M UI/WebServerResources/bower.json + +commit a746a6b23daf76bdd727cd7cb8cc7c4b0ecaeb3f +Author: Francis Lachapelle +Date: Mon Jun 17 11:43:43 2019 -0400 + + (i18n) Update Catalan translation + + Fixees #4726 + +M SoObjects/Appointments/Catalan.lproj/Localizable.strings +M SoObjects/Mailer/Catalan.lproj/Localizable.strings +M UI/AdministrationUI/Catalan.lproj/Localizable.strings +M UI/Common/Catalan.lproj/Localizable.strings +M UI/Contacts/Catalan.lproj/Localizable.strings +M UI/MailerUI/Catalan.lproj/Localizable.strings +M UI/Scheduler/Catalan.lproj/Localizable.strings + +commit f0c8aa884ce8eb9248c9ec046df27dc7d533eea2 +Author: Francis Lachapelle +Date: Fri Jun 14 10:47:11 2019 -0400 + + (i18n) Add Indonesian (id) translation + +M .tx/config +M NEWS +M README.md +A SoObjects/Appointments/Indonesian.lproj/Localizable.strings +A SoObjects/Contacts/Indonesian.lproj/Localizable.strings +M SoObjects/Mailer/GNUmakefile +A SoObjects/Mailer/Indonesian.lproj/Localizable.strings +M SoObjects/Mailer/SOGoMailForward.h +M SoObjects/Mailer/SOGoMailForward.m +A SoObjects/Mailer/SOGoMailIndonesianForward.wo/SOGoMailIndonesianForward.html +A SoObjects/Mailer/SOGoMailIndonesianForward.wo/SOGoMailIndonesianForward.wod +A SoObjects/Mailer/SOGoMailIndonesianReply.wo/SOGoMailIndonesianReply.html +A SoObjects/Mailer/SOGoMailIndonesianReply.wo/SOGoMailIndonesianReply.wod +M SoObjects/Mailer/SOGoMailReply.h +M SoObjects/Mailer/SOGoMailReply.m +M SoObjects/SOGo/SOGoDefaults.plist +M Tests/Integration/preferences.py +A UI/AdministrationUI/Indonesian.lproj/Localizable.strings +A UI/Common/Indonesian.lproj/Localizable.strings +A UI/Contacts/Indonesian.lproj/Localizable.strings +A UI/MailPartViewers/Indonesian.lproj/Localizable.strings +A UI/MailerUI/Indonesian.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 +M UI/MainUI/ChineseChina.lproj/Localizable.strings +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 +A UI/MainUI/Indonesian.lproj/Locale +A UI/MainUI/Indonesian.lproj/Localizable.strings +M UI/MainUI/Italian.lproj/Localizable.strings +M UI/MainUI/Japanese.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/Romanian.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 +M 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 +A UI/PreferencesUI/Indonesian.lproj/Localizable.strings +M UI/PreferencesUI/Italian.lproj/Localizable.strings +M UI/PreferencesUI/Japanese.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/Romanian.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 +M UI/SOGoUI/SOGoFolderAdvisory.h +M UI/SOGoUI/SOGoFolderAdvisory.m +A UI/Scheduler/Indonesian.lproj/Localizable.strings +A UI/Templates/SOGoACLIndonesianAdditionAdvisory.wox +A UI/Templates/SOGoACLIndonesianModificationAdvisory.wox +A UI/Templates/SOGoACLIndonesianRemovalAdvisory.wox +A UI/Templates/SOGoFolderIndonesianAdditionAdvisory.wox +A UI/Templates/SOGoFolderIndonesianRemovalAdvisory.wox +M configure + +commit 4fc515b22905080576c045faf94352f7b84cbab7 +Author: Ludovic Marcotte +Date: Thu Jun 13 13:54:16 2019 -0400 + + (fix) handle more broken mails (fixes #4513) + +M UI/MailPartViewers/UIxMailPartHTMLViewer.m + +commit 991fac0b9467929359c8bd5262f7be3ed4be000d +Author: InverseBot +Date: Thu Jun 13 01:55:36 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/js/Preferences.services.js + +commit 868057698c51de871b6bf76ada566972afd9d054 +Author: Francis Lachapelle +Date: Wed Jun 12 16:37:43 2019 -0400 + + (js) Allow 2-letter short month names + + Fixes #4766 + +M UI/WebServerResources/js/Preferences/Preferences.service.js + +commit ace0427da7f35545489f9e646c747d24d2d65aa9 +Author: InverseBot +Date: Tue Jun 11 01:53:09 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/js/Common.js +M UI/WebServerResources/js/Common.js.map + +commit 0e918a446aee50a139c827ef2447aafed982ae52 +Author: Francis Lachapelle +Date: Mon Jun 10 13:19:46 2019 -0400 + + Add rel="noopener" to external links + + Fixes #4764 + +M NEWS +M SoObjects/SOGo/NSString+Utilities.m +M UI/MailPartViewers/UIxMailPartHTMLViewer.m +M UI/Templates/ContactsUI/UIxContactViewTemplate.wox +M UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox +M UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox +M UI/WebServerResources/js/Common/txt2html.filter.js + +commit 13b8e53235e0884373b0e0f09499a48db1b63d36 +Author: Janne Heß +Date: Mon Jun 10 01:01:05 2019 +0200 + + configure: Harmonize help and implementation + +M configure + +commit d9de12a9402d260edad39fef10344638e020f26b +Author: Daniel Carlos Silva <45563873+dcsilvagit@users.noreply.github.com> +Date: Tue May 28 11:47:21 2019 -0300 + + Set tooltip for markOrUnMarkMessagesAsJunk button + +M UI/Templates/MailerUI/UIxMailFolderTemplate.wox + +commit 193b73fa26f6330059765ddd9c23b1048a010875 +Author: Daniel Carlos Silva <45563873+dcsilvagit@users.noreply.github.com> +Date: Thu May 23 18:20:10 2019 -0300 + + Update SOGoMailFolder.m + +M SoObjects/Mailer/SOGoMailFolder.m + +commit 6898d11f58017fd4e6633f1c024595dcf64878f0 +Author: Ludovic Marcotte +Date: Thu May 23 15:04:24 2019 -0400 + + (doc) improved doc regarding placeholders + +M Documentation/SOGoInstallationGuide.asciidoc + +commit f57ff869513496c95624ad0c2385c08b58b01b00 +Author: Ludovic Marcotte +Date: Thu May 23 15:02:10 2019 -0400 + + (fix) fixed domain placeholder issue when using sogo-tool (fixes #4723) + +M NEWS +M SoObjects/SOGo/LDAPSource.h +M SoObjects/SOGo/SOGoUserManager.m + +commit 29f5357a2cd5238f0f239db8d6a4ee22b88201bf +Author: Ludovic Marcotte +Date: Thu May 23 09:21:44 2019 -0400 + + (fix) added safety checks in S/MIME (fixes #4745) + +M NEWS +M SoObjects/Mailer/NSData+SMIME.m + +commit 0bb24430e0dbf20baffd28126bd4625b9330f53c +Author: InverseBot +Date: Fri May 17 01:06:34 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/css/styles.css +M UI/WebServerResources/css/styles.css.map +M UI/WebServerResources/js/Common.js +M UI/WebServerResources/js/Common.js.map +M UI/WebServerResources/js/Mailer.services.js +M UI/WebServerResources/js/Mailer.services.js.map + +commit 6e6a82d97465c1718d86c6f15d4d7a29fd9a3384 +Author: Francis Lachapelle +Date: Thu May 16 14:30:32 2019 -0400 + + (js) Show mail compose btn if msgs list is visible + +M NEWS +M UI/Templates/MailerUI/UIxMailFolderTemplate.wox +M UI/WebServerResources/js/Common/navController.js + +commit 05ca00296d6e1547d94c73b6d1ef3956f89d7308 +Author: Francis Lachapelle +Date: Thu May 16 13:53:43 2019 -0400 + + (js) Fix scrolling when deleting a message + +M NEWS +M UI/WebServerResources/js/Mailer/MessageController.js + +commit a4e44e1e652c7ffc7445ebf61e3bce8de04b158b +Author: Francis Lachapelle +Date: Thu May 16 11:26:22 2019 -0400 + + (css) Constrain absolute elements in HTML parts + +M NEWS +M UI/WebServerResources/scss/views/MailerUI.scss + +commit b671c9cc80029edf8fce5be9b6cc2b1252eaca73 +Author: InverseBot +Date: Wed May 15 01:07:31 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/js/vendor/FileSaver.min.js +M UI/WebServerResources/js/vendor/FileSaver.min.js.map + +commit 0e038a62fd7a3d690ded360026aa9957df26a884 +Author: Ludovic Marcotte +Date: Wed May 8 08:09:14 2019 -0400 + + (fix) improve handling of signer certificate (fixes #4742) + +M NEWS +M SoObjects/Mailer/NSData+SMIME.m +M SoObjects/Mailer/SOGoDraftObject.m +M UI/Contacts/UIxContactActions.m +M UI/MailPartViewers/UIxMailPartSignedViewer.m + +commit bad69a0f1a012dc0158c79d8b8da6783d05d6c80 +Author: Florian Beier +Date: Fri Apr 12 01:39:48 2019 +0200 + + Adjust word order + + "schrieb" was in the wrong place, it has to go in front of the contact's name + +M SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.html + +commit ab87e72b4e3f79428b3909854c01d160f20dd2b6 +Author: Francis Lachapelle +Date: Fri Apr 5 08:39:20 2019 -0400 + + (EAS) Fix handling of missing date + + Fixes #4720 + +M ActiveSync/SOGoMailObject+ActiveSync.m + +commit 37efcea5e55382800ee6ef1eb6b7f0d8d94e4644 +Author: InverseBot +Date: Thu Mar 28 01:13:36 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/css/styles.css +M UI/WebServerResources/css/styles.css.map +M UI/WebServerResources/js/Scheduler.services.js +M UI/WebServerResources/js/Scheduler.services.js.map + +commit 42dd956b9f9a9d036d247fa6e4fbec72394d2266 +Author: Francis Lachapelle +Date: Wed Mar 27 09:48:00 2019 -0400 + + (js) Show calendar names in events blocks + + Fixes #4713 + +M UI/Templates/SchedulerUI/UIxCalDayTable.wox +M UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js +M UI/WebServerResources/scss/views/SchedulerUI.scss + +commit f97268486916896ab86f4b4bc4ae528d92d2dfb8 +Author: InverseBot +Date: Sat Mar 23 01:18:20 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/js/Mailer.js +M UI/WebServerResources/js/Mailer.js.map +M UI/WebServerResources/js/Mailer.services.js +M UI/WebServerResources/js/Mailer.services.js.map + +commit 42d3c86a99ec75ffab6f30d030c4a2fb71285fc6 +Author: Francis Lachapelle +Date: Fri Mar 22 13:37:32 2019 -0400 + + (i18n) Add missing localizable strings + +M UI/PreferencesUI/English.lproj/Localizable.strings + +commit 769863b0b93826a724e7e848790c51fda53de667 +Author: Francis Lachapelle +Date: Fri Mar 22 11:58:51 2019 -0400 + + (web) Show hints for mail vacation options + + Fixes #4462 + +M NEWS +M UI/Templates/PreferencesUI/UIxPreferences.wox + +commit efde4b5a5c1ed9aed6cc49655cb075ba5247cae9 +Author: Francis Lachapelle +Date: Fri Mar 22 11:57:57 2019 -0400 + + (js) Allow to fetch unseen count of all mailboxes + + Fixes #522, #2776, #4276 + +M NEWS +M UI/Templates/PreferencesUI/UIxPreferences.wox +M UI/WebServerResources/js/Mailer/MailboxesController.js + +commit c50f22962adb31abb81bab811e1e1e37741e84d3 +Author: Francis Lachapelle +Date: Fri Mar 22 10:36:39 2019 -0400 + + (js) Fix page reload with external IMAP account + + Fixes #4709 + +M NEWS +M UI/WebServerResources/js/Mailer/Account.service.js +M UI/WebServerResources/js/Mailer/Mailer.app.js + +commit 96bcbbdc14f892586b4520265b53d114b9381a08 +Author: Ludovic Marcotte +Date: Thu Mar 21 14:08:44 2019 -0400 + + (fix) consider DAVx5 like Apple Calendar (fixes #4304) + +M NEWS +M SoObjects/SOGo/WORequest+SOGo.m + +commit fcdc4c92c0eb6ad0da32c0595b637088dd3e4b00 +Author: Francis Lachapelle +Date: Thu Mar 21 11:01:17 2019 -0400 + + Improve URLs/emails detection in text mail parts + +M NEWS +M SoObjects/SOGo/NSString+Utilities.h +M SoObjects/SOGo/NSString+Utilities.m + +commit 7acfd8a2cdb9ad02daca860fe151ab9e7fc5b736 +Author: Ludovic Marcotte +Date: Wed Mar 20 13:50:34 2019 -0400 + + Update NEWS file regarding previous commit + +M NEWS + +commit 400212a01d0ffac4c6ed679bb34afc3c4a810413 +Author: InverseBot +Date: Wed Mar 20 01:21:20 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/css/styles.css +M UI/WebServerResources/css/styles.css.map +M UI/WebServerResources/js/Scheduler.services.js +M UI/WebServerResources/js/Scheduler.services.js.map + +commit 597f6366ff67da4cf1080c6194be42c9a8f93ad5 +Author: Francis Lachapelle +Date: Tue Mar 19 14:41:02 2019 -0400 + + Fix saving address book properties + +M NEWS +M UI/Contacts/UIxContactFolderProperties.m + +commit da76344983d4f4536465f64778e77e5715f612eb +Author: Francis Lachapelle +Date: Tue Mar 19 11:30:28 2019 -0400 + + (js) Keep center list visible on xs screen + + For Calendar module. + +M NEWS +M UI/Templates/SchedulerUI/UIxCalMainView.wox +M UI/WebServerResources/js/Scheduler/CalendarsController.js + +commit 254147b9ac0d9d2eae8342c7d5d333e08c17867d +Author: Francis Lachapelle +Date: Tue Mar 19 11:07:33 2019 -0400 + + (css) Fixed scrolling of calendars list on Android + +M NEWS +M UI/WebServerResources/scss/components/list/list.scss + +commit d75fe573b2802f08864858dd28cffe810c79d754 +Author: Ludovic Marcotte +Date: Mon Mar 18 15:46:39 2019 -0400 + + (fix) potential fix for #4289 + +M SoObjects/Appointments/SOGoFreeBusyObject.m + +commit 933cd581ddd9625f1f758736e7cc9eec43c7a799 +Author: Ludovic Marcotte +Date: Mon Mar 18 10:28:33 2019 -0400 + + (fix) avoid exception on recent GNUstep when attached file has no filename (fixes #4702) + +M NEWS +M UI/MailPartViewers/UIxMailPartViewer.m + +commit 6fa7d43e7a3063341d3fc9d3062cb2bae29b1665 +Author: InverseBot +Date: Sat Mar 16 01:18:35 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/css/styles.css +M UI/WebServerResources/css/styles.css.map +M UI/WebServerResources/js/Scheduler.services.js +M UI/WebServerResources/js/Scheduler.services.js.map + +commit 90de39664632f8b799ae2d445ee79431b8c19510 +Author: Francis Lachapelle +Date: Fri Mar 15 16:57:16 2019 -0400 + + (js) Show calendar names in events blocks + + Only for subscriptions + +M NEWS +M UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js + +commit 33adb88d5c62fa19116ba184eca3b91a82a7cad1 +Author: Francis Lachapelle +Date: Fri Mar 15 15:04:00 2019 -0400 + + (css) lowered size of headings on small screens + +M NEWS +M UI/WebServerResources/scss/core/typography.scss + +commit 9a245f18fa9f48a0332bb39a46cce8eb308f81a1 +Author: Francis Lachapelle +Date: Fri Mar 15 13:58:43 2019 -0400 + + (core) Handle multidays events in freebusy data + +M NEWS +M UI/MainUI/SOGoUserHomePage.m + +commit 0d78d3814cf54409e2d8d1900866e913fdeb7777 +Author: Ludovic Marcotte +Date: Fri Mar 15 13:55:41 2019 -0400 + + (fix) correctly handle the full cert chain in S/MIME + +M NEWS +M SoObjects/Mailer/NSData+SMIME.m + +commit 93f344bdbe77aa9e4b3ab4384511be14a0473298 +Author: Ludovic Marcotte +Date: Fri Mar 15 13:44:49 2019 -0400 + + added missing commit + +M SoObjects/SOGo/SOGoSource.h + +commit 008e901ad68a5cde4065b6cfaf43682de4b4ba2f +Author: Ludovic Marcotte +Date: Fri Mar 15 13:35:12 2019 -0400 + + (fix) we update the baseDN placeholders of all LDAP sources upon login + +M SoObjects/SOGo/LDAPSource.m +M SoObjects/SOGo/SOGoUserManager.m + +commit 47456c9ebd1fb0aa2c43bb70c934e7c7bb2d352b +Author: Francis Lachapelle +Date: Wed Mar 13 09:08:31 2019 -0400 + + Allow super users to modify any event + + Fixes #4216 + +M NEWS +M SoObjects/Appointments/SOGoAppointmentObject.m + +commit 826c10de250bd578f806bba3c2a10f039b17cd0e +Author: InverseBot +Date: Tue Mar 12 01:18:08 2019 -0400 + + (js/css) Update generated files + +M UI/WebServerResources/js/vendor/angular-animate.js +M UI/WebServerResources/js/vendor/angular-animate.min.js +M UI/WebServerResources/js/vendor/angular-aria.js +M UI/WebServerResources/js/vendor/angular-aria.min.js +M UI/WebServerResources/js/vendor/angular-cookies.js +M UI/WebServerResources/js/vendor/angular-cookies.min.js +M UI/WebServerResources/js/vendor/angular-messages.js +M UI/WebServerResources/js/vendor/angular-messages.min.js +M UI/WebServerResources/js/vendor/angular-sanitize.js +M UI/WebServerResources/js/vendor/angular-sanitize.min.js +M UI/WebServerResources/js/vendor/angular.js +M UI/WebServerResources/js/vendor/angular.min.js +M UI/WebServerResources/js/vendor/angular.min.js.map + +commit 169b23353b8ee021b1d4e9a90b35fcd817df3d62 +Author: Francis Lachapelle +Date: Thu Mar 7 11:27:06 2019 -0500 + + Update NEWS file + +M NEWS + +commit 97dd4fddf7f0ebb002f3ff242ff43f64aa97acdb +Author: Francis Lachapelle +Date: Thu Mar 7 11:22:00 2019 -0500 + + (web) Fix default calendar categories (reset btn) + +M UI/PreferencesUI/UIxPreferences.m + +commit 3e0910d17529f9bf0749b4d31745da4facd2fad6 +Author: Francis Lachapelle +Date: Thu Mar 7 10:52:04 2019 -0500 + + (web) Keep unlocalized/custom calendar categories + +M UI/PreferencesUI/UIxJSONPreferences.m + +commit f30f107e4e4e1ae6434d36f01adac515492f09c3 +Author: InverseBot +Date: Thu Feb 28 01:13:41 2019 -0500 + + (js/css) Update generated files + +M UI/WebServerResources/js/Common.js +M UI/WebServerResources/js/Common.js.map +M UI/WebServerResources/js/Contacts.services.js +M UI/WebServerResources/js/Contacts.services.js.map +M UI/WebServerResources/js/Mailer.services.js +M UI/WebServerResources/js/Mailer.services.js.map +M UI/WebServerResources/js/Scheduler.services.js +M UI/WebServerResources/js/Scheduler.services.js.map + +commit d93b8ee8576815fe5c0d315eb9c763b089302d32 +Author: Francis Lachapelle +Date: Wed Feb 27 10:51:05 2019 -0500 + + Update ChangeLog + +M ChangeLog + commit ebd9ef4d491a2b9f89ed10188bf48fc85b900437 Author: Francis Lachapelle Date: Wed Feb 27 10:48:45 2019 -0500 @@ -7785,7 +8851,7 @@ Date: Wed Oct 18 09:33:44 2017 -0400 (fix) generalized HTML sanitization to avoid encoding issues when replying/forwarding mails Conflicts: - SoObjects/Mailer/NSData+Mail.m + SoObjects/Mailer/NSData+Mail.m M SoObjects/Mailer/NSData+Mail.h M SoObjects/Mailer/NSData+Mail.m @@ -11179,7 +12245,7 @@ Date: Wed Apr 12 16:13:40 2017 -0400 (fix) enhance display of all-day invitations (fixes #4145) Conflicts: - SoObjects/Appointments/SOGoAptMailNotification.m + SoObjects/Appointments/SOGoAptMailNotification.m M SoObjects/Appointments/English.lproj/Localizable.strings M SoObjects/Appointments/SOGoAptMailNotification.m @@ -14049,7 +15115,7 @@ Date: Wed Dec 28 10:18:10 2016 -0500 Conflicts: - SoObjects/Mailer/SOGoDraftObject.m + SoObjects/Mailer/SOGoDraftObject.m M Documentation/SOGoInstallationGuide.asciidoc M SoObjects/Mailer/SOGoDraftObject.m @@ -25523,7 +26589,7 @@ Date: Wed Mar 16 08:55:21 2016 -0400 Conflicts: - ActiveSync/SOGoMailObject+ActiveSync.m + ActiveSync/SOGoMailObject+ActiveSync.m M ActiveSync/SOGoActiveSyncDispatcher.m M ActiveSync/SOGoMailObject+ActiveSync.m @@ -28437,7 +29503,7 @@ Date: Wed Feb 10 14:46:11 2016 -0500 Add some missing preprocessing #import directives Fixes most GCC warnings of form: - warning: @interface of class ‘MyClass’ not found + warning: @interface of class ‘MyClass’ not found M SoObjects/Appointments/SOGoAppointmentFolder.m M SoObjects/Mailer/SOGoMailAccounts.m @@ -29830,7 +30896,7 @@ Date: Fri Jan 22 14:02:05 2016 -0500 Conflicts: - ActiveSync/iCalEvent+ActiveSync.m + ActiveSync/iCalEvent+ActiveSync.m M ActiveSync/iCalEvent+ActiveSync.m @@ -29842,13 +30908,13 @@ Date: Fri Jan 22 10:30:27 2016 -0500 Conflicts: - NEWS - SoObjects/Mailer/SOGoMailAccount.m - SoObjects/SOGo/SOGoDefaults.plist - SoObjects/SOGo/SOGoUser.m - UI/MailerUI/UIxMailFolderActions.h - UI/MailerUI/UIxMailFolderActions.m - UI/MailerUI/product.plist + NEWS + SoObjects/Mailer/SOGoMailAccount.m + SoObjects/SOGo/SOGoDefaults.plist + SoObjects/SOGo/SOGoUser.m + UI/MailerUI/UIxMailFolderActions.h + UI/MailerUI/UIxMailFolderActions.m + UI/MailerUI/product.plist M Documentation/SOGoInstallationGuide.asciidoc M SoObjects/Mailer/GNUmakefile @@ -29880,7 +30946,7 @@ Date: Fri Jan 22 13:35:02 2016 -0500 Conflicts: - NEWS + NEWS M ActiveSync/SOGoActiveSyncDispatcher+Sync.m M ActiveSync/iCalEvent+ActiveSync.h @@ -30911,9 +31977,9 @@ Date: Thu Jan 7 09:17:35 2016 -0500 Conflicts: - NEWS - SoObjects/SOGo/SOGoUserDefaults.h - SoObjects/SOGo/SOGoUserDefaults.m + NEWS + SoObjects/SOGo/SOGoUserDefaults.h + SoObjects/SOGo/SOGoUserDefaults.m M NEWS M SoObjects/Mailer/SOGoMailAccount.m @@ -31479,7 +32545,7 @@ Date: Tue Dec 15 11:08:30 2015 -0500 Conflicts: - SoObjects/Appointments/iCalEntityObject+SOGo.h + SoObjects/Appointments/iCalEntityObject+SOGo.h M NEWS M SoObjects/Appointments/SOGoAppointmentObject.m @@ -33602,8 +34668,8 @@ Date: Fri Nov 6 13:33:36 2015 -0500 Conflicts: - NEWS - SoObjects/Contacts/SOGoContactSourceFolder.m + NEWS + SoObjects/Contacts/SOGoContactSourceFolder.m M NEWS M SoObjects/Contacts/SOGoContactSourceFolder.m @@ -33616,7 +34682,7 @@ Date: Fri Nov 6 09:25:49 2015 -0500 Conflicts: - NEWS + NEWS M NEWS M UI/MailPartViewers/UIxMailPartHTMLViewer.m @@ -33711,7 +34777,7 @@ Date: Thu Nov 5 09:48:17 2015 -0500 Conflicts: - NEWS + NEWS M NEWS @@ -33788,7 +34854,7 @@ Date: Fri Sep 25 15:18:22 2015 -0400 Conflicts: - SoObjects/Appointments/SOGoAppointmentFolder.h + SoObjects/Appointments/SOGoAppointmentFolder.h M SoObjects/SOGo/SOGoGCSFolder.h M SoObjects/SOGo/SOGoGCSFolder.m @@ -34353,7 +35419,7 @@ Date: Wed Oct 14 09:21:32 2015 -0400 Conflicts: - NEWS + NEWS M ActiveSync/SOGoActiveSyncDispatcher+Sync.m M ActiveSync/SOGoActiveSyncDispatcher.h @@ -35105,7 +36171,7 @@ Date: Wed Sep 16 11:52:46 2015 -0400 Conflicts: - NEWS + NEWS M NEWS @@ -35749,8 +36815,8 @@ Date: Wed Sep 9 10:20:31 2015 -0400 Conflicts: - SoObjects/Mailer/SOGoMailFolder.h - SoObjects/SOGo/SOGoGCSFolder.m + SoObjects/Mailer/SOGoMailFolder.h + SoObjects/SOGo/SOGoGCSFolder.m M ActiveSync/SOGoActiveSyncDispatcher+Sync.m M ActiveSync/SOGoActiveSyncDispatcher.m @@ -38261,7 +39327,7 @@ Date: Mon Aug 3 09:18:20 2015 -0400 Conflicts: - NEWS + NEWS M NEWS @@ -39231,8 +40297,8 @@ Date: Wed Jul 22 16:45:42 2015 -0400 Calendar module optimizations in multidomain setup Conflicts: - NEWS - UI/Common/UIxUserRightsEditor.m + NEWS + UI/Common/UIxUserRightsEditor.m M NEWS M SoObjects/Appointments/SOGoAppointmentObject.m @@ -39436,7 +40502,7 @@ Date: Mon Jun 22 09:19:54 2015 -0400 Conflicts: - ActiveSync/SOGoActiveSyncDispatcher+Sync.m + ActiveSync/SOGoActiveSyncDispatcher+Sync.m M ActiveSync/SOGoActiveSyncDispatcher+Sync.m M NEWS @@ -39466,7 +40532,7 @@ Date: Wed Jul 22 09:15:34 2015 -0400 Conflicts: - NEWS + NEWS M ActiveSync/SOGoActiveSyncDispatcher.m M NEWS @@ -40261,7 +41327,7 @@ Date: Mon Jun 29 13:49:41 2015 -0400 Conflicts: - ActiveSync/SOGoActiveSyncDispatcher+Sync.m + ActiveSync/SOGoActiveSyncDispatcher+Sync.m M ActiveSync/SOGoActiveSyncDispatcher+Sync.m @@ -48124,13 +49190,13 @@ Date: Wed Oct 8 14:08:54 2014 -0400 Conflicts: - UI/Common/UIxAclEditor.m - UI/Common/UIxUserRightsEditor.m - UI/Common/product.plist - UI/Contacts/UIxContactsUserRightsEditor.m - UI/Templates/ContactsUI/UIxContactFoldersView.wox - UI/WebServerResources/js/Common/resource.js - UI/WebServerResources/js/ContactsUI.js + UI/Common/UIxAclEditor.m + UI/Common/UIxUserRightsEditor.m + UI/Common/product.plist + UI/Contacts/UIxContactsUserRightsEditor.m + UI/Templates/ContactsUI/UIxContactFoldersView.wox + UI/WebServerResources/js/Common/resource.js + UI/WebServerResources/js/ContactsUI.js M UI/Common/UIxAclEditor.m M UI/Common/UIxUserRightsEditor.m @@ -48152,9 +49218,9 @@ Date: Wed Oct 8 13:44:37 2014 -0400 Conflicts: - UI/Common/UIxAclEditor.m - UI/Common/UIxUserRightsEditor.m - UI/WebServerResources/js/Common/acl-model.js + UI/Common/UIxAclEditor.m + UI/Common/UIxUserRightsEditor.m + UI/WebServerResources/js/Common/acl-model.js M UI/Common/UIxAclEditor.h M UI/Common/UIxAclEditor.m @@ -50087,7 +51153,7 @@ Date: Wed May 20 12:31:25 2015 +0200 environments only append @domain when needed. Conflicts: - SoObjects/SOGo/SOGoUserManager.m + SoObjects/SOGo/SOGoUserManager.m M SoObjects/SOGo/SOGoUserManager.m @@ -50711,7 +51777,7 @@ Date: Mon Apr 20 09:51:02 2015 +0200 This reverts commit cd47c926c92c29c7ee63c3990417883d60be2be7. Conflicts: - NEWS + NEWS M NEWS @@ -50724,7 +51790,7 @@ Date: Mon Apr 20 09:48:52 2015 +0200 This reverts commit 8706443685ff3cb4e71d79e08204e826698db597. Conflicts: - NEWS + NEWS M NEWS @@ -50737,7 +51803,7 @@ Date: Mon Apr 20 09:47:40 2015 +0200 This reverts commit 914e7b7418128dbc112746d4b58a81eef2a64d88. Conflicts: - NEWS + NEWS M NEWS @@ -57872,7 +58938,7 @@ Date: Fri Jun 13 14:19:20 2014 +0200 Signed-off-by: Kamen Mazdrashki Conflicts: - OpenChange/MAPIStoreContext.m + OpenChange/MAPIStoreContext.m M OpenChange/MAPIStoreContext.m