diff --git a/ChangeLog b/ChangeLog index 2f9eabeb2..740700750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1193 @@ +commit d1be924fd1f8f0843da8a84371aeafe8e4000512 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 17:00:18 2012 -0400 + + Updated version to 2.0.2 + +M Documentation/SOGo Installation Guide.odt + +commit 15b44c6f5aa483300dabe8a5fc240b1fe50b7ed2 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 16:59:48 2012 -0400 + + Updated version to 2.0.2 + +M Documentation/SOGo Installation Guide.odt +M Documentation/SOGo Mobile Devices Configuration.odt +M Documentation/SOGo Mozilla Thunderbird Configuration.odt +M Documentation/SOGo Native Microsoft Outlook Configuration.odt + +commit 8a9336c599fc0d1c3047f42e3ec44736641f522b +Author: Luc Charland +Date: Tue Oct 23 16:11:45 2012 -0400 + + fixed bug #2062 priority shows prio_null + + When looking at a priority from a calendar where you don't have enough + rights. + In this case simply do not show anything in the field. + +M UI/WebServerResources/SchedulerUI.js + +commit ee712d2c11f73929e31a068ae3701df70f32ae59 +Author: Francis Lachapelle +Date: Tue Oct 23 15:21:19 2012 -0400 + + Restore missing translation strings + +M UI/PreferencesUI/German.lproj/Localizable.strings + +commit bb8eb2e1c3b0b14753fffb0b4e82ff6a27648ec2 +Author: Francis Lachapelle +Date: Tue Oct 23 15:17:28 2012 -0400 + + Restore missing translation strings + +M UI/Common/Hungarian.lproj/Localizable.strings +M UI/Common/Polish.lproj/Localizable.strings + +commit 31be93ef2e62c402fde5d562ac4d71af29df9fbd +Author: Francis Lachapelle +Date: Tue Oct 23 14:04:15 2012 -0400 + + Update translation + + - Dutch + - French + - German + - Hungarian + - SpanishArgentina + - SpanishSpain + +M SoObjects/Appointments/Dutch.lproj/Localizable.strings +M SoObjects/Appointments/French.lproj/Localizable.strings +M SoObjects/Appointments/German.lproj/Localizable.strings +M SoObjects/Appointments/Hungarian.lproj/Localizable.strings +M SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings +M SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings +M UI/Common/Hungarian.lproj/Localizable.strings +M UI/Contacts/Hungarian.lproj/Localizable.strings +M UI/MailPartViewers/Hungarian.lproj/Localizable.strings +M UI/MailerUI/Hungarian.lproj/Localizable.strings +M UI/PreferencesUI/Dutch.lproj/Localizable.strings +M UI/PreferencesUI/German.lproj/Localizable.strings +M UI/PreferencesUI/Hungarian.lproj/Localizable.strings +M UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +M UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings +M UI/Scheduler/Dutch.lproj/Localizable.strings +M UI/Scheduler/French.lproj/Localizable.strings +M UI/Scheduler/German.lproj/Localizable.strings +M UI/Scheduler/Hungarian.lproj/Localizable.strings +M UI/Scheduler/SpanishArgentina.lproj/Localizable.strings +M UI/Scheduler/SpanishSpain.lproj/Localizable.strings + +commit 2cd0a643b93b07ea4526d8a0ef10f2efdb9a7f29 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 13:42:27 2012 -0400 + + the defaults for "sogod" are now registered from libSOGo + +M OpenChange/MAPIStoreSOGo.m + +commit 1f80387fc8cccb70d839bb9c18a42af0f8ecadd9 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 13:42:02 2012 -0400 + + simplified and fixed the overriding of "SOGoLDAPQueryLimit" and "SOGoLDAPQueryTimeout" + +M Tools/sogo-tool.m + +commit fe29c24e688c4223adcabcaa5db1d37f89a638c4 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 13:41:34 2012 -0400 + + simplified defaults override code, for sogod and other SOGo-based processes, by giving prescendence to the user "user defaults", followed by sogo.conf, debconf.conf and finally SOGoDefaults.plist", and by adding "sogod" in the list of defaults "suites" + +M SoObjects/SOGo/SOGoSystemDefaults.m + +commit 54baffcd56e6529f5800a22ce0b24c8bc40fec77 +Merge: 007a325 0482c1d +Author: Wolfgang Sourdeau +Date: Tue Oct 23 11:33:47 2012 -0400 + + Added the ability to read the SOGo configuration from a property list file in /etc/SOGo/. + +commit 007a325164d0ff108c13c4562e43e2017f0bb3ab +Author: Wolfgang Sourdeau +Date: Tue Oct 23 10:52:58 2012 -0400 + + Do not show any signature verification icon at all when SMIME is not supported + +M UI/MailPartViewers/UIxMailPartSignedViewer.m +M UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox +M UI/WebServerResources/MailerUI.js + +commit c844c221d38ea1c1916767677c6b581e01594431 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 10:51:05 2012 -0400 + + Do not show any signature verification icon at all when SMIME is not supported + +D maintenance/dummytool.c + +commit 6859fd3652fa18742130fb590ca9910bae93ea79 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 10:30:05 2012 -0400 + + Do not automatically depend on libcrypto and make fallback dependency on libssl optional + +M SoObjects/SOGo/GNUmakefile.preamble + +commit 2f9369db57daf6aed225f8ed84597155c2e65cf8 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 10:29:05 2012 -0400 + + Do not provide a default fallback on libssl, when gnutls is not in use.\nInstead, we make the use of either library mandatory. + +M SoObjects/SOGo/NSData+Crypto.m + +commit 3fb2a835d7557972318d5532ef81edefed95453c +Author: Wolfgang Sourdeau +Date: Tue Oct 23 10:27:53 2012 -0400 + + removed the need for "dummytool" and enabled the "--with-ssl=X" option for the "configure" script + +M configure + +commit de381aca819d32cd58c73c1a8cac32ce4484ff4c +Merge: fa7a650 439bb13 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 10:11:36 2012 -0400 + + Added support for gnutls (thanks to Jeroen Dekkers). + +commit fa7a6507b5e2b1d0e2841d33e9059a2578aee487 +Author: Wolfgang Sourdeau +Date: Tue Oct 23 10:11:33 2012 -0400 + + new file + +M SoObjects/SOGo/GNUmakefile.preamble + +commit 60b078f55098bbb2e79e6ee2f30db1f5821ca384 +Author: Francis Lachapelle +Date: Tue Oct 23 07:13:14 2012 -0400 + + Fix double backslash in Polish translation + +M SoObjects/Appointments/Polish.lproj/Localizable.strings +M UI/Common/Polish.lproj/Localizable.strings + +commit 46a4cd3d4e1964cdb83c808ecfa45e7938507905 +Author: Francis Lachapelle +Date: Mon Oct 22 21:44:20 2012 -0400 + + Updated Polish translation + +M SoObjects/Appointments/Polish.lproj/Localizable.strings +M UI/Common/Polish.lproj/Localizable.strings +M UI/Contacts/Polish.lproj/Localizable.strings +M UI/MailPartViewers/Polish.lproj/Localizable.strings +M UI/MailerUI/Polish.lproj/Localizable.strings +M UI/MainUI/Polish.lproj/Localizable.strings +M UI/PreferencesUI/Polish.lproj/Localizable.strings +M UI/Scheduler/Polish.lproj/Localizable.strings + +commit 331b61d9b2b655ec2d239effdd63c8388937ef1b +Author: Wolfgang Sourdeau +Date: Mon Oct 22 15:17:47 2012 -0400 + + escape the username part of the tablename in order to obtain an acceptable SQL identifier + +M OpenChange/MAPIStoreUserContext.m + +commit 6d8c3289104e03102d03a202ecec5d898771f768 +Author: Wolfgang Sourdeau +Date: Mon Oct 22 10:09:13 2012 -0400 + + Fixed most build warnings + +M Main/SOGo.m +M SoObjects/Appointments/SOGoAppointmentFolder.m +M SoObjects/Appointments/SOGoAppointmentFolders.m +M SoObjects/Appointments/SOGoAptMailDeletion.m +M SoObjects/Appointments/SOGoAptMailICalReply.m +M SoObjects/Appointments/SOGoAptMailInvitation.m +M SoObjects/Appointments/SOGoAptMailUpdate.m +M SoObjects/Appointments/SOGoCalendarProxy.m +M SoObjects/Appointments/SOGoComponentOccurence.m +M SoObjects/Appointments/SOGoUserFolder+Appointments.m +M SoObjects/Appointments/iCalCalendar+SOGo.m +M SoObjects/Appointments/iCalPerson+SOGo.m +M SoObjects/Contacts/SOGoContactEntryPhoto.m +M SoObjects/Contacts/SOGoContactFolders.m +M SoObjects/Contacts/SOGoContactSourceFolder.m +M SoObjects/Mailer/EOQualifier+MailDAV.h +M SoObjects/Mailer/EOQualifier+MailDAV.m +M SoObjects/Mailer/SOGoMailAccount.m +M SoObjects/Mailer/SOGoMailBaseObject.m +M SoObjects/Mailer/SOGoMailBodyPart.m +M SoObjects/Mailer/SOGoMailFolder.m +M SoObjects/Mailer/SOGoUser+Mailer.m +M SoObjects/SOGo/DOMNode+SOGo.h +M SoObjects/SOGo/DOMNode+SOGo.m +M SoObjects/SOGo/SOGoDefaultsSource.m +M SoObjects/SOGo/SOGoGCSFolder.h +M SoObjects/SOGo/SOGoGCSFolder.m +M SoObjects/SOGo/SOGoParentFolder.m +M SoObjects/SOGo/SOGoPublicBaseFolder.m +M SoObjects/SOGo/WORequest+SOGo.m +M Tools/SOGoEAlarmsNotifier.m +M Tools/SOGoSockD.h +M Tools/SOGoToolRemoveDoubles.m +M Tools/SOGoToolRestore.m +M UI/Common/UIxFolderActions.m +M UI/Contacts/UIxContactActions.m +M UI/Contacts/UIxContactEditor.h +M UI/Contacts/UIxContactEditor.m +M UI/MailPartViewers/UIxMailPartICalViewer.m +M UI/MailPartViewers/UIxMailRenderingContext.m +M UI/MailerUI/UIxMailEditor.m +M UI/MailerUI/UIxMailFilterPanel.m +M UI/MailerUI/UIxMailListActions.m +M UI/MailerUI/UIxMailMainFrame.m +M UI/MailerUI/UIxMailMoveToPopUp.m +M UI/MailerUI/UIxMailView.m +M UI/PreferencesUI/UIxPreferences.m +M UI/SOGoUI/SOGoACLAdvisory.m +M UI/SOGoUI/SOGoFolderAdvisory.m +M UI/SOGoUI/UIxComponent.m +M UI/Scheduler/UIxAppointmentActions.m +M UI/Scheduler/UIxCalDayTable.m +M UI/Scheduler/UIxCalFolderActions.m +M UI/Scheduler/UIxCalMonthView.m +M UI/Scheduler/UIxComponentEditor.m +M UI/Scheduler/UIxTaskEditor.m + +commit dac021799a45a4f1a843248dbd162070767e7297 +Author: Wolfgang Sourdeau +Date: Mon Oct 22 08:02:22 2012 -0400 + + Fixed most build warnings + +M SOPE/GDLContentStore/GCSSessionsFolder.m + +commit e717be612669a8206774e32155777e4aa00e85f3 +Author: Wolfgang Sourdeau +Date: Mon Oct 22 08:01:40 2012 -0400 + + Fixed most build warnings + +M SOPE/NGCards/iCalAlarm.m +M SOPE/NGCards/iCalObject.m +M SOPE/NGCards/iCalTrigger.m +M SOPE/NGCards/iCalXMLRenderer.m + +commit 667f0b4a132d522150e50f30a8a9b4115bacf3c9 +Author: Wolfgang Sourdeau +Date: Sat Oct 20 16:41:03 2012 -0400 + + style + +M UI/WebServerResources/SchedulerUI.js + +commit b3d2f7170888d566869ad2ff321740c0a0b30cde +Author: Wolfgang Sourdeau +Date: Sat Oct 20 16:40:44 2012 -0400 + + encode the url of the remote calendar, to enable the passing of url parameters + +M UI/WebServerResources/SchedulerUI.js + +commit f4c12f965846494d94bdc35ec3786cad0d3aec78 +Merge: 1f64747 a632c82 +Author: Wolfgang Sourdeau +Date: Sat Oct 20 12:39:39 2012 -0700 + + Merge pull request #1 from dekkers/make-check + + Implement a "make check" target that will run the unit tests (thanks to Jeroen Dekkers) + +commit 1f64747b67073da5259b449c1b53410e5cd7ee49 +Merge: db19cae 990911e +Author: Wolfgang Sourdeau +Date: Sat Oct 20 12:15:23 2012 -0700 + + Merge pull request #2 from dekkers/link-everything-correctly + + Specify all necessary libraries when linking (thanks to Jeroen Dekkers) + +commit db19cae692b96624f42e125f8443dee0e01b86b6 +Merge: 1f2ca23 34f3ddd +Author: Wolfgang Sourdeau +Date: Sat Oct 20 15:06:34 2012 -0400 + + Build the sogo executable as PIE (thanks to Jeroen Dekkers) + +commit 1f2ca23678fe9ca26e8146e118e753d5a06965bb +Author: Wolfgang Sourdeau +Date: Sat Oct 20 14:27:01 2012 -0400 + + update to latest edition of the Olson database, regenerated with the "--pure" parameter + +M SOPE/NGCards/TimeZones/Africa/Abidjan.ics +M SOPE/NGCards/TimeZones/Africa/Accra.ics +M SOPE/NGCards/TimeZones/Africa/Addis_Ababa.ics +M SOPE/NGCards/TimeZones/Africa/Algiers.ics +M SOPE/NGCards/TimeZones/Africa/Asmara.ics +M SOPE/NGCards/TimeZones/Africa/Bamako.ics +M SOPE/NGCards/TimeZones/Africa/Bangui.ics +M SOPE/NGCards/TimeZones/Africa/Banjul.ics +M SOPE/NGCards/TimeZones/Africa/Bissau.ics +M SOPE/NGCards/TimeZones/Africa/Blantyre.ics +M SOPE/NGCards/TimeZones/Africa/Brazzaville.ics +M SOPE/NGCards/TimeZones/Africa/Bujumbura.ics +M SOPE/NGCards/TimeZones/Africa/Cairo.ics +M SOPE/NGCards/TimeZones/Africa/Casablanca.ics +M SOPE/NGCards/TimeZones/Africa/Ceuta.ics +M SOPE/NGCards/TimeZones/Africa/Conakry.ics +M SOPE/NGCards/TimeZones/Africa/Dakar.ics +M SOPE/NGCards/TimeZones/Africa/Dar_es_Salaam.ics +M SOPE/NGCards/TimeZones/Africa/Djibouti.ics +M SOPE/NGCards/TimeZones/Africa/Douala.ics +M SOPE/NGCards/TimeZones/Africa/El_Aaiun.ics +M SOPE/NGCards/TimeZones/Africa/Freetown.ics +M SOPE/NGCards/TimeZones/Africa/Gaborone.ics +M SOPE/NGCards/TimeZones/Africa/Harare.ics +M SOPE/NGCards/TimeZones/Africa/Johannesburg.ics +M SOPE/NGCards/TimeZones/Africa/Juba.ics +M SOPE/NGCards/TimeZones/Africa/Kampala.ics +M SOPE/NGCards/TimeZones/Africa/Khartoum.ics +M SOPE/NGCards/TimeZones/Africa/Kigali.ics +M SOPE/NGCards/TimeZones/Africa/Kinshasa.ics +M SOPE/NGCards/TimeZones/Africa/Lagos.ics +M SOPE/NGCards/TimeZones/Africa/Libreville.ics +M SOPE/NGCards/TimeZones/Africa/Lome.ics +M SOPE/NGCards/TimeZones/Africa/Luanda.ics +M SOPE/NGCards/TimeZones/Africa/Lubumbashi.ics +M SOPE/NGCards/TimeZones/Africa/Lusaka.ics +M SOPE/NGCards/TimeZones/Africa/Malabo.ics +M SOPE/NGCards/TimeZones/Africa/Maputo.ics +M SOPE/NGCards/TimeZones/Africa/Maseru.ics +M SOPE/NGCards/TimeZones/Africa/Mbabane.ics +M SOPE/NGCards/TimeZones/Africa/Mogadishu.ics +M SOPE/NGCards/TimeZones/Africa/Monrovia.ics +M SOPE/NGCards/TimeZones/Africa/Nairobi.ics +M SOPE/NGCards/TimeZones/Africa/Ndjamena.ics +M SOPE/NGCards/TimeZones/Africa/Niamey.ics +M SOPE/NGCards/TimeZones/Africa/Nouakchott.ics +M SOPE/NGCards/TimeZones/Africa/Ouagadougou.ics +M SOPE/NGCards/TimeZones/Africa/Porto-Novo.ics +M SOPE/NGCards/TimeZones/Africa/Sao_Tome.ics +M SOPE/NGCards/TimeZones/Africa/Tripoli.ics +M SOPE/NGCards/TimeZones/Africa/Tunis.ics +M SOPE/NGCards/TimeZones/Africa/Windhoek.ics +M SOPE/NGCards/TimeZones/America/Adak.ics +M SOPE/NGCards/TimeZones/America/Anchorage.ics +M SOPE/NGCards/TimeZones/America/Anguilla.ics +M SOPE/NGCards/TimeZones/America/Antigua.ics +M SOPE/NGCards/TimeZones/America/Araguaina.ics +M SOPE/NGCards/TimeZones/America/Argentina/Buenos_Aires.ics +M SOPE/NGCards/TimeZones/America/Argentina/Catamarca.ics +M SOPE/NGCards/TimeZones/America/Argentina/Cordoba.ics +M SOPE/NGCards/TimeZones/America/Argentina/Jujuy.ics +M SOPE/NGCards/TimeZones/America/Argentina/La_Rioja.ics +M SOPE/NGCards/TimeZones/America/Argentina/Mendoza.ics +M SOPE/NGCards/TimeZones/America/Argentina/Rio_Gallegos.ics +M SOPE/NGCards/TimeZones/America/Argentina/Salta.ics +M SOPE/NGCards/TimeZones/America/Argentina/San_Juan.ics +M SOPE/NGCards/TimeZones/America/Argentina/San_Luis.ics +M SOPE/NGCards/TimeZones/America/Argentina/Tucuman.ics +M SOPE/NGCards/TimeZones/America/Argentina/Ushuaia.ics +M SOPE/NGCards/TimeZones/America/Aruba.ics +M SOPE/NGCards/TimeZones/America/Asuncion.ics +M SOPE/NGCards/TimeZones/America/Atikokan.ics +M SOPE/NGCards/TimeZones/America/Bahia.ics +M SOPE/NGCards/TimeZones/America/Bahia_Banderas.ics +M SOPE/NGCards/TimeZones/America/Barbados.ics +M SOPE/NGCards/TimeZones/America/Belem.ics +M SOPE/NGCards/TimeZones/America/Belize.ics +M SOPE/NGCards/TimeZones/America/Blanc-Sablon.ics +M SOPE/NGCards/TimeZones/America/Boa_Vista.ics +M SOPE/NGCards/TimeZones/America/Bogota.ics +M SOPE/NGCards/TimeZones/America/Boise.ics +M SOPE/NGCards/TimeZones/America/Cambridge_Bay.ics +M SOPE/NGCards/TimeZones/America/Campo_Grande.ics +M SOPE/NGCards/TimeZones/America/Cancun.ics +M SOPE/NGCards/TimeZones/America/Caracas.ics +M SOPE/NGCards/TimeZones/America/Cayenne.ics +M SOPE/NGCards/TimeZones/America/Cayman.ics +M SOPE/NGCards/TimeZones/America/Chicago.ics +M SOPE/NGCards/TimeZones/America/Chihuahua.ics +M SOPE/NGCards/TimeZones/America/Costa_Rica.ics +M SOPE/NGCards/TimeZones/America/Creston.ics +M SOPE/NGCards/TimeZones/America/Cuiaba.ics +M SOPE/NGCards/TimeZones/America/Curacao.ics +M SOPE/NGCards/TimeZones/America/Danmarkshavn.ics +M SOPE/NGCards/TimeZones/America/Dawson.ics +M SOPE/NGCards/TimeZones/America/Dawson_Creek.ics +M SOPE/NGCards/TimeZones/America/Denver.ics +M SOPE/NGCards/TimeZones/America/Detroit.ics +M SOPE/NGCards/TimeZones/America/Dominica.ics +M SOPE/NGCards/TimeZones/America/Edmonton.ics +M SOPE/NGCards/TimeZones/America/Eirunepe.ics +M SOPE/NGCards/TimeZones/America/El_Salvador.ics +M SOPE/NGCards/TimeZones/America/Fortaleza.ics +M SOPE/NGCards/TimeZones/America/Glace_Bay.ics +M SOPE/NGCards/TimeZones/America/Godthab.ics +M SOPE/NGCards/TimeZones/America/Goose_Bay.ics +M SOPE/NGCards/TimeZones/America/Grand_Turk.ics +M SOPE/NGCards/TimeZones/America/Grenada.ics +M SOPE/NGCards/TimeZones/America/Guadeloupe.ics +M SOPE/NGCards/TimeZones/America/Guatemala.ics +M SOPE/NGCards/TimeZones/America/Guayaquil.ics +M SOPE/NGCards/TimeZones/America/Guyana.ics +M SOPE/NGCards/TimeZones/America/Halifax.ics +M SOPE/NGCards/TimeZones/America/Havana.ics +M SOPE/NGCards/TimeZones/America/Hermosillo.ics +M SOPE/NGCards/TimeZones/America/Indiana/Indianapolis.ics +M SOPE/NGCards/TimeZones/America/Indiana/Knox.ics +M SOPE/NGCards/TimeZones/America/Indiana/Marengo.ics +M SOPE/NGCards/TimeZones/America/Indiana/Petersburg.ics +M SOPE/NGCards/TimeZones/America/Indiana/Tell_City.ics +M SOPE/NGCards/TimeZones/America/Indiana/Vevay.ics +M SOPE/NGCards/TimeZones/America/Indiana/Vincennes.ics +M SOPE/NGCards/TimeZones/America/Indiana/Winamac.ics +M SOPE/NGCards/TimeZones/America/Inuvik.ics +M SOPE/NGCards/TimeZones/America/Iqaluit.ics +M SOPE/NGCards/TimeZones/America/Jamaica.ics +M SOPE/NGCards/TimeZones/America/Juneau.ics +M SOPE/NGCards/TimeZones/America/Kentucky/Louisville.ics +M SOPE/NGCards/TimeZones/America/Kentucky/Monticello.ics +M SOPE/NGCards/TimeZones/America/Kralendijk.ics +M SOPE/NGCards/TimeZones/America/La_Paz.ics +M SOPE/NGCards/TimeZones/America/Lima.ics +M SOPE/NGCards/TimeZones/America/Los_Angeles.ics +M SOPE/NGCards/TimeZones/America/Lower_Princes.ics +M SOPE/NGCards/TimeZones/America/Maceio.ics +M SOPE/NGCards/TimeZones/America/Managua.ics +M SOPE/NGCards/TimeZones/America/Manaus.ics +M SOPE/NGCards/TimeZones/America/Marigot.ics +M SOPE/NGCards/TimeZones/America/Martinique.ics +M SOPE/NGCards/TimeZones/America/Matamoros.ics +M SOPE/NGCards/TimeZones/America/Mazatlan.ics +M SOPE/NGCards/TimeZones/America/Menominee.ics +M SOPE/NGCards/TimeZones/America/Merida.ics +M SOPE/NGCards/TimeZones/America/Metlakatla.ics +M SOPE/NGCards/TimeZones/America/Mexico_City.ics +M SOPE/NGCards/TimeZones/America/Miquelon.ics +M SOPE/NGCards/TimeZones/America/Moncton.ics +M SOPE/NGCards/TimeZones/America/Monterrey.ics +M SOPE/NGCards/TimeZones/America/Montevideo.ics +M SOPE/NGCards/TimeZones/America/Montreal.ics +M SOPE/NGCards/TimeZones/America/Montserrat.ics +M SOPE/NGCards/TimeZones/America/Nassau.ics +M SOPE/NGCards/TimeZones/America/New_York.ics +M SOPE/NGCards/TimeZones/America/Nipigon.ics +M SOPE/NGCards/TimeZones/America/Nome.ics +M SOPE/NGCards/TimeZones/America/Noronha.ics +M SOPE/NGCards/TimeZones/America/North_Dakota/Beulah.ics +M SOPE/NGCards/TimeZones/America/North_Dakota/Center.ics +M SOPE/NGCards/TimeZones/America/North_Dakota/New_Salem.ics +M SOPE/NGCards/TimeZones/America/Ojinaga.ics +M SOPE/NGCards/TimeZones/America/Panama.ics +M SOPE/NGCards/TimeZones/America/Pangnirtung.ics +M SOPE/NGCards/TimeZones/America/Paramaribo.ics +M SOPE/NGCards/TimeZones/America/Phoenix.ics +M SOPE/NGCards/TimeZones/America/Port-au-Prince.ics +M SOPE/NGCards/TimeZones/America/Port_of_Spain.ics +M SOPE/NGCards/TimeZones/America/Porto_Velho.ics +M SOPE/NGCards/TimeZones/America/Puerto_Rico.ics +M SOPE/NGCards/TimeZones/America/Rainy_River.ics +M SOPE/NGCards/TimeZones/America/Rankin_Inlet.ics +M SOPE/NGCards/TimeZones/America/Recife.ics +M SOPE/NGCards/TimeZones/America/Regina.ics +M SOPE/NGCards/TimeZones/America/Resolute.ics +M SOPE/NGCards/TimeZones/America/Rio_Branco.ics +M SOPE/NGCards/TimeZones/America/Santa_Isabel.ics +M SOPE/NGCards/TimeZones/America/Santarem.ics +M SOPE/NGCards/TimeZones/America/Santiago.ics +M SOPE/NGCards/TimeZones/America/Santo_Domingo.ics +M SOPE/NGCards/TimeZones/America/Sao_Paulo.ics +M SOPE/NGCards/TimeZones/America/Scoresbysund.ics +M SOPE/NGCards/TimeZones/America/Shiprock.ics +M SOPE/NGCards/TimeZones/America/Sitka.ics +M SOPE/NGCards/TimeZones/America/St_Barthelemy.ics +M SOPE/NGCards/TimeZones/America/St_Johns.ics +M SOPE/NGCards/TimeZones/America/St_Kitts.ics +M SOPE/NGCards/TimeZones/America/St_Lucia.ics +M SOPE/NGCards/TimeZones/America/St_Thomas.ics +M SOPE/NGCards/TimeZones/America/St_Vincent.ics +M SOPE/NGCards/TimeZones/America/Swift_Current.ics +M SOPE/NGCards/TimeZones/America/Tegucigalpa.ics +M SOPE/NGCards/TimeZones/America/Thule.ics +M SOPE/NGCards/TimeZones/America/Thunder_Bay.ics +M SOPE/NGCards/TimeZones/America/Tijuana.ics +M SOPE/NGCards/TimeZones/America/Toronto.ics +M SOPE/NGCards/TimeZones/America/Tortola.ics +M SOPE/NGCards/TimeZones/America/Vancouver.ics +M SOPE/NGCards/TimeZones/America/Whitehorse.ics +M SOPE/NGCards/TimeZones/America/Winnipeg.ics +M SOPE/NGCards/TimeZones/America/Yakutat.ics +M SOPE/NGCards/TimeZones/America/Yellowknife.ics +M SOPE/NGCards/TimeZones/Antarctica/Casey.ics +M SOPE/NGCards/TimeZones/Antarctica/Davis.ics +M SOPE/NGCards/TimeZones/Antarctica/DumontDUrville.ics +M SOPE/NGCards/TimeZones/Antarctica/Macquarie.ics +M SOPE/NGCards/TimeZones/Antarctica/Mawson.ics +M SOPE/NGCards/TimeZones/Antarctica/McMurdo.ics +M SOPE/NGCards/TimeZones/Antarctica/Palmer.ics +M SOPE/NGCards/TimeZones/Antarctica/Rothera.ics +M SOPE/NGCards/TimeZones/Antarctica/South_Pole.ics +M SOPE/NGCards/TimeZones/Antarctica/Syowa.ics +M SOPE/NGCards/TimeZones/Antarctica/Vostok.ics +M SOPE/NGCards/TimeZones/Arctic/Longyearbyen.ics +M SOPE/NGCards/TimeZones/Asia/Aden.ics +M SOPE/NGCards/TimeZones/Asia/Almaty.ics +M SOPE/NGCards/TimeZones/Asia/Amman.ics +M SOPE/NGCards/TimeZones/Asia/Anadyr.ics +M SOPE/NGCards/TimeZones/Asia/Aqtau.ics +M SOPE/NGCards/TimeZones/Asia/Aqtobe.ics +M SOPE/NGCards/TimeZones/Asia/Ashgabat.ics +M SOPE/NGCards/TimeZones/Asia/Baghdad.ics +M SOPE/NGCards/TimeZones/Asia/Bahrain.ics +M SOPE/NGCards/TimeZones/Asia/Baku.ics +M SOPE/NGCards/TimeZones/Asia/Bangkok.ics +M SOPE/NGCards/TimeZones/Asia/Beirut.ics +M SOPE/NGCards/TimeZones/Asia/Bishkek.ics +M SOPE/NGCards/TimeZones/Asia/Brunei.ics +M SOPE/NGCards/TimeZones/Asia/Choibalsan.ics +M SOPE/NGCards/TimeZones/Asia/Chongqing.ics +M SOPE/NGCards/TimeZones/Asia/Colombo.ics +M SOPE/NGCards/TimeZones/Asia/Damascus.ics +M SOPE/NGCards/TimeZones/Asia/Dhaka.ics +M SOPE/NGCards/TimeZones/Asia/Dili.ics +M SOPE/NGCards/TimeZones/Asia/Dubai.ics +M SOPE/NGCards/TimeZones/Asia/Dushanbe.ics +M SOPE/NGCards/TimeZones/Asia/Gaza.ics +M SOPE/NGCards/TimeZones/Asia/Harbin.ics +M SOPE/NGCards/TimeZones/Asia/Hebron.ics +M SOPE/NGCards/TimeZones/Asia/Ho_Chi_Minh.ics +M SOPE/NGCards/TimeZones/Asia/Hong_Kong.ics +M SOPE/NGCards/TimeZones/Asia/Hovd.ics +M SOPE/NGCards/TimeZones/Asia/Irkutsk.ics +M SOPE/NGCards/TimeZones/Asia/Istanbul.ics +M SOPE/NGCards/TimeZones/Asia/Jakarta.ics +M SOPE/NGCards/TimeZones/Asia/Jayapura.ics +M SOPE/NGCards/TimeZones/Asia/Jerusalem.ics +M SOPE/NGCards/TimeZones/Asia/Kabul.ics +M SOPE/NGCards/TimeZones/Asia/Kamchatka.ics +M SOPE/NGCards/TimeZones/Asia/Karachi.ics +M SOPE/NGCards/TimeZones/Asia/Kashgar.ics +M SOPE/NGCards/TimeZones/Asia/Kathmandu.ics +M SOPE/NGCards/TimeZones/Asia/Kolkata.ics +M SOPE/NGCards/TimeZones/Asia/Krasnoyarsk.ics +M SOPE/NGCards/TimeZones/Asia/Kuala_Lumpur.ics +M SOPE/NGCards/TimeZones/Asia/Kuching.ics +M SOPE/NGCards/TimeZones/Asia/Kuwait.ics +M SOPE/NGCards/TimeZones/Asia/Macau.ics +M SOPE/NGCards/TimeZones/Asia/Magadan.ics +M SOPE/NGCards/TimeZones/Asia/Makassar.ics +M SOPE/NGCards/TimeZones/Asia/Manila.ics +M SOPE/NGCards/TimeZones/Asia/Muscat.ics +M SOPE/NGCards/TimeZones/Asia/Nicosia.ics +M SOPE/NGCards/TimeZones/Asia/Novokuznetsk.ics +M SOPE/NGCards/TimeZones/Asia/Novosibirsk.ics +M SOPE/NGCards/TimeZones/Asia/Omsk.ics +M SOPE/NGCards/TimeZones/Asia/Oral.ics +M SOPE/NGCards/TimeZones/Asia/Phnom_Penh.ics +M SOPE/NGCards/TimeZones/Asia/Pontianak.ics +M SOPE/NGCards/TimeZones/Asia/Pyongyang.ics +M SOPE/NGCards/TimeZones/Asia/Qatar.ics +M SOPE/NGCards/TimeZones/Asia/Qyzylorda.ics +M SOPE/NGCards/TimeZones/Asia/Rangoon.ics +M SOPE/NGCards/TimeZones/Asia/Riyadh.ics +M SOPE/NGCards/TimeZones/Asia/Sakhalin.ics +M SOPE/NGCards/TimeZones/Asia/Samarkand.ics +M SOPE/NGCards/TimeZones/Asia/Seoul.ics +M SOPE/NGCards/TimeZones/Asia/Shanghai.ics +M SOPE/NGCards/TimeZones/Asia/Singapore.ics +M SOPE/NGCards/TimeZones/Asia/Taipei.ics +M SOPE/NGCards/TimeZones/Asia/Tashkent.ics +M SOPE/NGCards/TimeZones/Asia/Tbilisi.ics +M SOPE/NGCards/TimeZones/Asia/Tehran.ics +M SOPE/NGCards/TimeZones/Asia/Thimphu.ics +M SOPE/NGCards/TimeZones/Asia/Tokyo.ics +M SOPE/NGCards/TimeZones/Asia/Ulaanbaatar.ics +M SOPE/NGCards/TimeZones/Asia/Urumqi.ics +M SOPE/NGCards/TimeZones/Asia/Vientiane.ics +M SOPE/NGCards/TimeZones/Asia/Vladivostok.ics +M SOPE/NGCards/TimeZones/Asia/Yakutsk.ics +M SOPE/NGCards/TimeZones/Asia/Yekaterinburg.ics +M SOPE/NGCards/TimeZones/Asia/Yerevan.ics +M SOPE/NGCards/TimeZones/Atlantic/Azores.ics +M SOPE/NGCards/TimeZones/Atlantic/Bermuda.ics +M SOPE/NGCards/TimeZones/Atlantic/Canary.ics +M SOPE/NGCards/TimeZones/Atlantic/Cape_Verde.ics +M SOPE/NGCards/TimeZones/Atlantic/Faroe.ics +M SOPE/NGCards/TimeZones/Atlantic/Madeira.ics +M SOPE/NGCards/TimeZones/Atlantic/Reykjavik.ics +M SOPE/NGCards/TimeZones/Atlantic/South_Georgia.ics +M SOPE/NGCards/TimeZones/Atlantic/St_Helena.ics +M SOPE/NGCards/TimeZones/Atlantic/Stanley.ics +M SOPE/NGCards/TimeZones/Australia/Adelaide.ics +M SOPE/NGCards/TimeZones/Australia/Brisbane.ics +M SOPE/NGCards/TimeZones/Australia/Broken_Hill.ics +M SOPE/NGCards/TimeZones/Australia/Currie.ics +M SOPE/NGCards/TimeZones/Australia/Darwin.ics +M SOPE/NGCards/TimeZones/Australia/Eucla.ics +M SOPE/NGCards/TimeZones/Australia/Hobart.ics +M SOPE/NGCards/TimeZones/Australia/Lindeman.ics +M SOPE/NGCards/TimeZones/Australia/Lord_Howe.ics +M SOPE/NGCards/TimeZones/Australia/Melbourne.ics +M SOPE/NGCards/TimeZones/Australia/Perth.ics +M SOPE/NGCards/TimeZones/Australia/Sydney.ics +M SOPE/NGCards/TimeZones/Europe/Amsterdam.ics +M SOPE/NGCards/TimeZones/Europe/Andorra.ics +M SOPE/NGCards/TimeZones/Europe/Athens.ics +M SOPE/NGCards/TimeZones/Europe/Belgrade.ics +M SOPE/NGCards/TimeZones/Europe/Berlin.ics +M SOPE/NGCards/TimeZones/Europe/Bratislava.ics +M SOPE/NGCards/TimeZones/Europe/Brussels.ics +M SOPE/NGCards/TimeZones/Europe/Bucharest.ics +M SOPE/NGCards/TimeZones/Europe/Budapest.ics +M SOPE/NGCards/TimeZones/Europe/Chisinau.ics +M SOPE/NGCards/TimeZones/Europe/Copenhagen.ics +M SOPE/NGCards/TimeZones/Europe/Dublin.ics +M SOPE/NGCards/TimeZones/Europe/Gibraltar.ics +M SOPE/NGCards/TimeZones/Europe/Guernsey.ics +M SOPE/NGCards/TimeZones/Europe/Helsinki.ics +M SOPE/NGCards/TimeZones/Europe/Isle_of_Man.ics +M SOPE/NGCards/TimeZones/Europe/Istanbul.ics +M SOPE/NGCards/TimeZones/Europe/Jersey.ics +M SOPE/NGCards/TimeZones/Europe/Kaliningrad.ics +M SOPE/NGCards/TimeZones/Europe/Kiev.ics +M SOPE/NGCards/TimeZones/Europe/Lisbon.ics +M SOPE/NGCards/TimeZones/Europe/Ljubljana.ics +M SOPE/NGCards/TimeZones/Europe/London.ics +M SOPE/NGCards/TimeZones/Europe/Luxembourg.ics +M SOPE/NGCards/TimeZones/Europe/Madrid.ics +M SOPE/NGCards/TimeZones/Europe/Malta.ics +M SOPE/NGCards/TimeZones/Europe/Mariehamn.ics +M SOPE/NGCards/TimeZones/Europe/Minsk.ics +M SOPE/NGCards/TimeZones/Europe/Monaco.ics +M SOPE/NGCards/TimeZones/Europe/Moscow.ics +M SOPE/NGCards/TimeZones/Europe/Nicosia.ics +M SOPE/NGCards/TimeZones/Europe/Oslo.ics +M SOPE/NGCards/TimeZones/Europe/Paris.ics +M SOPE/NGCards/TimeZones/Europe/Podgorica.ics +M SOPE/NGCards/TimeZones/Europe/Prague.ics +M SOPE/NGCards/TimeZones/Europe/Riga.ics +M SOPE/NGCards/TimeZones/Europe/Rome.ics +M SOPE/NGCards/TimeZones/Europe/Samara.ics +M SOPE/NGCards/TimeZones/Europe/San_Marino.ics +M SOPE/NGCards/TimeZones/Europe/Sarajevo.ics +M SOPE/NGCards/TimeZones/Europe/Simferopol.ics +M SOPE/NGCards/TimeZones/Europe/Skopje.ics +M SOPE/NGCards/TimeZones/Europe/Sofia.ics +M SOPE/NGCards/TimeZones/Europe/Stockholm.ics +M SOPE/NGCards/TimeZones/Europe/Tallinn.ics +M SOPE/NGCards/TimeZones/Europe/Tirane.ics +M SOPE/NGCards/TimeZones/Europe/Uzhgorod.ics +M SOPE/NGCards/TimeZones/Europe/Vaduz.ics +M SOPE/NGCards/TimeZones/Europe/Vatican.ics +M SOPE/NGCards/TimeZones/Europe/Vienna.ics +M SOPE/NGCards/TimeZones/Europe/Vilnius.ics +M SOPE/NGCards/TimeZones/Europe/Volgograd.ics +M SOPE/NGCards/TimeZones/Europe/Warsaw.ics +M SOPE/NGCards/TimeZones/Europe/Zagreb.ics +M SOPE/NGCards/TimeZones/Europe/Zaporozhye.ics +M SOPE/NGCards/TimeZones/Europe/Zurich.ics +M SOPE/NGCards/TimeZones/Indian/Antananarivo.ics +M SOPE/NGCards/TimeZones/Indian/Chagos.ics +M SOPE/NGCards/TimeZones/Indian/Christmas.ics +M SOPE/NGCards/TimeZones/Indian/Cocos.ics +M SOPE/NGCards/TimeZones/Indian/Comoro.ics +M SOPE/NGCards/TimeZones/Indian/Kerguelen.ics +M SOPE/NGCards/TimeZones/Indian/Mahe.ics +M SOPE/NGCards/TimeZones/Indian/Maldives.ics +M SOPE/NGCards/TimeZones/Indian/Mauritius.ics +M SOPE/NGCards/TimeZones/Indian/Mayotte.ics +M SOPE/NGCards/TimeZones/Indian/Reunion.ics +M SOPE/NGCards/TimeZones/Pacific/Apia.ics +M SOPE/NGCards/TimeZones/Pacific/Auckland.ics +M SOPE/NGCards/TimeZones/Pacific/Chatham.ics +M SOPE/NGCards/TimeZones/Pacific/Chuuk.ics +M SOPE/NGCards/TimeZones/Pacific/Easter.ics +M SOPE/NGCards/TimeZones/Pacific/Efate.ics +M SOPE/NGCards/TimeZones/Pacific/Enderbury.ics +M SOPE/NGCards/TimeZones/Pacific/Fakaofo.ics +M SOPE/NGCards/TimeZones/Pacific/Fiji.ics +M SOPE/NGCards/TimeZones/Pacific/Funafuti.ics +M SOPE/NGCards/TimeZones/Pacific/Galapagos.ics +M SOPE/NGCards/TimeZones/Pacific/Gambier.ics +M SOPE/NGCards/TimeZones/Pacific/Guadalcanal.ics +M SOPE/NGCards/TimeZones/Pacific/Guam.ics +M SOPE/NGCards/TimeZones/Pacific/Honolulu.ics +M SOPE/NGCards/TimeZones/Pacific/Johnston.ics +M SOPE/NGCards/TimeZones/Pacific/Kiritimati.ics +M SOPE/NGCards/TimeZones/Pacific/Kosrae.ics +M SOPE/NGCards/TimeZones/Pacific/Kwajalein.ics +M SOPE/NGCards/TimeZones/Pacific/Majuro.ics +M SOPE/NGCards/TimeZones/Pacific/Marquesas.ics +M SOPE/NGCards/TimeZones/Pacific/Midway.ics +M SOPE/NGCards/TimeZones/Pacific/Nauru.ics +M SOPE/NGCards/TimeZones/Pacific/Niue.ics +M SOPE/NGCards/TimeZones/Pacific/Norfolk.ics +M SOPE/NGCards/TimeZones/Pacific/Noumea.ics +M SOPE/NGCards/TimeZones/Pacific/Pago_Pago.ics +M SOPE/NGCards/TimeZones/Pacific/Palau.ics +M SOPE/NGCards/TimeZones/Pacific/Pitcairn.ics +M SOPE/NGCards/TimeZones/Pacific/Pohnpei.ics +M SOPE/NGCards/TimeZones/Pacific/Port_Moresby.ics +M SOPE/NGCards/TimeZones/Pacific/Rarotonga.ics +M SOPE/NGCards/TimeZones/Pacific/Saipan.ics +M SOPE/NGCards/TimeZones/Pacific/Tahiti.ics +M SOPE/NGCards/TimeZones/Pacific/Tarawa.ics +M SOPE/NGCards/TimeZones/Pacific/Tongatapu.ics +M SOPE/NGCards/TimeZones/Pacific/Wake.ics +M SOPE/NGCards/TimeZones/Pacific/Wallis.ics + +commit 321e7e635d1594e2d2e2369d22891282d470294b +Author: Wolfgang Sourdeau +Date: Sat Oct 20 14:26:23 2012 -0400 + + added "--pure" parameter to suggested command-line + +M SOPE/NGCards/TimeZones/UPDATING + +commit 5c9298febf76926dfebc9e63c202440ed7669c76 +Author: Wolfgang Sourdeau +Date: Sat Oct 20 13:28:31 2012 -0400 + + sort the timezone periods chronologically, in reverse order, to ensure that the most recent valid one is used + +M SOPE/NGCards/iCalTimeZone.m + +commit 948bafd2bf30b46654e4a006da7416633befdba7 +Author: Wolfgang Sourdeau +Date: Sat Oct 20 13:27:24 2012 -0400 + + s/occurence/occurrence/g + +M SOPE/NGCards/iCalTimeZonePeriod.h +M SOPE/NGCards/iCalTimeZonePeriod.m +M Tests/Unit/TestiCalTimeZonePeriod.m + +commit a632c82b59bdc6ea73d772101684d2dae0476f9e +Author: Jeroen Dekkers +Date: Fri Oct 19 18:46:46 2012 +0200 + + Implement a "make check" target that will run the unit tests + +M GNUmakefile +M Tests/Unit/GNUmakefile +M Tests/Unit/SOGoTestRunner.m +M UI/Templates/GNUmakefile +M UI/WebServerResources/GNUmakefile + +commit 990911e14272e2233b2530b15aa6f2d9afd7db2b +Author: Jeroen Dekkers +Date: Fri Oct 19 18:23:07 2012 +0200 + + Specify all necessary libraries when linking + +M Main/GNUmakefile.preamble +M OGoContentStore/GNUmakefile.preamble +M SOPE/GDLContentStore/GNUmakefile.preamble +M SOPE/NGCards/GNUmakefile.preamble +M SoObjects/SOGo/GNUmakefile.preamble +M SoObjects/common.make +M UI/SOGoUI/GNUmakefile.preamble + +commit 439bb132c1eed1210cc88f160af0839b83f536eb +Author: Jeroen Dekkers +Date: Fri Oct 19 17:33:48 2012 +0200 + + Add support for GnuTLS + +M SoObjects/SOGo/GNUmakefile.preamble +M SoObjects/SOGo/NSData+Crypto.m +M Tests/Unit/GNUmakefile +A Tests/Unit/TestNSData+Crypto.m +A Tests/Unit/TestNSString+Crypto.m +A UI/MailPartViewers/GNUmakefile.preamble +M UI/MailPartViewers/UIxMailPartSignedViewer.m +M configure +A maintenance/dummytool.c + +commit 0482c1db333803e7ca4694ad13b9107d17e94054 +Author: Jeroen Dekkers +Date: Fri Oct 19 16:07:45 2012 +0200 + + Read configuration from /etc/sogo/sogo.conf + +M SoObjects/SOGo/SOGoSystemDefaults.m +M Tools/sogo-tool.m + +commit 34f3ddd0d71a8ac7574b9dc7470a76400c691f95 +Author: Jeroen Dekkers +Date: Fri Oct 19 16:05:41 2012 +0200 + + Compile daemon as Position Independent Executable + +M Main/GNUmakefile + +commit 3cd249f231ecc69b2e48d0018aa12120233d9316 +Author: Wolfgang Sourdeau +Date: Fri Oct 19 04:37:56 2012 -0400 + + Reduced the delay used for fetching the mail rows from 200 to 100ms + +M UI/WebServerResources/SOGoDataTable.js + +commit 5e89c1236d475c29f43996eabdee22b64ade5cfa +Author: Wolfgang Sourdeau +Date: Fri Oct 19 04:37:36 2012 -0400 + + Merged the code of _getData into getData and getting rid of the delay for rows that are already in cache + +M UI/WebServerResources/SOGoMailDataSource.js + +commit b005b872de2ac1c10d25e4a4080729516166ac67 +Author: Wolfgang Sourdeau +Date: Fri Oct 19 04:34:13 2012 -0400 + + Style + +M UI/WebServerResources/SOGoDataTable.js +M UI/WebServerResources/SOGoMailDataSource.js + +commit b744710ee3c997a635abc24002d1f9333c6f8114 +Author: Wolfgang Sourdeau +Date: Thu Oct 18 14:13:32 2012 -0400 + + Updated copyright + +M UI/Common/WODirectAction+SOGo.m + +commit 479772a73f82456626d59337a8173732ba9844ed +Author: Wolfgang Sourdeau +Date: Thu Oct 18 13:37:42 2012 -0400 + + Further optimized things by caching the parsed strings dictionary directly + +M UI/Common/WODirectAction+SOGo.m + +commit 1e84bccf42e3321d9786378e8d43fd54e93f9b27 +Author: Wolfgang Sourdeau +Date: Thu Oct 18 13:00:59 2012 -0400 + + new optimization that strongly improve the lookup time of labels + +M UI/Common/WODirectAction+SOGo.m + +commit 4c6ca4efc2ad8e83a3bd09206cc9c24aae69c807 +Author: Wolfgang Sourdeau +Date: Thu Oct 18 11:51:23 2012 -0400 + + _handleAttendeesEdition: ensure that the attendee email is correctly see before registering it, since the JSON content may set empty entries + +M UI/Scheduler/UIxComponentEditor.m + +commit 1357bb2f35a3ead46df29067e856497456f72f8c +Author: Wolfgang Sourdeau +Date: Thu Oct 18 11:34:47 2012 -0400 + + -[EOAndQualifier initWithQualifiers:] must receive a nil-ended list (fixes #1999) + +M SoObjects/SOGo/SOGoGCSFolder.m + +commit cb61753cc4997e115a401ce96ba7c000d65b5e95 +Author: Wolfgang Sourdeau +Date: Thu Oct 18 11:04:50 2012 -0400 + + Fixed the display of the restorable folder ids + +M Tools/SOGoToolRestore.m + +commit 97aefee1ecfe8c179e56577e4718769dd0f197e1 +Author: Wolfgang Sourdeau +Date: Thu Oct 18 10:34:05 2012 -0400 + + removed the (apparently) useless version requirements, due to problems with the ObjC2 runtime on OpenBSD (thanks to Sebastian Reitenbach) + +M UI/SOGoElements/bundle-info.plist + +commit ae760a5c974ef8a4b3e7081bedccde873f60caf1 +Merge: bde8f66 565a48d +Author: Wolfgang Sourdeau +Date: Thu Oct 18 10:33:30 2012 -0400 + + Merge branch 'master' of github.com:inverse-inc/sogo + +commit bde8f662a3f851d74bc69e660444a5d63ec88b94 +Author: Wolfgang Sourdeau +Date: Thu Oct 18 10:33:20 2012 -0400 + + removed (apparently) useless +version from classes, due to problems with the ObjC2 runtime on OpenBSD (thanks to Sebastian Reitenbach) + +M UI/SOGoUI/UIxComponent.m + +commit 1f586a4416a9cd2c8681b365891c465bc4614888 +Author: Wolfgang Sourdeau +Date: Thu Oct 18 10:33:14 2012 -0400 + + removed (apparently) useless +version from classes, due to problems with the ObjC2 runtime on OpenBSD (thanks to Sebastian Reitenbach) + +M SOPE/NGCards/iCalObject.m + +commit 565a48d36d6b7d07c4e4680f34a97c62436e9ed4 +Author: Francis Lachapelle +Date: Thu Oct 18 08:39:49 2012 -0400 + + Extend width of labels in preferences + +M UI/WebServerResources/generic.css + +commit 5b40562abc8252a628e2a53b15191062cfe40d3b +Author: Francis Lachapelle +Date: Thu Oct 18 08:38:58 2012 -0400 + + Add missing translation strings in scheduler + +M UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +M UI/Scheduler/Catalan.lproj/Localizable.strings +M UI/Scheduler/Czech.lproj/Localizable.strings +M UI/Scheduler/Danish.lproj/Localizable.strings +M UI/Scheduler/Dutch.lproj/Localizable.strings +M UI/Scheduler/English.lproj/Localizable.strings +M UI/Scheduler/French.lproj/Localizable.strings +M UI/Scheduler/German.lproj/Localizable.strings +M UI/Scheduler/Hungarian.lproj/Localizable.strings +M UI/Scheduler/Icelandic.lproj/Localizable.strings +M UI/Scheduler/Italian.lproj/Localizable.strings +M UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings +M UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings +M UI/Scheduler/Polish.lproj/Localizable.strings +M UI/Scheduler/Russian.lproj/Localizable.strings +M UI/Scheduler/SpanishArgentina.lproj/Localizable.strings +M UI/Scheduler/SpanishSpain.lproj/Localizable.strings +M UI/Scheduler/Swedish.lproj/Localizable.strings +M UI/Scheduler/Ukrainian.lproj/Localizable.strings +M UI/Scheduler/Welsh.lproj/Localizable.strings + +commit a13491f113f8db1c18aa54c18c6067cadb88ef70 +Author: Francis Lachapelle +Date: Thu Oct 18 08:30:54 2012 -0400 + + Add missing translations strings in preferences + +M UI/PreferencesUI/English.lproj/Localizable.strings +M UI/PreferencesUI/French.lproj/Localizable.strings + +commit 06fc7ed49f6fed3ea5c20ee4eb020f4cab8c1b4f +Author: Wolfgang Sourdeau +Date: Wed Oct 17 08:26:22 2012 -0400 + + -submitWithFlags: adapt to new SOGoMailer API + +M OpenChange/MAPIStoreMailVolatileMessage.m + +commit 5a767904189e784c45425b6414e887ebaa2ffd5b +Author: Wolfgang Sourdeau +Date: Tue Oct 16 16:56:48 2012 -0400 + + Added support for SMTP PLAIN authentication + +M Documentation/SOGo Installation Guide.odt +M SoObjects/Appointments/SOGoCalendarComponent.m +M SoObjects/Mailer/SOGoDraftObject.m +M SoObjects/SOGo/SOGoDomainDefaults.h +M SoObjects/SOGo/SOGoDomainDefaults.m +M SoObjects/SOGo/SOGoMailer.h +M SoObjects/SOGo/SOGoMailer.m +M SoObjects/SOGo/SOGoSession.m +M Tools/SOGoEAlarmsNotifier.m +M UI/MailerUI/UIxMailView.m +M UI/SOGoUI/SOGoACLAdvisory.m +M UI/SOGoUI/SOGoFolderAdvisory.m + +commit ef5119f76599f6a11a75175726f055982fa63d83 +Author: Wolfgang Sourdeau +Date: Mon Oct 15 08:04:26 2012 -0400 + + crash: do not attempt to store nil body part keys, for emails having no text body + +M OpenChange/MAPIStoreMailFolder.m + +commit 23ea0065752191a987b84d5b7d48bbfb7db7fb2b +Author: Wolfgang Sourdeau +Date: Sat Oct 13 13:45:56 2012 -0400 + + nameExistsInFolder: removed useless method + +M SoObjects/SOGo/SOGoGCSFolder.h +M SoObjects/SOGo/SOGoGCSFolder.m + +commit d5c29b387055a67f6195c5092f6a04957a472b0f +Author: Wolfgang Sourdeau +Date: Sat Oct 13 10:59:18 2012 -0400 + + speedup of -synchroniseCache: assign message ids and change numbers in batch, as in the mail module + +M OpenChange/MAPIStoreGCSFolder.m + +commit 1f54b3dd0e7b1e252a6b2282428a1d999771d320 +Author: Wolfgang Sourdeau +Date: Sat Oct 13 10:56:56 2012 -0400 + + fixed typo in configuration sample + +M Documentation/SOGo Installation Guide.odt + +commit dec64722c8ff05b60d74f1af61cc82403e77c27b +Author: Wolfgang Sourdeau +Date: Sat Oct 13 09:59:13 2012 -0400 + + Use NSString instances for representing change numbers, rather than NSNumber + +M OpenChange/MAPIStoreGCSFolder.h +M OpenChange/MAPIStoreGCSFolder.m +M OpenChange/MAPIStoreGCSMessage.m + +commit 1e92fe0395c05b013ddc74261708270dab150669 +Author: Wolfgang Sourdeau +Date: Sat Oct 13 09:50:43 2012 -0400 + + style + +M OpenChange/MAPIStoreGCSFolder.m + +commit 526f83d3c94fd74d5689eb0e0517973f595e8227 +Author: Wolfgang Sourdeau +Date: Fri Oct 12 23:29:38 2012 -0400 + + synchroniseCache: register new mail message ids and version numbers in batch with the new methods in MAPIStoreFolder and MAPIStoreMapping + +M OpenChange/MAPIStoreMailFolder.m + +commit 63abe73c29bc7d211a22722e8f3c489e1601b967 +Author: Wolfgang Sourdeau +Date: Fri Oct 12 23:28:47 2012 -0400 + + ensureIDsForChildKeys: new helper method that ensure that the child keys have a corresponding fmid and register them with -[MAPIStoreMapping registerURLs:withIDs:] if needed + +M OpenChange/MAPIStoreFolder.h +M OpenChange/MAPIStoreFolder.m + +commit 9e551cca5bc0aebda0dcc0cc09f4de398bd793c7 +Author: Wolfgang Sourdeau +Date: Fri Oct 12 23:27:05 2012 -0400 + + registerURLs:withIDs: now takes an array of NSNumber or NSString instances + +M OpenChange/MAPIStoreMapping.h +M OpenChange/MAPIStoreMapping.m + +commit ea98a35fadde20d61de8fc9f037115c4bfc356a6 +Author: Wolfgang Sourdeau +Date: Fri Oct 12 23:25:51 2012 -0400 + + getNewFMIDs: new wrapper method around openchangedb_get_new_folderIDs + +M OpenChange/MAPIStoreContext.h +M OpenChange/MAPIStoreContext.m + +commit 641eb8013b270a016ef78d3e8bffb3dcf384badc +Author: Wolfgang Sourdeau +Date: Fri Oct 12 17:44:26 2012 -0400 + + -registerURLs:withIDs: new method to register multiple urls at once + +M OpenChange/MAPIStoreMapping.h +M OpenChange/MAPIStoreMapping.m + +commit 5e2453f3c45429f8055d35f98cc17a49a537f49b +Author: Wolfgang Sourdeau +Date: Fri Oct 12 17:42:43 2012 -0400 + + getNewChangeNumbers: new wrapper for openchangedb_get_new_changeNumbers + +M OpenChange/MAPIStoreContext.h +M OpenChange/MAPIStoreContext.m + +commit bc52ee69540981f383f7a8e40484ff93558df41f +Author: Wolfgang Sourdeau +Date: Fri Oct 12 16:56:35 2012 -0400 + + Updated index table + +M Documentation/SOGo Installation Guide.odt +M Documentation/SOGo Mobile Devices Configuration.odt +M Documentation/SOGo Mozilla Thunderbird Configuration.odt +M Documentation/SOGo Native Microsoft Outlook Configuration.odt + +commit b1547d7212dfeb23a8d6c936db0a46cad77f8b23 +Author: Luc Charland +Date: Fri Oct 12 13:34:38 2012 -0400 + + related with bug #0724. Erase rows before ajax call. + + For a better user experience, first erase (hide) the rows that were + deleted. Then make the ajax call for batchdelete. On confirmation + really delete the rows. + +M UI/WebServerResources/ContactsUI.js + +commit 854985e12445e2e9e0931e7a1af40f48b171dcb9 +Author: Luc Charland +Date: Tue Oct 9 11:29:35 2012 -0400 + + Fixed bug #1477 Add decision in subject header + +M SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings +M SoObjects/Appointments/Catalan.lproj/Localizable.strings +M SoObjects/Appointments/Czech.lproj/Localizable.strings +M SoObjects/Appointments/Danish.lproj/Localizable.strings +M SoObjects/Appointments/Dutch.lproj/Localizable.strings +M SoObjects/Appointments/English.lproj/Localizable.strings +M SoObjects/Appointments/French.lproj/Localizable.strings +M SoObjects/Appointments/German.lproj/Localizable.strings +M SoObjects/Appointments/Hungarian.lproj/Localizable.strings +M SoObjects/Appointments/Icelandic.lproj/Localizable.strings +M SoObjects/Appointments/Italian.lproj/Localizable.strings +M SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings +M SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings +M SoObjects/Appointments/Polish.lproj/Localizable.strings +M SoObjects/Appointments/Russian.lproj/Localizable.strings +M SoObjects/Appointments/SOGoAptMailICalReply.m +M SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings +M SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings +M SoObjects/Appointments/Swedish.lproj/Localizable.strings +M SoObjects/Appointments/Ukrainian.lproj/Localizable.strings +M SoObjects/Appointments/Welsh.lproj/Localizable.strings + +commit e73ef5d98d0a377388ae21f4010b15aa69d15da5 +Author: Francis Lachapelle +Date: Wed Oct 10 15:33:04 2012 -0400 + + Updated Hungarian translation + +M UI/MainUI/Hungarian.lproj/Localizable.strings +M UI/PreferencesUI/Hungarian.lproj/Localizable.strings + +commit f8aecc374c4c03bd6864e34b062cd8ad845eb479 +Author: Wolfgang Sourdeau +Date: Wed Oct 10 15:21:50 2012 -0400 + + Updated for 2.0.1 + +M NEWS + +commit a29c39c5d5cbe10327ca72ec65493fc32000759b +Author: Wolfgang Sourdeau +Date: Wed Oct 10 14:53:23 2012 -0400 + + Release 2.0.1 + +M ChangeLog + commit f10739b3e962015102b3d98bd0dc49461c5e397b Author: Wolfgang Sourdeau Date: Wed Oct 10 14:51:46 2012 -0400 @@ -352,6 +1542,13 @@ Date: Fri Sep 28 14:16:58 2012 -0400 M UI/Templates/SchedulerUI/UIxCalMainView.wox M UI/WebServerResources/SchedulerUI.css +commit 09e0d9705c1d16726624adbdc964fff5cc09e2c2 +Merge: 08eb4d9 3c9e11d +Author: Wolfgang Sourdeau +Date: Thu Sep 27 19:30:58 2012 -0400 + + Merge branch 'master' of github.com:inverse-inc/sogo + commit 08eb4d9f842bb65acb353e684333e174e6d77d65 Author: Wolfgang Sourdeau Date: Thu Sep 27 19:23:56 2012 -0400 @@ -405,6 +1602,13 @@ Date: Thu Sep 27 10:33:57 2012 -0400 M NEWS +commit a353b6e4ede72a676b8f894c6cc74ff2668d8982 +Merge: 2711e0a 1cf9720 +Author: Wolfgang Sourdeau +Date: Thu Sep 27 10:14:29 2012 -0400 + + Merge branch 'master' of github.com:inverse-inc/sogo + commit 1cf972074c3b27a2f263a9401cd90b93aa95a4fb Author: Francis Lachapelle Date: Thu Sep 27 10:03:54 2012 -0400 @@ -485,6 +1689,13 @@ M UI/Templates/MailerUI/UIxMailView.wox M UI/WebServerResources/UIxMailEditor.js M UI/WebServerResources/UIxMailPopupView.js +commit bc4e281e0f39c610c1f816a376d5cfd8d18a120d +Merge: 37ccb08 a608e84 +Author: Wolfgang Sourdeau +Date: Wed Sep 26 11:50:34 2012 -0400 + + Merge branch 'master' of github.com:inverse-inc/sogo + commit 37ccb0875c335abdf8fa961c744aa280dfd6e5d8 Author: Wolfgang Sourdeau Date: Wed Sep 26 11:50:28 2012 -0400 @@ -503,6 +1714,13 @@ Date: Wed Sep 26 10:04:38 2012 -0400 M Documentation/SOGo Native Microsoft Outlook Configuration.odt +commit e837323c2e56c3f2b26c1d0aa08d6a061363b24a +Merge: a6a30af b734090 +Author: Wolfgang Sourdeau +Date: Wed Sep 26 09:35:55 2012 -0400 + + Merge branch 'master' of github.com:inverse-inc/sogo + commit a6a30afe7564b5aff5a4940ea58295dfb02e3076 Author: Wolfgang Sourdeau Date: Wed Sep 26 09:28:37 2012 -0400 @@ -867,6 +2085,13 @@ Date: Thu Sep 20 13:46:23 2012 -0400 M UI/WebServerResources/UIxMailEditor.js +commit ffd58305d804b85095eefaec33dfbb163ddcdd0f +Merge: 569a34c 26c97fe +Author: Luc Charland +Date: Wed Sep 19 16:14:10 2012 -0400 + + Merge branch 'b1930' + commit 26c97fe4ed7b652498b3b4d9246ed664f88d8bd8 Author: Luc Charland Date: Wed Sep 19 16:11:17 2012 -0400 @@ -894,6 +2119,13 @@ Date: Wed Sep 19 16:05:52 2012 -0400 M OpenChange/MAPIStoreMessage.m +commit 80a41a07c3c50ffc42ec6d46fb469eeef091bad7 +Merge: 72fb3f5 7154588 +Author: Wolfgang Sourdeau +Date: Wed Sep 19 12:25:45 2012 -0400 + + Merge branch 'master' of github.com:inverse-inc/sogo + commit 72fb3f552d38162562c3fe9a84e2a401cb321318 Author: Wolfgang Sourdeau Date: Wed Sep 19 12:25:20 2012 -0400 @@ -953,6 +2185,13 @@ Date: Wed Sep 19 11:46:01 2012 -0400 M UI/Scheduler/UIxCalListingActions.m +commit 3a8226c11042acecda8acae9fd500c22e426e77a +Merge: dbb9bac 85787e9 +Author: Ludovic Marcotte +Date: Wed Sep 19 11:35:30 2012 -0400 + + Merge branch 'master' of https://github.com/inverse-inc/sogo + commit 85787e955903be62b5b066e7a81184be6e3065c9 Author: Francis Lachapelle Date: Wed Sep 19 11:26:54 2012 -0400 @@ -1073,6 +2312,13 @@ D ChangeLog M ChangeLog.old A ChangeLog.skyrix +commit 989618d91cf1922b90ad82d8a56f25c29339e268 +Merge: 049095a b89db39 +Author: Wolfgang Sourdeau +Date: Tue Sep 18 10:00:29 2012 -0400 + + Merge branch 'master' of github.com:inverse-inc/sogo + commit b89db391bfa94a377fffa7a1b1df9d7f9aab0df1 Author: Francis Lachapelle Date: Tue Sep 18 09:44:12 2012 -0400 @@ -1324,6 +2570,22 @@ M UI/WebServerResources/generic.css M UI/WebServerResources/generic.js M UI/WebServerResources/iefixes.css +commit 613499c63a2c64cf8b006212b6614e4e779a97a6 +Merge: fc62d76 8253022 +Author: Francis Lachapelle +Date: Fri Sep 7 19:40:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_18' (head 7c7520aa207bce4701e10594a7e6854a244e9f7e) + to branch 'ca.inverse.sogo' (head 1cc99cc487a5bfdb791d4067042b904d7eb47795) + + Monotone-Parent: 1cc99cc487a5bfdb791d4067042b904d7eb47795 + Monotone-Parent: 7c7520aa207bce4701e10594a7e6854a244e9f7e + Monotone-Revision: eb22f4d3b368a79ce56bcad18f9f176fff0cb73c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-09-07T19:40:28 + Monotone-Branch: ca.inverse.sogo + commit fc62d76b1fd2ff4c3ffba38559d13426746aedf7 Author: Wolfgang Sourdeau Date: Fri Sep 7 16:46:18 2012 +0000 @@ -1454,6 +2716,22 @@ M ChangeLog M OpenChange/MAPIStoreCalendarMessage.m M OpenChange/MAPIStoreMailContext.m +commit 6cc4a7fca497d02ad9ad682908e41e3b10c6789f +Merge: 584ba34 2bf242c +Author: Wolfgang Sourdeau +Date: Thu Sep 6 14:16:25 2012 +0000 + + merge of '980f8e11a36d32aa3078b0d7bb5d661b1dad120f' + and 'e95189d2eb78ea96edf9291b7136e415251a7eb4' + + Monotone-Parent: 980f8e11a36d32aa3078b0d7bb5d661b1dad120f + Monotone-Parent: e95189d2eb78ea96edf9291b7136e415251a7eb4 + Monotone-Revision: 0b736cc980075f71e643c2c71341dee25f434fb9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-09-06T14:16:25 + Monotone-Branch: ca.inverse.sogo + commit 2bf242c97b8ff7045218067dd6242d53cb9dc611 Author: Wolfgang Sourdeau Date: Thu Sep 6 14:15:03 2012 +0000 @@ -1648,6 +2926,22 @@ Date: Wed Aug 29 12:57:49 2012 +0000 A Scripts/openchange_cleanup.py +commit c13f9364ffbbdba96a03ca29da2bf6adafab2be7 +Merge: 4798b18 23d45ac +Author: Francis Lachapelle +Date: Wed Aug 29 12:56:04 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_18' (head 749811709acadced020a19e4ce7c00f07ac86e77) + to branch 'ca.inverse.sogo' (head b142d5d1ddfd110920b6b9d0c4efbba96c4ccedd) + + Monotone-Parent: 749811709acadced020a19e4ce7c00f07ac86e77 + Monotone-Parent: b142d5d1ddfd110920b6b9d0c4efbba96c4ccedd + Monotone-Revision: cebb37d367ee5534f83da28bfdd4300b276e285d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-08-29T12:56:04 + Monotone-Branch: ca.inverse.sogo + commit 4798b18598b0e0e9ca705e5300ea1569cb7d2b21 Author: Francis Lachapelle Date: Wed Aug 29 12:56:00 2012 +0000 @@ -1663,6 +2957,22 @@ Date: Wed Aug 29 12:56:00 2012 +0000 M UI/Templates/Appointments/SOGoAptMailUpdate.wox M UI/WebServerResources/UIxAppointmentEditor.css +commit 23d45acf5d8973f2138f62412f5f82723f6c42dc +Merge: 6f7b728 8e37493 +Author: Francis Lachapelle +Date: Wed Aug 29 03:57:53 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_18' (head 6715d58c21f1a56fe1676af927c8dbc0dc2b3cdf) + to branch 'ca.inverse.sogo' (head 02b6f913c445756d25887e84a443f77942949032) + + Monotone-Parent: 02b6f913c445756d25887e84a443f77942949032 + Monotone-Parent: 6715d58c21f1a56fe1676af927c8dbc0dc2b3cdf + Monotone-Revision: b142d5d1ddfd110920b6b9d0c4efbba96c4ccedd + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-08-29T03:57:53 + Monotone-Branch: ca.inverse.sogo + commit 8e37493c41485f4e9050f17c0caea16172c9c7ad Author: Francis Lachapelle Date: Tue Aug 28 16:15:34 2012 +0000 @@ -1870,6 +3180,21 @@ Date: Tue Aug 28 12:58:06 2012 +0000 M SoObjects/Appointments/French.lproj/Localizable.strings +commit 6dd21f0f54b6867e1440dd8d568e107b169767f3 +Merge: 74a6c2f 246bae6 +Author: Francis Lachapelle +Date: Tue Aug 28 12:55:50 2012 +0000 + + merge of '4194d463f4a1cb6539347d116d278cd1e6cb9d12' + and 'efd2971c30fdf12f7c60edbe1950e3bc6b3e4398' + + Monotone-Parent: 4194d463f4a1cb6539347d116d278cd1e6cb9d12 + Monotone-Parent: efd2971c30fdf12f7c60edbe1950e3bc6b3e4398 + Monotone-Revision: af632270926a9ff2164d4226f6a04ab281a2fdb2 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-08-28T12:55:50 + commit 246bae6cc42c1be00d3c17aebe1b1919640ec91e Author: Francis Lachapelle Date: Tue Aug 28 12:55:30 2012 +0000 @@ -2081,6 +3406,22 @@ Date: Thu Aug 23 12:43:37 2012 +0000 M Documentation/SOGo Installation Guide.odt +commit c2b564df125511ba899abe3917fa6513517f3394 +Merge: b1f3a8e 426696b +Author: Francis Lachapelle +Date: Wed Aug 22 13:52:16 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_18' (head 52bc1ab2a2dcc4de7809fd592d0e9c41c556cf17) + to branch 'ca.inverse.sogo' (head 263be06669bfcef33b9cb13a1171fdb0d4d5ec57) + + Monotone-Parent: 263be06669bfcef33b9cb13a1171fdb0d4d5ec57 + Monotone-Parent: 52bc1ab2a2dcc4de7809fd592d0e9c41c556cf17 + Monotone-Revision: ec64b102b590c4a7b217fe508a46ad302e12adce + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-08-22T13:52:16 + Monotone-Branch: ca.inverse.sogo + commit 426696b03360fc6b4b3c29206f6b0264cb93b2fc Author: Francis Lachapelle Date: Wed Aug 22 13:49:45 2012 +0000 @@ -2111,6 +3452,22 @@ Date: Wed Aug 22 01:26:05 2012 +0000 M SOPE/NGCards/ChangeLog M SOPE/NGCards/iCalRepeatableEntityObject.m +commit b1f3a8ebc69b634b16f7a4f8abb754b26fee845e +Merge: 0f9bcd5 54434e9 +Author: Wolfgang Sourdeau +Date: Tue Aug 21 20:40:09 2012 +0000 + + merge of '8cea0b1a81fe57f8395b91cfc3ed8063d49995ca' + and 'f878485f243e179600dcdcf48b5dffc712d954ca' + + Monotone-Parent: 8cea0b1a81fe57f8395b91cfc3ed8063d49995ca + Monotone-Parent: f878485f243e179600dcdcf48b5dffc712d954ca + Monotone-Revision: 263be06669bfcef33b9cb13a1171fdb0d4d5ec57 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-08-21T20:40:09 + Monotone-Branch: ca.inverse.sogo + commit 54434e98961a9e37b865e670970312c81259c3b4 Author: Wolfgang Sourdeau Date: Tue Aug 21 20:39:46 2012 +0000 @@ -2417,6 +3774,22 @@ M OpenChange/code-MAPIStorePropertySelectors.m M OpenChange/dbmsgreader.m M OpenChange/plreader.m +commit 73d14bee9e05e25c300bcdad632d6a85d2dce78f +Merge: cb2f8e2 fb297c9 +Author: Wolfgang Sourdeau +Date: Fri Aug 17 17:57:01 2012 +0000 + + merge of '22f4b6731e332b6ef213a0c2e104ac7fef48969a' + and 'e2f910a1982b774a3f5dfd586d968821441f2076' + + Monotone-Parent: 22f4b6731e332b6ef213a0c2e104ac7fef48969a + Monotone-Parent: e2f910a1982b774a3f5dfd586d968821441f2076 + Monotone-Revision: 572391072fa416635b9921d39ed76478ed762097 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-08-17T17:57:01 + Monotone-Branch: ca.inverse.sogo + commit fb297c913c11347b2b9719119c710022ad7d086d Author: Wolfgang Sourdeau Date: Fri Aug 17 17:56:25 2012 +0000 @@ -2450,6 +3823,22 @@ Date: Fri Aug 17 15:24:27 2012 +0000 M Documentation/SOGo Native Microsoft Outlook Configuration.odt A Documentation/sogo-2.png +commit cadbbb8ef1842e14b4e2cad642164b56da611ac2 +Merge: 90e226d 9f0312d +Author: Francis Lachapelle +Date: Fri Aug 17 03:28:13 2012 +0000 + + merge of '1fb3121c84e0bb2773973fcfde109c7b26530951' + and '3b05428c1c26f8039e60ec4b3d67714b8d3c2f95' + + Monotone-Parent: 1fb3121c84e0bb2773973fcfde109c7b26530951 + Monotone-Parent: 3b05428c1c26f8039e60ec4b3d67714b8d3c2f95 + Monotone-Revision: d073d1d434e8c6c57d9c0f53a3cac4c19354b6f7 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-08-17T03:28:13 + Monotone-Branch: ca.inverse.sogo + commit 90e226d5bb366335076ea9442696f0787487dc58 Author: Wolfgang Sourdeau Date: Thu Aug 16 21:05:16 2012 +0000 @@ -2597,6 +3986,22 @@ M OpenChange/MAPIStoreFolder.m M OpenChange/MAPIStoreMailFolder.m M OpenChange/MAPIStoreSOGo.m +commit 19cbe54277090d6179453b22e43d63616cb522f2 +Merge: 45974ec 9d6b1d4 +Author: Wolfgang Sourdeau +Date: Wed Aug 15 02:33:59 2012 +0000 + + 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 + commit 45974ec74b49d383cf5fbfa75f8d4d85c3774ac3 Author: Wolfgang Sourdeau Date: Wed Aug 15 01:02:08 2012 +0000 @@ -2680,6 +4085,22 @@ Date: Tue Aug 14 16:32:53 2012 +0000 M ChangeLog M OpenChange/GNUmakefile +commit 55ac8077df124de2dda6f107dad8e9e5cf866afc +Merge: 4755515 a01ddf2 +Author: Jean Raby +Date: Tue Aug 14 16:28:26 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_18' (head e85beb8f93ffc2c69838b75d3a43926981cbe855) + to branch 'ca.inverse.sogo' (head f418b89e20c4272dbbbddf4ef8ec5de8e414c52e) + + Monotone-Parent: e85beb8f93ffc2c69838b75d3a43926981cbe855 + Monotone-Parent: f418b89e20c4272dbbbddf4ef8ec5de8e414c52e + Monotone-Revision: abd34c5936406914d038a38374b7414d4b8435f2 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-08-14T16:28:26 + Monotone-Branch: ca.inverse.sogo + commit 47555152b8454e2e5689523a2dff32eb712c445f Author: Jean Raby Date: Tue Aug 14 16:28:19 2012 +0000 @@ -2694,6 +4115,22 @@ Date: Tue Aug 14 16:28:19 2012 +0000 M packaging/rhel/sogo.spec +commit a01ddf21567b7ad5b17dd759ef58f0825834b2bd +Merge: 8bcffcf 07a376b +Author: Jean Raby +Date: Tue Aug 14 14:42:37 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_18' (head 1447a01e5c74f601142742ed11b455e307cc9051) + to branch 'ca.inverse.sogo' (head 22a3b958acddeb274e788d95f5da332880c64d78) + + Monotone-Parent: 1447a01e5c74f601142742ed11b455e307cc9051 + Monotone-Parent: 22a3b958acddeb274e788d95f5da332880c64d78 + Monotone-Revision: f418b89e20c4272dbbbddf4ef8ec5de8e414c52e + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-08-14T14:42:37 + Monotone-Branch: ca.inverse.sogo + commit 8bcffcfeb5a636457ec248720ca248aa70123c8d Author: Jean Raby Date: Tue Aug 14 14:39:09 2012 +0000 @@ -3285,6 +4722,22 @@ Date: Fri Aug 3 19:06:58 2012 +0000 M UI/PreferencesUI/English.lproj/Localizable.strings M UI/PreferencesUI/French.lproj/Localizable.strings +commit 6a97b80f7775951619eebb7bc7b53343e5d6e12c +Merge: 0f65eab a0874e8 +Author: Jean Raby +Date: Fri Aug 3 18:11:13 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_18' (head a6dfa4114eeabf1790dbbd7a169d81c988375c12) + to branch 'ca.inverse.sogo' (head b2c6832ba400b4bb228726fbd0e791d2ce796007) + + Monotone-Parent: a6dfa4114eeabf1790dbbd7a169d81c988375c12 + Monotone-Parent: b2c6832ba400b4bb228726fbd0e791d2ce796007 + Monotone-Revision: c0f07692ea20a10ac587360d8d82535fb4291afc + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-08-03T18:11:13 + Monotone-Branch: ca.inverse.sogo + commit 0f65eab37794ff29b00061f46ae38d8f6ec053f8 Author: Jean Raby Date: Fri Aug 3 18:10:01 2012 +0000 @@ -3318,6 +4771,22 @@ Date: Thu Aug 2 17:45:36 2012 +0000 A packaging/debian/sogo-openchange.install +commit 85c555ab1f884df471ffe1f93e4590c7f08785da +Merge: 1f7166f c36eafc +Author: Jean Raby +Date: Thu Aug 2 17:40:32 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_18' (head d538a70c8651aa1849c88eedda7782a21b41b591) + to branch 'ca.inverse.sogo' (head 43364d6242db2d8b6496cce2c7905d9468fafa41) + + Monotone-Parent: 43364d6242db2d8b6496cce2c7905d9468fafa41 + Monotone-Parent: d538a70c8651aa1849c88eedda7782a21b41b591 + Monotone-Revision: 4280fb032373c8ebfdcc67e2e271b47583c31ec3 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-08-02T17:40:32 + Monotone-Branch: ca.inverse.sogo + commit c36eafc69ceaa1d4a8bd218c70d6e3de8a2a493e Author: Jean Raby Date: Thu Aug 2 17:40:27 2012 +0000 @@ -3434,6 +4903,22 @@ Date: Thu Aug 2 13:18:09 2012 +0000 M ChangeLog M OpenChange/MAPIStoreUserContext.m +commit 8f625f6292ff806163c45267c886e7a551d4f91f +Merge: 53d96f2 b622a43 +Author: Jean Raby +Date: Tue Jul 31 16:30:26 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_18' (head 0a2787d6259826c9137c4fbee005b7cf638fa317) + to branch 'ca.inverse.sogo' (head bc3ed474ad46d79c92b1456be764f4803b264d92) + + Monotone-Parent: 0a2787d6259826c9137c4fbee005b7cf638fa317 + Monotone-Parent: bc3ed474ad46d79c92b1456be764f4803b264d92 + Monotone-Revision: 7a464f08b5ba1b713a0beec23ddfa576c9023439 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-31T16:30:26 + Monotone-Branch: ca.inverse.sogo + commit 53d96f286eed7cb5ebff3954d6e3c8b52e78f600 Author: Jean Raby Date: Tue Jul 31 16:27:13 2012 +0000 @@ -3508,6 +4993,22 @@ M SOPE/NGCards/ChangeLog M SOPE/NGCards/iCalTimeZonePeriod.h M SOPE/NGCards/iCalTimeZonePeriod.m +commit 9128894469fe649894b2db657cbb1e509d7dbf1e +Merge: ac6e45f cee86c1 +Author: Wolfgang Sourdeau +Date: Thu Jul 26 20:52:31 2012 +0000 + + merge of 'd9e87057688d279c42a3fde582339d3eb6cc2f10' + and 'ee420c08e441b07f51979bdf3e0f1ff9cb692563' + + Monotone-Parent: d9e87057688d279c42a3fde582339d3eb6cc2f10 + Monotone-Parent: ee420c08e441b07f51979bdf3e0f1ff9cb692563 + Monotone-Revision: 3c0814786842608f4b2aea659b16c3eb7e694f9d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-26T20:52:31 + Monotone-Branch: ca.inverse.sogo + commit ac6e45f1e9b94ae8d48c991e064f018167bfc3f9 Author: Wolfgang Sourdeau Date: Thu Jul 26 20:50:36 2012 +0000 @@ -3525,6 +5026,22 @@ M OpenChange/MAPIStoreAppointmentWrapper.m A OpenChange/iCalTimeZone+MAPIStore.h A OpenChange/iCalTimeZone+MAPIStore.m +commit cee86c100e7a2aa73bf9d809ea7d4cd194a11955 +Merge: cd2a40f d40b93d +Author: Jean Raby +Date: Thu Jul 26 20:42:57 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 0b971c913f1dcc574124f2fbec92bfc772b4677f) + to branch 'ca.inverse.sogo' (head 2e1d45aecc2da519dcdd145e1c625ddca3fbffc7) + + Monotone-Parent: 0b971c913f1dcc574124f2fbec92bfc772b4677f + Monotone-Parent: 2e1d45aecc2da519dcdd145e1c625ddca3fbffc7 + Monotone-Revision: ee420c08e441b07f51979bdf3e0f1ff9cb692563 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-26T20:42:57 + Monotone-Branch: ca.inverse.sogo + commit cd2a40f67a1813d992d4385d648b9ffb1462dbda Author: Jean Raby Date: Thu Jul 26 20:42:52 2012 +0000 @@ -3541,6 +5058,22 @@ Date: Thu Jul 26 20:42:52 2012 +0000 M debian-multiarch/sogo.docs M debian/sogo.docs +commit d40b93ddb01b425f18977bff5ff5377b056bd75d +Merge: 3e3d8b2 70911dc +Author: Jean Raby +Date: Thu Jul 26 20:20:45 2012 +0000 + + merge of '218517d78ee9b6165cb4f85aff8eee3481b75972' + and 'a77c26240c765963ea4295dc50c295c08809953e' + + Monotone-Parent: 218517d78ee9b6165cb4f85aff8eee3481b75972 + Monotone-Parent: a77c26240c765963ea4295dc50c295c08809953e + Monotone-Revision: 2e1d45aecc2da519dcdd145e1c625ddca3fbffc7 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-26T20:20:45 + Monotone-Branch: ca.inverse.sogo + commit 3e3d8b261f5a51cae0ad88ba73cfda56ff7da377 Author: Francis Lachapelle Date: Thu Jul 26 14:46:42 2012 +0000 @@ -3665,6 +5198,22 @@ Date: Wed Jul 25 20:25:01 2012 +0000 M OpenChange/GNUmakefile M OpenChange/GNUmakefile.preamble +commit 2298067c97a8203f689594b5027397651af9cde0 +Merge: 136e83b c8761e6 +Author: Jean Raby +Date: Wed Jul 25 20:09:52 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 63d5442a6f0522d0d5fca261ef3251a409bd749a) + to branch 'ca.inverse.sogo' (head 30fe613e38d8656f1c490d6fb5d1a29f2125aa2b) + + Monotone-Parent: 30fe613e38d8656f1c490d6fb5d1a29f2125aa2b + Monotone-Parent: 63d5442a6f0522d0d5fca261ef3251a409bd749a + Monotone-Revision: 5482c2b5518f1f90b17ae8222dc1fa7c48830345 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-25T20:09:52 + Monotone-Branch: ca.inverse.sogo + commit c8761e6fdb77ffd19d3f0d2c91aa87b02cddfafb Author: Jean Raby Date: Wed Jul 25 20:09:45 2012 +0000 @@ -3681,6 +5230,22 @@ D debian-multiarch/sogo-openchange.install D debian/sogo-openchange.install D debian/sogo-openchange.install-multiarch +commit 136e83ba60b5b0f734087716220fc9d679e92724 +Merge: 272aabf 4fd57d1 +Author: Jean Raby +Date: Wed Jul 25 19:15:52 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head f4ba8f9b9e95c37f5efc0f2b75a7a8968237c3ca) + to branch 'ca.inverse.sogo' (head 416420cf52205aeff9f09edaf779bee70939318d) + + Monotone-Parent: 416420cf52205aeff9f09edaf779bee70939318d + Monotone-Parent: f4ba8f9b9e95c37f5efc0f2b75a7a8968237c3ca + Monotone-Revision: 30fe613e38d8656f1c490d6fb5d1a29f2125aa2b + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-25T19:15:52 + Monotone-Branch: ca.inverse.sogo + commit 4fd57d173b18d46baae3450f85ee4d6eef24957f Author: Jean Raby Date: Wed Jul 25 19:14:40 2012 +0000 @@ -3712,6 +5277,22 @@ Date: Wed Jul 25 18:30:55 2012 +0000 M ChangeLog M SoObjects/Mailer/SOGoMailFolder.m +commit 272aabf6914d14afa5224077d56b36a36afa664a +Merge: 2faa5e1 7557403 +Author: Wolfgang Sourdeau +Date: Wed Jul 25 17:45:44 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head a860eef99344cc9894f15336b3781ecf101807e4) + to branch 'ca.inverse.sogo' (head d6e6af11a4430fc14c38e245fbaa322775b7b5d7) + + Monotone-Parent: a860eef99344cc9894f15336b3781ecf101807e4 + Monotone-Parent: d6e6af11a4430fc14c38e245fbaa322775b7b5d7 + Monotone-Revision: 416420cf52205aeff9f09edaf779bee70939318d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-25T17:45:44 + Monotone-Branch: ca.inverse.sogo + commit 7557403b62032d9efa56268cd34cbc766be3ded6 Author: Wolfgang Sourdeau Date: Wed Jul 25 17:44:35 2012 +0000 @@ -3825,6 +5406,22 @@ M ChangeLog M SoObjects/Appointments/SOGoCalendarComponent.m M UI/WebServerResources/MailerUI.js +commit e3de4c2f6ea7f305e2f464ea6a68a85a2e74cab9 +Merge: 5419610 5aa0db4 +Author: Wolfgang Sourdeau +Date: Tue Jul 24 20:57:39 2012 +0000 + + merge of '0b23ad3fb301bde775ba3ffc847fd611bdfc26ea' + and '63de63b9d1691f5af7ec1b790f5201ae73cfa036' + + Monotone-Parent: 0b23ad3fb301bde775ba3ffc847fd611bdfc26ea + Monotone-Parent: 63de63b9d1691f5af7ec1b790f5201ae73cfa036 + Monotone-Revision: 8062273942a9de3fcd13c9bb3307488c9a67ec68 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-24T20:57:39 + Monotone-Branch: ca.inverse.sogo + commit 5aa0db4d7b71fc17f4bbff747fdefd241c9263f0 Author: Wolfgang Sourdeau Date: Tue Jul 24 20:45:03 2012 +0000 @@ -3910,6 +5507,21 @@ M UI/Scheduler/Italian.lproj/Localizable.strings M UI/Scheduler/SpanishArgentina.lproj/Localizable.strings M UI/Scheduler/SpanishSpain.lproj/Localizable.strings +commit 7d5f8665c8c1f0ea3c500487256a08fe32bbca4d +Merge: 0a2201d dbdba16 +Author: Francis Lachapelle +Date: Tue Jul 24 18:48:15 2012 +0000 + + merge of '344c60c460c2ec1cb8f2adfd4f4e2af9da772e4a' + and '90e0a15d1fa7861aebb988530cf5503d63b9b9c0' + + Monotone-Parent: 344c60c460c2ec1cb8f2adfd4f4e2af9da772e4a + Monotone-Parent: 90e0a15d1fa7861aebb988530cf5503d63b9b9c0 + Monotone-Revision: 00a98c9420d949b7f4dccea479d8d3d83154bdf4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-07-24T18:48:15 + commit 0a2201d7e55c60a38a26209356fdf5847eee4160 Author: Francis Lachapelle Date: Tue Jul 24 15:27:54 2012 +0000 @@ -3941,6 +5553,22 @@ M ChangeLog M UI/PreferencesUI/English.lproj/Localizable.strings M UI/WebServerResources/UIxPreferences.js +commit 5419610be4494581ca466a660e9e586e5da7b88f +Merge: dbdba16 89b854f +Author: Ludovic Marcotte +Date: Tue Jul 24 14:09:23 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 90e0a15d1fa7861aebb988530cf5503d63b9b9c0) + to branch 'ca.inverse.sogo' (head bbc691f446cce2459abebf22ca1b95a507842dce) + + Monotone-Parent: 90e0a15d1fa7861aebb988530cf5503d63b9b9c0 + Monotone-Parent: bbc691f446cce2459abebf22ca1b95a507842dce + Monotone-Revision: 0b23ad3fb301bde775ba3ffc847fd611bdfc26ea + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-24T14:09:23 + Monotone-Branch: ca.inverse.sogo + commit dbdba16168233ab63d3afdd66cbb4955e9342766 Author: Ludovic Marcotte Date: Tue Jul 24 14:08:56 2012 +0000 @@ -3955,6 +5583,37 @@ Date: Tue Jul 24 14:08:56 2012 +0000 M SoObjects/Appointments/SOGoCalendarComponent.m +commit 81164c61daf3773f5196aa85819a0b876999915e +Merge: f348bd3 6cc9f8e +Author: Ludovic Marcotte +Date: Tue Jul 24 14:08:37 2012 +0000 + + merge of '5c693d8846aabef79f3f26fae416c99fe51bed78' + and '8bbf9c70304e5cb8320d6acb300955b814d1ff0c' + + Monotone-Parent: 5c693d8846aabef79f3f26fae416c99fe51bed78 + Monotone-Parent: 8bbf9c70304e5cb8320d6acb300955b814d1ff0c + Monotone-Revision: e7b38d4230f362ff9d71b2d1bfa8af9b8a2e80c6 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-24T14:08:37 + +commit 89b854fc9c9ad1a7d266517e2ff78cbb83e94db9 +Merge: f348bd3 cfa3631 +Author: Ludovic Marcotte +Date: Tue Jul 24 13:59:22 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 5c693d8846aabef79f3f26fae416c99fe51bed78) + to branch 'ca.inverse.sogo' (head 6d07c0d566abebf051187aed44c7fd461982a824) + + Monotone-Parent: 5c693d8846aabef79f3f26fae416c99fe51bed78 + Monotone-Parent: 6d07c0d566abebf051187aed44c7fd461982a824 + Monotone-Revision: bbc691f446cce2459abebf22ca1b95a507842dce + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-24T13:59:22 + Monotone-Branch: ca.inverse.sogo + commit f348bd3211d131fa4250827198d455add29043f9 Author: Ludovic Marcotte Date: Tue Jul 24 13:58:47 2012 +0000 @@ -4073,6 +5732,22 @@ M UI/WebServerResources/ckeditor/skins/kama/dialog.css M UI/WebServerResources/ckeditor/skins/office2003/dialog.css M UI/WebServerResources/ckeditor/skins/v2/dialog.css +commit cfa36312e034548b64fba659365022ffa376e0ea +Merge: 4b8d639 baa3950 +Author: Jean Raby +Date: Mon Jul 23 17:42:51 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head f6b9d7fff0ee290e5bb3d449068e90673274fc9d) + to branch 'ca.inverse.sogo' (head a661d69f057cb4b81cb5a8376270574fdec7475f) + + Monotone-Parent: a661d69f057cb4b81cb5a8376270574fdec7475f + Monotone-Parent: f6b9d7fff0ee290e5bb3d449068e90673274fc9d + Monotone-Revision: 6d07c0d566abebf051187aed44c7fd461982a824 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-23T17:42:51 + Monotone-Branch: ca.inverse.sogo + commit baa395016a991f84c1d1368c05e9c44a812fabbf Author: Jean Raby Date: Mon Jul 23 17:42:45 2012 +0000 @@ -4097,6 +5772,22 @@ M debian/rules M debian/sogo.install D debian/sogo.logrotate +commit 4b8d6394181f78c145e3934d465f7f57ec9a7ccd +Merge: 8d4fa04 136c6dd +Author: Ludovic Marcotte +Date: Mon Jul 23 16:01:04 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 74e79fa391e19c2111663aba07a783fd4cdd19bd) + to branch 'ca.inverse.sogo' (head bdb3c86bf127fecd411885ad5bcf84eb8af9f672) + + Monotone-Parent: 74e79fa391e19c2111663aba07a783fd4cdd19bd + Monotone-Parent: bdb3c86bf127fecd411885ad5bcf84eb8af9f672 + Monotone-Revision: a661d69f057cb4b81cb5a8376270574fdec7475f + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-23T16:01:04 + Monotone-Branch: ca.inverse.sogo + commit 8d4fa04746ebdcba85ee4b6dd19b9b002a26dbc6 Author: Ludovic Marcotte Date: Mon Jul 23 13:50:14 2012 +0000 @@ -4111,6 +5802,21 @@ Date: Mon Jul 23 13:50:14 2012 +0000 M Scripts/cas-proxy-validate.py +commit 1d26a4b725eccf012ac7e5a68985f93bce8de9c6 +Merge: 0851b23 d63d4ee +Author: Francis Lachapelle +Date: Fri Jul 20 20:03:48 2012 +0000 + + merge of '068bbe8f960b1a20f29054e83e54a57c4372a98e' + and '631e9fa8454aae26e4c7eaa71bfe9e18c0f4b7e5' + + Monotone-Parent: 068bbe8f960b1a20f29054e83e54a57c4372a98e + Monotone-Parent: 631e9fa8454aae26e4c7eaa71bfe9e18c0f4b7e5 + Monotone-Revision: 95a335681530001430a12707d05dbed7839214fb + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-07-20T20:03:48 + commit 0851b23841c3352258022affa249099c876cf5da Author: Francis Lachapelle Date: Fri Jul 20 20:03:23 2012 +0000 @@ -4176,6 +5882,22 @@ Date: Fri Jul 20 18:24:52 2012 +0000 M ChangeLog +commit e5921464c9da33cd4c154b3bf1cc7fd1d884b999 +Merge: d63d4ee fdec2c5 +Author: Ludovic Marcotte +Date: Fri Jul 20 18:24:18 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 631e9fa8454aae26e4c7eaa71bfe9e18c0f4b7e5) + to branch 'ca.inverse.sogo' (head 9e0909dcbb77a5837442df736d80607b0a3fb383) + + Monotone-Parent: 631e9fa8454aae26e4c7eaa71bfe9e18c0f4b7e5 + Monotone-Parent: 9e0909dcbb77a5837442df736d80607b0a3fb383 + Monotone-Revision: bfc3cb63453015f444ec1a1fd20faeece6be2042 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-20T18:24:18 + Monotone-Branch: ca.inverse.sogo + commit fdec2c5d7b7c990b0aa2c2b268527cec11d35b91 Author: Ludovic Marcotte Date: Fri Jul 20 18:23:33 2012 +0000 @@ -4191,6 +5913,54 @@ Date: Fri Jul 20 18:23:33 2012 +0000 M ChangeLog +commit 368b07d36e037b4bd8fc72cee6c0676766375961 +Merge: 35098cd 21a2d45 +Author: Ludovic Marcotte +Date: Fri Jul 20 18:22:53 2012 +0000 + + merge of '30b98f3bab78c6daecd8eab77d0e1251fc687791' + and '7a56acd03793d557df3245f7484b9315244d89e0' + + Monotone-Parent: 30b98f3bab78c6daecd8eab77d0e1251fc687791 + Monotone-Parent: 7a56acd03793d557df3245f7484b9315244d89e0 + Monotone-Revision: 89c8046bde59d4d200a7f039c310086919d53cfd + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-20T18:22:53 + Monotone-Branch: ca.inverse.sogo + +commit 35098cda850b4a84a0c99933bdd4487af2622a53 +Merge: 1476b93 8a1781e +Author: Francis Lachapelle +Date: Fri Jul 20 19:23:37 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head c9c54e20cc8e010c29ef8e5fa1cbd039c35e5344) + to branch 'ca.inverse.sogo' (head 1e529d97ad640de07982d342ce216985cba625f7) + + Monotone-Parent: 1e529d97ad640de07982d342ce216985cba625f7 + Monotone-Parent: c9c54e20cc8e010c29ef8e5fa1cbd039c35e5344 + Monotone-Revision: 30b98f3bab78c6daecd8eab77d0e1251fc687791 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-07-20T19:23:37 + Monotone-Branch: ca.inverse.sogo + +commit 21a2d45d886463148c3b7a5b6c6ef21057757a67 +Merge: 1476b93 8f31821 +Author: Wolfgang Sourdeau +Date: Fri Jul 20 19:08:34 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 7eb19f1f060daa6cb0a2421481ec351910c3af68) + to branch 'ca.inverse.sogo' (head 1e529d97ad640de07982d342ce216985cba625f7) + + Monotone-Parent: 1e529d97ad640de07982d342ce216985cba625f7 + Monotone-Parent: 7eb19f1f060daa6cb0a2421481ec351910c3af68 + Monotone-Revision: 7a56acd03793d557df3245f7484b9315244d89e0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-20T19:08:34 + Monotone-Branch: ca.inverse.sogo + commit 8f31821e1d21a1ba12aca2eb3f081b8b9a72c338 Author: Wolfgang Sourdeau Date: Fri Jul 20 19:07:03 2012 +0000 @@ -4218,6 +5988,21 @@ Date: Fri Jul 20 18:21:59 2012 +0000 M ChangeLog +commit 3e980d12af787964286214a6217ca299db69ec9a +Merge: f363ddf 8f31821 +Author: Ludovic Marcotte +Date: Fri Jul 20 18:21:20 2012 +0000 + + merge of '173ccf9cd4cd08cdc361da9d58df641be065e5a5' + and '7eb19f1f060daa6cb0a2421481ec351910c3af68' + + Monotone-Parent: 173ccf9cd4cd08cdc361da9d58df641be065e5a5 + Monotone-Parent: 7eb19f1f060daa6cb0a2421481ec351910c3af68 + Monotone-Revision: a7a764a2e6fd01790136451d2f144d9b934d1e8e + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-20T18:21:20 + commit f363ddf101a097494ec50f6f1a4f3dfcce61657f Author: Ludovic Marcotte Date: Fri Jul 20 18:17:06 2012 +0000 @@ -4506,6 +6291,22 @@ Date: Thu Jul 19 01:25:04 2012 +0000 M ChangeLog M OpenChange/MAPIStoreDBMessage.m +commit d067ddce435be46b3514f3422d1f22f125ec3991 +Merge: c0587a3 aeef968 +Author: Jean Raby +Date: Wed Jul 18 20:22:58 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 8ce46d6fa7b1d1a9d12069cee3ba796d99d668d2) + to branch 'ca.inverse.sogo' (head 207a29e043f7f41c818a8697fe995a55940787fc) + + Monotone-Parent: 207a29e043f7f41c818a8697fe995a55940787fc + Monotone-Parent: 8ce46d6fa7b1d1a9d12069cee3ba796d99d668d2 + Monotone-Revision: cd2989d3a11079dde73d3a4890b0976e1405ebaa + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-18T20:22:58 + Monotone-Branch: ca.inverse.sogo + commit aeef968c4ed8672b16a9a9816fb6cd1479a859f9 Author: Jean Raby Date: Wed Jul 18 20:22:54 2012 +0000 @@ -4531,6 +6332,22 @@ M Tests/Integration/config.py.in A Tests/Integration/test-ui-posts.py M Tests/Integration/webdavlib.py +commit c0587a37c27bb2ae8532d70c4e2ff4bba83abb02 +Merge: 1abc40c a30e885 +Author: Ludovic Marcotte +Date: Wed Jul 18 19:06:06 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 080d411d52272c158ce60ea0bab6ba8eb9d9aa2a) + to branch 'ca.inverse.sogo' (head 3e3aa908260b5a804d05c2857b5c7ae70d861828) + + Monotone-Parent: 080d411d52272c158ce60ea0bab6ba8eb9d9aa2a + Monotone-Parent: 3e3aa908260b5a804d05c2857b5c7ae70d861828 + Monotone-Revision: 207a29e043f7f41c818a8697fe995a55940787fc + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-18T19:06:06 + Monotone-Branch: ca.inverse.sogo + commit 1abc40c1270f11825e10b993ebe91d3fd2da8dba Author: Ludovic Marcotte Date: Wed Jul 18 19:05:58 2012 +0000 @@ -4546,6 +6363,22 @@ Date: Wed Jul 18 19:05:58 2012 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentObject.m +commit a30e88592519eba4a3acf51eef7566f3414372d4 +Merge: c73780b c88d86e +Author: Jean Raby +Date: Wed Jul 18 15:30:50 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head f489c387ef5efde7f9beee4a9b97ecf85275ffb2) + to branch 'ca.inverse.sogo' (head 40163312c9ee80acc859ad4dab810588c8c49167) + + Monotone-Parent: 40163312c9ee80acc859ad4dab810588c8c49167 + Monotone-Parent: f489c387ef5efde7f9beee4a9b97ecf85275ffb2 + Monotone-Revision: 3e3aa908260b5a804d05c2857b5c7ae70d861828 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-18T15:30:50 + Monotone-Branch: ca.inverse.sogo + commit c88d86ec95060cf82b6b67b6acee072d0cc81703 Author: Jean Raby Date: Wed Jul 18 15:30:38 2012 +0000 @@ -4566,6 +6399,22 @@ M ChangeLog A Scripts/sql-update-1.3.16_to_1.3.17-mysql.sh A Scripts/sql-update-1.3.16_to_1.3.17.sh +commit c73780b93010cd21211e1d537fdc0c5fe2f70741 +Merge: 6f0f95d 5a63e89 +Author: Jean Raby +Date: Tue Jul 17 16:56:30 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 1bcd208d669189aec549aa4351b9d92a29c6d9b9) + to branch 'ca.inverse.sogo' (head 6184bf3d89ac83d570e7ff1690d7366cef05543c) + + Monotone-Parent: 1bcd208d669189aec549aa4351b9d92a29c6d9b9 + Monotone-Parent: 6184bf3d89ac83d570e7ff1690d7366cef05543c + Monotone-Revision: 40163312c9ee80acc859ad4dab810588c8c49167 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-17T16:56:30 + Monotone-Branch: ca.inverse.sogo + commit 6f0f95d2535bba0947261937ad92e6da5cbbbdc7 Author: Jean Raby Date: Tue Jul 17 16:56:19 2012 +0000 @@ -4582,6 +6431,22 @@ Date: Tue Jul 17 16:56:19 2012 +0000 M Tests/Integration/test-caldav-scheduling.py +commit 5a63e897909f6b47e908970f44b010435060dd7e +Merge: c90f480 093c984 +Author: Wolfgang Sourdeau +Date: Mon Jul 16 13:37:50 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head ed7f1623b0cb7e935297f6652b76074c1ff952df) + to branch 'ca.inverse.sogo' (head 635b5bfac47476bfa8994f9151936f2d4bd7d4f3) + + Monotone-Parent: 635b5bfac47476bfa8994f9151936f2d4bd7d4f3 + Monotone-Parent: ed7f1623b0cb7e935297f6652b76074c1ff952df + Monotone-Revision: 6184bf3d89ac83d570e7ff1690d7366cef05543c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-16T13:37:50 + Monotone-Branch: ca.inverse.sogo + commit 093c984b4260bedb638fc3310200c99bb7edd4eb Author: Wolfgang Sourdeau Date: Mon Jul 16 13:35:02 2012 +0000 @@ -4596,6 +6461,22 @@ M ChangeLog M Tests/Integration/test-davacl.py M Tests/Integration/webdavlib.py +commit c90f4804e2a071e9de99c4fcda7a216df597466e +Merge: 91d9836 5d91d22 +Author: Wolfgang Sourdeau +Date: Sat Jul 14 02:41:33 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 22bcd9c626e305661b31c70a49c93352266c2dc8) + to branch 'ca.inverse.sogo' (head b9f26c4bac060372453dcba2c0f2b9a17ffc93bb) + + Monotone-Parent: 22bcd9c626e305661b31c70a49c93352266c2dc8 + Monotone-Parent: b9f26c4bac060372453dcba2c0f2b9a17ffc93bb + Monotone-Revision: 635b5bfac47476bfa8994f9151936f2d4bd7d4f3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-14T02:41:33 + Monotone-Branch: ca.inverse.sogo + commit 91d9836d80fa0d0330a38b314ef249cd2b27faaa Author: Wolfgang Sourdeau Date: Sat Jul 14 02:41:29 2012 +0000 @@ -4609,6 +6490,22 @@ Date: Sat Jul 14 02:41:29 2012 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentObject.m +commit 5d91d22c589e23f913aaf6f8f91a1abe3c810076 +Merge: 6b89fbb 0e276d2 +Author: Wolfgang Sourdeau +Date: Fri Jul 13 21:03:55 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 471d12add6428916fe0b3d9938d1362d062f1de1) + to branch 'ca.inverse.sogo' (head c4c3d792d4b668f2d69a06c140f8d2223d8dbc7c) + + Monotone-Parent: 471d12add6428916fe0b3d9938d1362d062f1de1 + Monotone-Parent: c4c3d792d4b668f2d69a06c140f8d2223d8dbc7c + Monotone-Revision: b9f26c4bac060372453dcba2c0f2b9a17ffc93bb + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-13T21:03:55 + Monotone-Branch: ca.inverse.sogo + commit 6b89fbb769c3832193355b0d74ffe1f4469d2b55 Author: Wolfgang Sourdeau Date: Fri Jul 13 21:03:50 2012 +0000 @@ -4622,6 +6519,22 @@ Date: Fri Jul 13 21:03:50 2012 +0000 M UI/MailPartViewers/UIxMailPartICalActions.m M UI/MailPartViewers/UIxMailPartICalViewer.m +commit 0e276d2acc9c1076dba20ebb37eaddf18913ed25 +Merge: 6a4657d 6cd17dc +Author: Wolfgang Sourdeau +Date: Fri Jul 13 21:00:00 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head f071f53cbc4a39b0b852c58e7e57332f05ef1e0c) + to branch 'ca.inverse.sogo' (head 4117fa474ee2ae428f109a99cb50a33479342fa8) + + Monotone-Parent: 4117fa474ee2ae428f109a99cb50a33479342fa8 + Monotone-Parent: f071f53cbc4a39b0b852c58e7e57332f05ef1e0c + Monotone-Revision: c4c3d792d4b668f2d69a06c140f8d2223d8dbc7c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-13T21:00:00 + Monotone-Branch: ca.inverse.sogo + commit 6cd17dc9b8bb1afab627ec1029fdb8ba8bdc5303 Author: Wolfgang Sourdeau Date: Fri Jul 13 20:59:09 2012 +0000 @@ -4762,6 +6675,22 @@ Date: Fri Jul 13 13:00:02 2012 +0000 M SOPE/GDLContentStore/GCSSessionsFolder.m +commit 6a4657d23dbcbcd02b9886a2c70600419194e342 +Merge: ef84830 c342d3d +Author: Jean Raby +Date: Thu Jul 12 16:47:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 29aefdeb26834742b8cd9f01120573b4dcbcc7ed) + to branch 'ca.inverse.sogo' (head 3dfe653dfcaeadc5fe93ff1f2c0a1f9d049c1836) + + Monotone-Parent: 29aefdeb26834742b8cd9f01120573b4dcbcc7ed + Monotone-Parent: 3dfe653dfcaeadc5fe93ff1f2c0a1f9d049c1836 + Monotone-Revision: 4117fa474ee2ae428f109a99cb50a33479342fa8 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-12T16:47:28 + Monotone-Branch: ca.inverse.sogo + commit ef848303a34250b4c2c81e45717f01b2e14fa296 Author: Jean Raby Date: Thu Jul 12 16:47:23 2012 +0000 @@ -4794,6 +6723,37 @@ Date: Thu Jul 12 15:05:33 2012 +0000 M ChangeLog +commit 6c5bbadfd00357d6288468dca0112f970929c0d7 +Merge: 8a9bdcd 825686e +Author: Wolfgang Sourdeau +Date: Thu Jul 12 15:04:58 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head dac25405c6ab2f1d735ddb9f6db4243e5e96d14b) + to branch 'ca.inverse.sogo' (head 919ac12670dffae621309b1826bc13e0a9ecbe21) + + Monotone-Parent: 919ac12670dffae621309b1826bc13e0a9ecbe21 + Monotone-Parent: dac25405c6ab2f1d735ddb9f6db4243e5e96d14b + Monotone-Revision: f48e9e2abfb00e03cccd2aa8fd8998a415bb5ce1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-12T15:04:58 + Monotone-Branch: ca.inverse.sogo + +commit 825686eaed511f5f25b50b5b557a73897e9264b5 +Merge: d965eec 87a7732 +Author: Wolfgang Sourdeau +Date: Thu Jul 12 15:04:27 2012 +0000 + + merge of '1fae890d6e269d7918982811c46400a4ff38745d' + and '4d39a71900cc87ae1185f268c1c35a5a4b086b1d' + + Monotone-Parent: 1fae890d6e269d7918982811c46400a4ff38745d + Monotone-Parent: 4d39a71900cc87ae1185f268c1c35a5a4b086b1d + Monotone-Revision: dac25405c6ab2f1d735ddb9f6db4243e5e96d14b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-12T15:04:27 + commit 87a7732361e9d0089f5761b11fc8d963ccded448 Author: Wolfgang Sourdeau Date: Thu Jul 12 15:03:38 2012 +0000 @@ -4840,6 +6800,22 @@ Date: Wed Jul 11 19:50:56 2012 +0000 M UI/Scheduler/English.lproj/Localizable.strings +commit 8a9bdcd31b55a3493f7f4546036dd48bebb53a5e +Merge: d932f1f 2c987ba +Author: Ludovic Marcotte +Date: Wed Jul 11 18:58:31 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 740654a1f1be6a68843349cf438d5a87445f489e) + to branch 'ca.inverse.sogo' (head 2252f3047b058ea629e568aec7efb2b0432e3c0c) + + Monotone-Parent: 2252f3047b058ea629e568aec7efb2b0432e3c0c + Monotone-Parent: 740654a1f1be6a68843349cf438d5a87445f489e + Monotone-Revision: 919ac12670dffae621309b1826bc13e0a9ecbe21 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-11T18:58:31 + Monotone-Branch: ca.inverse.sogo + commit 2c987bae06ff8934c60ca19bc56a2e4a26c5d7cc Author: Ludovic Marcotte Date: Wed Jul 11 18:57:27 2012 +0000 @@ -4889,6 +6865,22 @@ Date: Wed Jul 11 14:09:37 2012 +0000 M ChangeLog +commit 569949bae729bd6deb1a02ba4601536196bee377 +Merge: c8c0030 9613024 +Author: Ludovic Marcotte +Date: Wed Jul 11 14:08:51 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 0012ddb107483154b76c08f33a7b8437b5309529) + to branch 'ca.inverse.sogo' (head fcec9822c0aaee8cefba77d0f50a8582b33fa3f0) + + Monotone-Parent: 0012ddb107483154b76c08f33a7b8437b5309529 + Monotone-Parent: fcec9822c0aaee8cefba77d0f50a8582b33fa3f0 + Monotone-Revision: 6eabcf880fa6d4620fb9a1ed111b15bef9bd9877 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-11T14:08:51 + Monotone-Branch: ca.inverse.sogo + commit c8c0030518df1dbcbd0edd608c4085f20b50d2d6 Author: Ludovic Marcotte Date: Wed Jul 11 14:06:41 2012 +0000 @@ -4985,6 +6977,22 @@ M NEWS M UI/Contacts/French.lproj/Localizable.strings M UI/Scheduler/French.lproj/Localizable.strings +commit 918affb638ad65ea04f152b557aa369bda8409bc +Merge: 2940970 03a125e +Author: Ludovic Marcotte +Date: Tue Jul 10 00:29:53 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head cf43f2030dbd1c4f0747be7cbd5dc3239cd6bd15) + to branch 'ca.inverse.sogo' (head b480939bb99d9c246f2a7f25b9728f4fff29d89e) + + Monotone-Parent: b480939bb99d9c246f2a7f25b9728f4fff29d89e + Monotone-Parent: cf43f2030dbd1c4f0747be7cbd5dc3239cd6bd15 + Monotone-Revision: c6b25920d896b2d19d0ef40a4cadee46c87bba2d + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-07-10T00:29:53 + Monotone-Branch: ca.inverse.sogo + commit 03a125ea1f1a0736aecac27198621e1c3e131a8f Author: Ludovic Marcotte Date: Tue Jul 10 00:29:13 2012 +0000 @@ -5019,6 +7027,22 @@ D UI/Templates/Appointments/SOGoAptMailUpdateReceipt.wox M UI/Templates/SchedulerUI/UIxCalendarProperties.wox M UI/WebServerResources/SchedulerUI.js +commit 2940970c3a6c72b9a75745c3f6b1ace75645529e +Merge: 630d86b 0d713ef +Author: Jean Raby +Date: Mon Jul 9 18:22:49 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 801c13ca7d8e3a2f3e502ee658399b458681bcab) + to branch 'ca.inverse.sogo' (head 7983cbe0c7e64bf7704effecf4a69991464e4276) + + Monotone-Parent: 7983cbe0c7e64bf7704effecf4a69991464e4276 + Monotone-Parent: 801c13ca7d8e3a2f3e502ee658399b458681bcab + Monotone-Revision: b480939bb99d9c246f2a7f25b9728f4fff29d89e + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-09T18:22:49 + Monotone-Branch: ca.inverse.sogo + commit 0d713efdd66df869820816e0f2cc993facc16ce4 Author: Jean Raby Date: Mon Jul 9 18:22:45 2012 +0000 @@ -5034,6 +7058,22 @@ Date: Mon Jul 9 18:22:45 2012 +0000 M Tools/SOGoToolExpireUserSessions.m +commit 630d86bf2a9fe4f3d9a514ab9dcc7f2f42cf0236 +Merge: 0766ff4 a6a00d8 +Author: Jean Raby +Date: Mon Jul 9 18:17:00 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head f0fb54908898753faba576cb702431e4a761d814) + to branch 'ca.inverse.sogo' (head dd70649f47a4d24e9414656eda1cc9955949dca2) + + Monotone-Parent: dd70649f47a4d24e9414656eda1cc9955949dca2 + Monotone-Parent: f0fb54908898753faba576cb702431e4a761d814 + Monotone-Revision: 7983cbe0c7e64bf7704effecf4a69991464e4276 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-09T18:17:00 + Monotone-Branch: ca.inverse.sogo + commit a6a00d875363d54ebe5f13661a2b58d5239cf6b7 Author: Jean Raby Date: Mon Jul 9 18:16:49 2012 +0000 @@ -5051,6 +7091,22 @@ Date: Mon Jul 9 18:16:49 2012 +0000 M ChangeLog M Tools/SOGoToolUserPreferences.m +commit 0766ff431e7c1d01a10bb86f84afa2f77607d311 +Merge: 727eda5 1b6727b +Author: Jean Raby +Date: Mon Jul 9 17:54:27 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 3896b9b187dfad2b01d68527f0411bd1a7cfe7b4) + to branch 'ca.inverse.sogo' (head 2910a50c602f0bb23fb3e3c5b513549ac30b58f8) + + Monotone-Parent: 2910a50c602f0bb23fb3e3c5b513549ac30b58f8 + Monotone-Parent: 3896b9b187dfad2b01d68527f0411bd1a7cfe7b4 + Monotone-Revision: dd70649f47a4d24e9414656eda1cc9955949dca2 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-09T17:54:27 + Monotone-Branch: ca.inverse.sogo + commit 1b6727bda6a9fb42ef81fc7f360da4a99f3530f3 Author: Jean Raby Date: Mon Jul 9 17:54:22 2012 +0000 @@ -5067,6 +7123,22 @@ M ChangeLog M UI/WebServerResources/UIxContactsUserFolders.js M UI/WebServerResources/generic.js +commit 727eda5ad907aed8141c690af7372edb414edbe7 +Merge: 390755d 9fa37ae +Author: Jean Raby +Date: Mon Jul 9 15:47:46 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 0d5958f50cf116f607e45fcde7496a5bc3726e1c) + to branch 'ca.inverse.sogo' (head 6fbc2bc5b209f589700507e19b2f5b537fd5ccce) + + Monotone-Parent: 0d5958f50cf116f607e45fcde7496a5bc3726e1c + Monotone-Parent: 6fbc2bc5b209f589700507e19b2f5b537fd5ccce + Monotone-Revision: 2910a50c602f0bb23fb3e3c5b513549ac30b58f8 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-09T15:47:46 + Monotone-Branch: ca.inverse.sogo + commit 390755d305014a16a513e9fa8ead28c83970cd23 Author: Jean Raby Date: Mon Jul 9 15:47:42 2012 +0000 @@ -5083,6 +7155,22 @@ Date: Mon Jul 9 15:47:42 2012 +0000 M ChangeLog M UI/WebServerResources/UIxContactsUserFolders.js +commit 9fa37aef114fc08ab9eb1f6da17acac71d85acde +Merge: 9e2e835 22690a8 +Author: Jean Raby +Date: Mon Jul 9 14:52:55 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 7ec57a209bc7361239e0e096f134affbbd4b5fc2) + to branch 'ca.inverse.sogo' (head 1afafb311417cef66b1fc16091418a9c10b9323f) + + Monotone-Parent: 1afafb311417cef66b1fc16091418a9c10b9323f + Monotone-Parent: 7ec57a209bc7361239e0e096f134affbbd4b5fc2 + Monotone-Revision: 6fbc2bc5b209f589700507e19b2f5b537fd5ccce + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-09T14:52:55 + Monotone-Branch: ca.inverse.sogo + commit 22690a8f8faf1c165ec8995d7e1063d7176397b5 Author: Jean Raby Date: Mon Jul 9 14:52:47 2012 +0000 @@ -5098,6 +7186,22 @@ Date: Mon Jul 9 14:52:47 2012 +0000 M UI/WebServerResources/ContactsUI.js +commit 9e2e8357459ddeb1d735b998591561cb8e2c3f84 +Merge: 3520a8c 7112191 +Author: Jean Raby +Date: Mon Jul 9 14:17:18 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 4e287287380938e20234ac951c09158c324b84b4) + to branch 'ca.inverse.sogo' (head 1c4b0de1b13fe836e324570323e90b9d779a8fa5) + + Monotone-Parent: 1c4b0de1b13fe836e324570323e90b9d779a8fa5 + Monotone-Parent: 4e287287380938e20234ac951c09158c324b84b4 + Monotone-Revision: 1afafb311417cef66b1fc16091418a9c10b9323f + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-09T14:17:18 + Monotone-Branch: ca.inverse.sogo + commit 71121914cf2dc04e1f5bfbc475721274171054c7 Author: Jean Raby Date: Mon Jul 9 14:17:07 2012 +0000 @@ -5147,6 +7251,22 @@ M UI/Templates/SchedulerUI/UIxCalWeekView.wox M UI/WebServerResources/ContactsUI.js M UI/WebServerResources/SchedulerUI.js +commit 3520a8c8478d197faa82215807eed79136cde71c +Merge: c4d11cd c5effe8 +Author: Jean Raby +Date: Thu Jul 5 21:16:08 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head e853157abbabf35bc95273da8bc10b2d3b142627) + to branch 'ca.inverse.sogo' (head f4b12b256d58270841b46929996b4bdf21924369) + + Monotone-Parent: e853157abbabf35bc95273da8bc10b2d3b142627 + Monotone-Parent: f4b12b256d58270841b46929996b4bdf21924369 + Monotone-Revision: 1c4b0de1b13fe836e324570323e90b9d779a8fa5 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-05T21:16:08 + Monotone-Branch: ca.inverse.sogo + commit c4d11cd91617f8905ce909c3ef70d2c764b64a7f Author: Jean Raby Date: Thu Jul 5 21:16:02 2012 +0000 @@ -5181,6 +7301,22 @@ M UI/Templates/ContactsUI/UIxContactFoldersView.wox M UI/WebServerResources/ContactsUI.js M UI/WebServerResources/generic.js +commit c5effe874f77bbd50b5cfb78c2707570f5bfc1ab +Merge: d13bd52 5639ee6 +Author: Jean Raby +Date: Thu Jul 5 17:35:09 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head f03db6cb5531dddabab4e8678d856fe593d3745d) + to branch 'ca.inverse.sogo' (head 2fe9d54ea82595348c57b93890c2e06bd53156db) + + Monotone-Parent: 2fe9d54ea82595348c57b93890c2e06bd53156db + Monotone-Parent: f03db6cb5531dddabab4e8678d856fe593d3745d + Monotone-Revision: f4b12b256d58270841b46929996b4bdf21924369 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-05T17:35:09 + Monotone-Branch: ca.inverse.sogo + commit 5639ee61804825948223440ed01a771cae87d5af Author: Jean Raby Date: Thu Jul 5 17:35:02 2012 +0000 @@ -5195,6 +7331,22 @@ Date: Thu Jul 5 17:35:02 2012 +0000 M UI/Contacts/UIxContactView.m +commit d13bd52f62eec287faab528183e46f10dc4c3ef2 +Merge: 3e2bfbe 993c0ee +Author: Jean Raby +Date: Thu Jul 5 17:18:41 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head f3654e9c29406b43890181ca1e890b64daca6321) + to branch 'ca.inverse.sogo' (head 9fc01803511e28b63ef83d04b3a22f5da78861a3) + + Monotone-Parent: 9fc01803511e28b63ef83d04b3a22f5da78861a3 + Monotone-Parent: f3654e9c29406b43890181ca1e890b64daca6321 + Monotone-Revision: 2fe9d54ea82595348c57b93890c2e06bd53156db + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-05T17:18:41 + Monotone-Branch: ca.inverse.sogo + commit 993c0ee52edd025a4569424a4dd7e608a5ed527f Author: Jean Raby Date: Thu Jul 5 17:17:50 2012 +0000 @@ -5217,6 +7369,22 @@ M ChangeLog M UI/Contacts/UIxContactView.m M UI/Templates/ContactsUI/UIxContactView.wox +commit 3e2bfbea14e5e2851f3ec51a7cff780ed562a0f9 +Merge: 96f1a8b 19adabf +Author: Jean Raby +Date: Thu Jul 5 16:56:37 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 4c9ff5822433c2ff8fcad8c7432a9575f9890b24) + to branch 'ca.inverse.sogo' (head f25607e5762568e3c223b1868307c8cc92bd66da) + + Monotone-Parent: 4c9ff5822433c2ff8fcad8c7432a9575f9890b24 + Monotone-Parent: f25607e5762568e3c223b1868307c8cc92bd66da + Monotone-Revision: 9fc01803511e28b63ef83d04b3a22f5da78861a3 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-07-05T16:56:37 + Monotone-Branch: ca.inverse.sogo + commit 96f1a8b2475e0ef66ff3e3ca78d2c753f9147288 Author: Jean Raby Date: Thu Jul 5 16:56:27 2012 +0000 @@ -5258,6 +7426,22 @@ Date: Mon Jul 2 19:49:05 2012 +0000 M ChangeLog +commit 9ff48bda9d3c0eda4c0488f7e934d3dc7caabdc2 +Merge: 79c3eb3 0f4401a +Author: Wolfgang Sourdeau +Date: Mon Jul 2 19:48:38 2012 +0000 + + merge of 'ebf7c7e799b00cc44e631f47d644d492cac8a9aa' + and 'f93bc9e1291ae4d3aab97f39d7a28293e66adb43' + + Monotone-Parent: ebf7c7e799b00cc44e631f47d644d492cac8a9aa + Monotone-Parent: f93bc9e1291ae4d3aab97f39d7a28293e66adb43 + Monotone-Revision: 47874ea582a8f97d988110f4d4174d2668de0fb0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-07-02T19:48:38 + Monotone-Branch: ca.inverse.sogo + commit 79c3eb33dcfcf029f877231de49c364dc2e1644e Author: Wolfgang Sourdeau Date: Sun Jul 1 22:31:05 2012 +0000 @@ -5304,6 +7488,54 @@ M ChangeLog M OpenChange/NSDate+MAPIStore.h M OpenChange/NSDate+MAPIStore.m +commit 0f4401a4b657384366ec61c6f050daccf63c0cca +Merge: 09504ed b3acd2e +Author: Francis Lachapelle +Date: Sat Jun 30 18:35:39 2012 +0000 + + merge of 'a4c7e35d642045e63467a131fae8049524f450e4' + and 'a6b977673a1cc94b1269e19c469101dca9fd17bc' + + Monotone-Parent: a4c7e35d642045e63467a131fae8049524f450e4 + Monotone-Parent: a6b977673a1cc94b1269e19c469101dca9fd17bc + Monotone-Revision: f93bc9e1291ae4d3aab97f39d7a28293e66adb43 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-06-30T18:35:39 + Monotone-Branch: ca.inverse.sogo + +commit 09504ed1cb89bf12dfcab5c9baff20f3f27153fb +Merge: 5913064 e587ae0 +Author: Francis Lachapelle +Date: Sat Jun 30 18:20:30 2012 +0000 + + merge of '3f8608c82d9c379cc9e0fea6ffe853cc1949a24b' + and '7634b9d503d61b6240548e75e7f872081debc6b4' + + Monotone-Parent: 3f8608c82d9c379cc9e0fea6ffe853cc1949a24b + Monotone-Parent: 7634b9d503d61b6240548e75e7f872081debc6b4 + Monotone-Revision: a4c7e35d642045e63467a131fae8049524f450e4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-06-30T18:20:30 + Monotone-Branch: ca.inverse.sogo + +commit 92f3ad1b06984a262b73118d049c5a635aa228de +Merge: 8e137c7 13bad20 +Author: Wolfgang Sourdeau +Date: Sat Jun 30 11:46:19 2012 +0000 + + merge of '43774db162efbc47a3e22d6daeeef1ed2cf6446f' + and 'fc5a6818c0ee3f04b21668c4b2008a9549fb34f7' + + Monotone-Parent: 43774db162efbc47a3e22d6daeeef1ed2cf6446f + Monotone-Parent: fc5a6818c0ee3f04b21668c4b2008a9549fb34f7 + Monotone-Revision: b4eb1c4ecb6343d34ed9700a15e35cd1c9dc33af + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-06-30T11:46:19 + Monotone-Branch: ca.inverse.sogo + commit 13bad20737c7ac33a8092610555df01e093a392b Author: Wolfgang Sourdeau Date: Sat Jun 30 07:30:44 2012 +0000 @@ -5320,6 +7552,22 @@ M OpenChange/MAPIStoreSOGo.m M OpenChange/NSObject+MAPIStore.h M OpenChange/NSObject+MAPIStore.m +commit 8e137c7370dce6151cfbfb69b56fc1ca51894008 +Merge: 0a2244c 6987cba +Author: Jean Raby +Date: Fri Jun 29 20:18:26 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 228f7d730cde5a5046b0885c1ac02649ee2b7c05) + to branch 'ca.inverse.sogo' (head 53c7bfdc2c357c162e23401ab5600d2cb4a1483e) + + Monotone-Parent: 228f7d730cde5a5046b0885c1ac02649ee2b7c05 + Monotone-Parent: 53c7bfdc2c357c162e23401ab5600d2cb4a1483e + Monotone-Revision: 43774db162efbc47a3e22d6daeeef1ed2cf6446f + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-06-29T20:18:26 + Monotone-Branch: ca.inverse.sogo + commit 0a2244c2cb6fdd2c47cd41218ed746f118a920d8 Author: Jean Raby Date: Fri Jun 29 20:17:20 2012 +0000 @@ -5374,6 +7622,22 @@ Date: Fri Jun 29 19:25:31 2012 +0000 A OpenChange/SOGoMAPIDBMessage.h A OpenChange/SOGoMAPIDBMessage.m +commit 56621c9d5e0db1bbe33df1a65dab9efc6c66918d +Merge: a783d81 e587ae0 +Author: Wolfgang Sourdeau +Date: Fri Jun 29 19:10:27 2012 +0000 + + merge of '4ecb95aab8f686702ff3eb186a97b1bf1f3b5531' + and '7634b9d503d61b6240548e75e7f872081debc6b4' + + Monotone-Parent: 4ecb95aab8f686702ff3eb186a97b1bf1f3b5531 + Monotone-Parent: 7634b9d503d61b6240548e75e7f872081debc6b4 + Monotone-Revision: 0c4f43a27b60ff9951c52b8ab1d9309d5fc9f209 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-06-29T19:10:27 + Monotone-Branch: ca.inverse.sogo + commit a783d81528b67a1dcbdc2f19ed065684308b7a6d Author: Wolfgang Sourdeau Date: Fri Jun 29 19:09:02 2012 +0000 @@ -5522,6 +7786,22 @@ Date: Thu Jun 28 14:45:12 2012 +0000 M SOPE/GDLContentStore/GCSSpecialQueries.h M SOPE/GDLContentStore/GCSSpecialQueries.m +commit e587ae08cfb3d525200ba3365c4ee9d961475d66 +Merge: cb5ba07 38b1cbd +Author: Jean Raby +Date: Wed Jun 27 16:06:45 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head a4ef73c2ad79c8da8d8e0c93767ab06e14bc846b) + to branch 'ca.inverse.sogo' (head 25245057b6fcee6d3af9a15a930deba187d79422) + + Monotone-Parent: 25245057b6fcee6d3af9a15a930deba187d79422 + Monotone-Parent: a4ef73c2ad79c8da8d8e0c93767ab06e14bc846b + Monotone-Revision: 7634b9d503d61b6240548e75e7f872081debc6b4 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-06-27T16:06:45 + Monotone-Branch: ca.inverse.sogo + commit 38b1cbd014fc101eb0245d09b5a87ea782581ed7 Author: Jean Raby Date: Wed Jun 27 16:06:20 2012 +0000 @@ -5559,6 +7839,22 @@ M NEWS M SoObjects/Appointments/Czech.lproj/Localizable.strings M UI/MailerUI/Czech.lproj/Localizable.strings +commit cb5ba07a697f959bfe18b7562718ce27d8a942c6 +Merge: 35781a2 cba2a7d +Author: Jean Raby +Date: Fri Jun 22 19:06:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 802a8f25aa0ed67386953826b82939c3ab98bba2) + to branch 'ca.inverse.sogo' (head 5c56673cb595ae5a0b092f95cc9c5ac3bea114bc) + + Monotone-Parent: 5c56673cb595ae5a0b092f95cc9c5ac3bea114bc + Monotone-Parent: 802a8f25aa0ed67386953826b82939c3ab98bba2 + Monotone-Revision: 25245057b6fcee6d3af9a15a930deba187d79422 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-06-22T19:06:28 + Monotone-Branch: ca.inverse.sogo + commit cba2a7d458da942433979263fb5e7a7b5327e688 Author: Jean Raby Date: Fri Jun 22 19:06:17 2012 +0000 @@ -5600,6 +7896,22 @@ Date: Fri Jun 22 15:08:30 2012 +0000 M SOPE/GDLContentStore/GCSSpecialQueries.m +commit 35781a22a76a6f86b3ebadba1d5f3cf834a3f0d1 +Merge: 59e871a 6d745e0 +Author: Ludovic Marcotte +Date: Thu Jun 21 23:32:25 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 5e99e6ac2d5684eba786f2ce14295f3a3b5267a3) + to branch 'ca.inverse.sogo' (head 29b92cb0e2207332af7eb0b8097b4cc79b5ee43d) + + Monotone-Parent: 29b92cb0e2207332af7eb0b8097b4cc79b5ee43d + Monotone-Parent: 5e99e6ac2d5684eba786f2ce14295f3a3b5267a3 + Monotone-Revision: 5c56673cb595ae5a0b092f95cc9c5ac3bea114bc + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-06-21T23:32:25 + Monotone-Branch: ca.inverse.sogo + commit 6d745e0f4b07236d0ede4a6012d776264240290c Author: Ludovic Marcotte Date: Thu Jun 21 23:32:18 2012 +0000 @@ -5629,6 +7941,22 @@ M UI/WebServerResources/UIxAttendeesEditor.js M UI/WebServerResources/UIxContactsUserFolders.js M UI/WebServerResources/generic.js +commit 59e871a87dff1b27363a678326ef2eb3f6c25f5e +Merge: e48a9ba 86b689d +Author: Jean Raby +Date: Thu Jun 21 15:52:24 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head aadc4759a64f724760d38bbdfd92715182856439) + to branch 'ca.inverse.sogo' (head aa6b7008cf5e7d5a1375822a416d0578868197db) + + Monotone-Parent: aa6b7008cf5e7d5a1375822a416d0578868197db + Monotone-Parent: aadc4759a64f724760d38bbdfd92715182856439 + Monotone-Revision: 29b92cb0e2207332af7eb0b8097b4cc79b5ee43d + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-06-21T15:52:24 + Monotone-Branch: ca.inverse.sogo + commit 86b689d7e80f042d283af68a9fa368822cfcb609 Author: Jean Raby Date: Thu Jun 21 15:51:53 2012 +0000 @@ -5644,6 +7972,22 @@ Date: Thu Jun 21 15:51:53 2012 +0000 M Tools/SOGoToolExpireUserSessions.m +commit e48a9ba0eda999104419cb1716e8674546940af7 +Merge: 70002fe 58d1158 +Author: Jean Raby +Date: Thu Jun 21 14:26:21 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head e699f14b51f9de020728f6ca36fdcc283587d057) + to branch 'ca.inverse.sogo' (head dd23eda9d783ae26ebd0bff76f56685ce5181ef1) + + Monotone-Parent: dd23eda9d783ae26ebd0bff76f56685ce5181ef1 + Monotone-Parent: e699f14b51f9de020728f6ca36fdcc283587d057 + Monotone-Revision: aa6b7008cf5e7d5a1375822a416d0578868197db + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-06-21T14:26:21 + Monotone-Branch: ca.inverse.sogo + commit 58d115817b7b000551b97f52ff0766ea0106888d Author: Jean Raby Date: Thu Jun 21 14:25:57 2012 +0000 @@ -5672,6 +8016,37 @@ Date: Thu Jun 21 13:54:23 2012 +0000 M Tests/Integration/test-caldav-scheduling.py +commit 70002fe57422c8c8feff7cacec3de00df03e3a32 +Merge: ea33d10 4a9577e +Author: Jean Raby +Date: Wed Jun 20 20:35:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 21464a96c4abb93d2143e8f30b059d2f01bab016) + to branch 'ca.inverse.sogo' (head fe40ce2ccc4fc2a690968594698949dc4b73f035) + + Monotone-Parent: 21464a96c4abb93d2143e8f30b059d2f01bab016 + Monotone-Parent: fe40ce2ccc4fc2a690968594698949dc4b73f035 + Monotone-Revision: dd23eda9d783ae26ebd0bff76f56685ce5181ef1 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-06-20T20:35:28 + Monotone-Branch: ca.inverse.sogo + +commit ea33d10117d0e32a8295438b20c805f4e2d48b7a +Merge: 0845f13 b88d623 +Author: Jean Raby +Date: Wed Jun 20 20:35:13 2012 +0000 + + merge of '30b555a484fd45f63e941b88e3afc1f2784480da' + and '7658ec99af152b2743393d20c3c4f2c23610ec4c' + + Monotone-Parent: 30b555a484fd45f63e941b88e3afc1f2784480da + Monotone-Parent: 7658ec99af152b2743393d20c3c4f2c23610ec4c + Monotone-Revision: 21464a96c4abb93d2143e8f30b059d2f01bab016 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-06-20T20:35:13 + commit 0845f13327f6f0cedfa747ef68aff38e152d501d Author: Jean Raby Date: Wed Jun 20 20:34:28 2012 +0000 @@ -5690,6 +8065,22 @@ Date: Wed Jun 20 20:34:28 2012 +0000 M Tests/Integration/test-caldav-scheduling.py +commit 4a9577e18e0e2b439eb924a2e1f5c9069dfce281 +Merge: b88d623 988ca2d +Author: Ludovic Marcotte +Date: Wed Jun 20 14:06:09 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 7658ec99af152b2743393d20c3c4f2c23610ec4c) + to branch 'ca.inverse.sogo' (head c69af3e4b83d5cab3a52701fb736c8a149697338) + + Monotone-Parent: 7658ec99af152b2743393d20c3c4f2c23610ec4c + Monotone-Parent: c69af3e4b83d5cab3a52701fb736c8a149697338 + Monotone-Revision: fe40ce2ccc4fc2a690968594698949dc4b73f035 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-06-20T14:06:09 + Monotone-Branch: ca.inverse.sogo + commit b88d623ad373eb65e577afd111b91bc655b3b86a Author: Ludovic Marcotte Date: Wed Jun 20 14:05:40 2012 +0000 @@ -5734,6 +8125,22 @@ Date: Mon Jun 18 17:50:31 2012 +0000 M Documentation/SOGo Native Microsoft Outlook Configuration.odt +commit b35f5f0ecbc10346b26c1d9a6a55b7a702d14a27 +Merge: 917a857 07cc5e8 +Author: Ludovic Marcotte +Date: Mon Jun 18 17:21:48 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_17' (head 6105680d967d026c63b9b9f96cb3aeae9884e804) + to branch 'ca.inverse.sogo' (head b664e2e19975c70a7614aa975a3a045f0bec7ec3) + + Monotone-Parent: 6105680d967d026c63b9b9f96cb3aeae9884e804 + Monotone-Parent: b664e2e19975c70a7614aa975a3a045f0bec7ec3 + Monotone-Revision: 6748af72ecdd0c613acb968eb261448ae6b6982d + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-06-18T17:21:48 + Monotone-Branch: ca.inverse.sogo + commit 917a857d6bc4e98fd64da0ddb942df8532dca5a6 Author: Ludovic Marcotte Date: Mon Jun 18 17:21:24 2012 +0000 @@ -5819,6 +8226,21 @@ Date: Mon Jun 11 13:27:08 2012 +0000 M UI/WebServerResources/generic.css M UI/WebServerResources/iefixes.css +commit ac46cef9b004689f487a0d92a1dcca30d56a1422 +Merge: 781c578 b4d8609 +Author: Francis Lachapelle +Date: Fri Jun 8 21:33:45 2012 +0000 + + propagate from branch 'ca.inverse.sogo' (head ccc94ebd9d872963c33041a7cac766343762bef2) + to branch 'ca.inverse.sogo.1_3_17' (head 987a622d6acb514d5652a1125c4c320d585470ae) + + Monotone-Parent: 987a622d6acb514d5652a1125c4c320d585470ae + Monotone-Parent: ccc94ebd9d872963c33041a7cac766343762bef2 + Monotone-Revision: 74828d7539e15e54c9b42034f03693356bb13912 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-06-08T21:33:45 + commit 781c578fa21d62e7362120dbc6d1f47447ba8acd Author: Francis Lachapelle Date: Fri Jun 8 21:31:21 2012 +0000 @@ -5973,6 +8395,21 @@ M OpenChange/MAPIStoreTasksMessage.m M OpenChange/MAPIStoreTypes.m M OpenChange/NSObject+MAPIStore.m +commit 33bb7e55568b61f1c1488b66d3d243e302ce380e +Merge: fd7f15c 2c9a61f +Author: Francis Lachapelle +Date: Fri Jun 1 14:30:06 2012 +0000 + + merge of '40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768' + and 'f542ae0ee839e825fc2f1dae6c5d916237edb3e4' + + Monotone-Parent: 40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768 + Monotone-Parent: f542ae0ee839e825fc2f1dae6c5d916237edb3e4 + Monotone-Revision: d6ace8d3429bf9ad569fff969474bd5aa01214ae + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-06-01T14:30:06 + commit 2c9a61f0c50cac8f6ca929ec0b21a04c6d8f3061 Author: Francis Lachapelle Date: Fri Jun 1 14:29:30 2012 +0000 @@ -5988,6 +8425,22 @@ Date: Fri Jun 1 14:29:30 2012 +0000 M ChangeLog M SoObjects/SOGo/NSString+Utilities.m +commit 9690014465698916e7084d9b30fd51fcaaee94cb +Merge: fd7f15c 86fd762 +Author: Wolfgang Sourdeau +Date: Fri Jun 1 14:22:32 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head 40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768) + to branch 'ca.inverse.sogo' (head b7eda388ab81350d88ecf1275f9481aae4f94bd8) + + Monotone-Parent: 40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768 + Monotone-Parent: b7eda388ab81350d88ecf1275f9481aae4f94bd8 + Monotone-Revision: c8921f898d8810ab70f86851a0449a28dc34eb89 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-06-01T14:22:32 + Monotone-Branch: ca.inverse.sogo + commit fd7f15c81e758efc58d61d2c7979a4a6b5b61245 Author: Wolfgang Sourdeau Date: Fri Jun 1 14:22:28 2012 +0000 @@ -6001,6 +8454,22 @@ Date: Fri Jun 1 14:22:28 2012 +0000 M ChangeLog M UI/MailPartViewers/UIxMailPartAlternativeViewer.m +commit 86fd7623361e4a16378d3b781bcaf1e12b749f17 +Merge: 5cbac94 9e842e7 +Author: Wolfgang Sourdeau +Date: Fri Jun 1 13:55:06 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0) + to branch 'ca.inverse.sogo' (head 08ebdafabc8167a4fc18a6a90be850eb8f0a5e1d) + + Monotone-Parent: 08ebdafabc8167a4fc18a6a90be850eb8f0a5e1d + Monotone-Parent: 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0 + Monotone-Revision: b7eda388ab81350d88ecf1275f9481aae4f94bd8 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-06-01T13:55:06 + Monotone-Branch: ca.inverse.sogo + commit 9e842e72776390c5e2f7eebc657f7413aff19592 Author: Wolfgang Sourdeau Date: Fri Jun 1 13:54:52 2012 +0000 @@ -6014,6 +8483,22 @@ Date: Fri Jun 1 13:54:52 2012 +0000 M ChangeLog M SoObjects/SOGo/NSString+Crypto.m +commit 5cbac94a717cc2aa275a8dd73536393a19f1ee99 +Merge: 1ca5818 005266e +Author: Wolfgang Sourdeau +Date: Thu May 31 20:02:29 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head 9471287ef57b6223c0e3a175d74fc5f6b9ebc42f) + to branch 'ca.inverse.sogo' (head 4e81d43596ddd37e670d5d889ac9d587abca3068) + + Monotone-Parent: 4e81d43596ddd37e670d5d889ac9d587abca3068 + Monotone-Parent: 9471287ef57b6223c0e3a175d74fc5f6b9ebc42f + Monotone-Revision: 08ebdafabc8167a4fc18a6a90be850eb8f0a5e1d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-31T20:02:29 + Monotone-Branch: ca.inverse.sogo + commit 005266ee5d4d9c5dddc4d38f067a8012d72472ed Author: Wolfgang Sourdeau Date: Thu May 31 20:02:15 2012 +0000 @@ -6028,6 +8513,22 @@ Date: Thu May 31 20:02:15 2012 +0000 M Documentation/SOGo Installation Guide.odt +commit 1ca5818f89169eb646aac5832e6006b655a7d9cd +Merge: ee73a87 9234f5e +Author: Ludovic Marcotte +Date: Thu May 31 16:57:36 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head 9f0e5527e462283d664abba2e2d57060f276c4d0) + to branch 'ca.inverse.sogo' (head cb0fdb8e1df2644d8f633779e64cca48f332bbf6) + + Monotone-Parent: 9f0e5527e462283d664abba2e2d57060f276c4d0 + Monotone-Parent: cb0fdb8e1df2644d8f633779e64cca48f332bbf6 + Monotone-Revision: 4e81d43596ddd37e670d5d889ac9d587abca3068 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-31T16:57:36 + Monotone-Branch: ca.inverse.sogo + commit ee73a872af8b61acd06c91f4e523dbe040ee0d1e Author: Ludovic Marcotte Date: Thu May 31 16:57:15 2012 +0000 @@ -6042,6 +8543,22 @@ Date: Thu May 31 16:57:15 2012 +0000 M Documentation/SOGo Installation Guide.odt +commit 9234f5edd062467b4cbcc21ab38e02f1294d0fdb +Merge: c55ad93 efb4e99 +Author: Ludovic Marcotte +Date: Thu May 31 16:26:11 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head 743c613acf2129a221bf3026f94cba3d33fa64c8) + to branch 'ca.inverse.sogo' (head 45eb5c274b8f92ec62e79ca295ad0a74f02f89ec) + + Monotone-Parent: 45eb5c274b8f92ec62e79ca295ad0a74f02f89ec + Monotone-Parent: 743c613acf2129a221bf3026f94cba3d33fa64c8 + Monotone-Revision: cb0fdb8e1df2644d8f633779e64cca48f332bbf6 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-31T16:26:11 + Monotone-Branch: ca.inverse.sogo + commit efb4e99fec40f450addcc18a839dbcd3e1ba88a6 Author: Ludovic Marcotte Date: Thu May 31 16:25:31 2012 +0000 @@ -6057,6 +8574,22 @@ Date: Thu May 31 16:25:31 2012 +0000 M ChangeLog M UI/MailerUI/UIxMailMainFrame.m +commit c55ad9363e0eb0c46cb398c4f75d8f36d2f1a226 +Merge: 20c9d86 ed67384 +Author: Ludovic Marcotte +Date: Thu May 31 14:51:39 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head fa6f3f2b467eaa14a01fb8a7dc2aee1e5e4191da) + to branch 'ca.inverse.sogo' (head 22fa8b6672b234c62ac60b3b99cae8134f58ed09) + + Monotone-Parent: 22fa8b6672b234c62ac60b3b99cae8134f58ed09 + Monotone-Parent: fa6f3f2b467eaa14a01fb8a7dc2aee1e5e4191da + Monotone-Revision: 45eb5c274b8f92ec62e79ca295ad0a74f02f89ec + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-31T14:51:39 + Monotone-Branch: ca.inverse.sogo + commit ed67384586e82f8cfd23bcd23538cf107ffe1470 Author: Ludovic Marcotte Date: Thu May 31 14:51:18 2012 +0000 @@ -6073,6 +8606,22 @@ M ChangeLog M SoObjects/Mailer/SOGoMailFolder.m M UI/MailerUI/UIxMailEditor.m +commit 20c9d86276025b0aaaf7516adaf56c987a050c74 +Merge: a449fd3 f2b455f +Author: Ludovic Marcotte +Date: Thu May 31 14:23:26 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head b5d91e74f183ad54e2362119b25b4556f810e3b6) + to branch 'ca.inverse.sogo' (head 1448263394a13cd5b07e5e7b96a8698dece9f745) + + Monotone-Parent: 1448263394a13cd5b07e5e7b96a8698dece9f745 + Monotone-Parent: b5d91e74f183ad54e2362119b25b4556f810e3b6 + Monotone-Revision: 22fa8b6672b234c62ac60b3b99cae8134f58ed09 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-31T14:23:26 + Monotone-Branch: ca.inverse.sogo + commit f2b455fffcb0f51e4192c0598fc77ecf3353c4c5 Author: Ludovic Marcotte Date: Thu May 31 14:22:34 2012 +0000 @@ -6088,6 +8637,22 @@ Date: Thu May 31 14:22:34 2012 +0000 M ChangeLog M SoObjects/Mailer/SOGoMailFolder.m +commit a449fd3fae52788e48aaf567dd89028de416ddf9 +Merge: 8aad53c 08230b3 +Author: Ludovic Marcotte +Date: Thu May 31 13:25:20 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head 3c4baa92c5634d4da061da739a9b544d04c44586) + to branch 'ca.inverse.sogo' (head 2a93bffe818fbb8a4df73ae7b00f528618484717) + + Monotone-Parent: 2a93bffe818fbb8a4df73ae7b00f528618484717 + Monotone-Parent: 3c4baa92c5634d4da061da739a9b544d04c44586 + Monotone-Revision: 1448263394a13cd5b07e5e7b96a8698dece9f745 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-31T13:25:20 + Monotone-Branch: ca.inverse.sogo + commit 08230b33bb73b0b127723881ce80d0e98c059b9a Author: Ludovic Marcotte Date: Thu May 31 13:24:32 2012 +0000 @@ -6113,6 +8678,22 @@ M SoObjects/SOGo/SOGoUserManager.m M SoObjects/SOGo/SQLSource.h M SoObjects/SOGo/SQLSource.m +commit 8aad53cfe7a51ef193beb4dae2218029d4689cfd +Merge: f0d028a 18ffca1 +Author: Ludovic Marcotte +Date: Thu May 31 12:37:06 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head 747fe8c2134a990c1cdf3b494c2b7776021cb736) + to branch 'ca.inverse.sogo' (head 41c57dcc45ba83665003200a0ea8b1cc14d09eec) + + Monotone-Parent: 41c57dcc45ba83665003200a0ea8b1cc14d09eec + Monotone-Parent: 747fe8c2134a990c1cdf3b494c2b7776021cb736 + Monotone-Revision: 2a93bffe818fbb8a4df73ae7b00f528618484717 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-31T12:37:06 + Monotone-Branch: ca.inverse.sogo + commit 18ffca1924c8967977da7b3681f744a57bc61168 Author: Ludovic Marcotte Date: Thu May 31 12:36:00 2012 +0000 @@ -6130,6 +8711,38 @@ M SoObjects/SOGo/LDAPSource.m M SoObjects/SOGo/SOGoGroup.h M SoObjects/SOGo/SOGoGroup.m +commit f0d028a858df01c599714305c0cc12ff5d2801a4 +Merge: 8d5603b d98db78 +Author: Ludovic Marcotte +Date: Wed May 30 12:46:26 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head d29498142c4a9f1d780373bd5f0d80b17f6e2c33) + to branch 'ca.inverse.sogo' (head 7ce650138898448e808ecf1785eedab0ad0d3e6d) + + Monotone-Parent: 7ce650138898448e808ecf1785eedab0ad0d3e6d + Monotone-Parent: d29498142c4a9f1d780373bd5f0d80b17f6e2c33 + Monotone-Revision: 41c57dcc45ba83665003200a0ea8b1cc14d09eec + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-30T12:46:26 + Monotone-Branch: ca.inverse.sogo + +commit 8d5603b2fd55a69dda4de63889e3a2fa26ff7a11 +Merge: 760aa04 e6718fc +Author: Jean Raby +Date: Wed May 30 13:21:07 2012 +0000 + + merge of '244af3dc56c63ece14336e6211a7dd546a398220' + and 'b293c0227fba2b5897bfbdad32b4ca68f9773305' + + Monotone-Parent: 244af3dc56c63ece14336e6211a7dd546a398220 + Monotone-Parent: b293c0227fba2b5897bfbdad32b4ca68f9773305 + Monotone-Revision: 7ce650138898448e808ecf1785eedab0ad0d3e6d + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-05-30T13:21:07 + Monotone-Branch: ca.inverse.sogo + commit d98db782b3332e4cc342f846fbccec052e55cfce Author: Francis Lachapelle Date: Wed May 30 11:34:24 2012 +0000 @@ -6239,6 +8852,22 @@ M UI/Scheduler/English.lproj/Localizable.strings M UI/WebServerResources/ContactsUI.js M UI/WebServerResources/SchedulerUI.js +commit e6718fcd940a18ab174521aaa09081fc628e4819 +Merge: bcc391b 6aed6c5 +Author: Jean Raby +Date: Thu May 24 18:26:44 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_16' (head a7e3713b79d3ec5043152d79550eec23b2ff854f) + to branch 'ca.inverse.sogo' (head 1e818dce6a38dc4685756dd72c228642032fb6b0) + + Monotone-Parent: 1e818dce6a38dc4685756dd72c228642032fb6b0 + Monotone-Parent: a7e3713b79d3ec5043152d79550eec23b2ff854f + Monotone-Revision: b293c0227fba2b5897bfbdad32b4ca68f9773305 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-05-24T18:26:44 + Monotone-Branch: ca.inverse.sogo + commit 6aed6c5ed0cb645cc6e1b3c0f6d9cf0c0daf26a3 Author: Jean Raby Date: Thu May 24 18:09:47 2012 +0000 @@ -6323,6 +8952,22 @@ Date: Wed May 23 20:03:31 2012 +0000 M Version +commit bc19c9bf28308540081038218708156fbe05c60f +Merge: 395a1b1 125c3fe +Author: Jean Raby +Date: Fri May 18 15:04:39 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head a4d3a18ad2c918187328e23c7ab29824357cd199) + to branch 'ca.inverse.sogo' (head c8046798bce0f997bfa345dc5831f718d02a2638) + + Monotone-Parent: a4d3a18ad2c918187328e23c7ab29824357cd199 + Monotone-Parent: c8046798bce0f997bfa345dc5831f718d02a2638 + Monotone-Revision: 4139bd440f7c28fd59a0685b4ac2ca439778d5bf + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-05-18T15:04:39 + Monotone-Branch: ca.inverse.sogo + commit 395a1b16e160aaf88c5c675131a0ac24a2f565c1 Author: Jean Raby Date: Fri May 18 15:02:42 2012 +0000 @@ -6397,6 +9042,22 @@ Date: Tue May 15 17:37:07 2012 +0000 M NEWS +commit ea15cb50550f557d15f79d9ce50d707e667e3b64 +Merge: 9b814bc dbc75ce +Author: Jean Raby +Date: Tue May 15 14:40:37 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 1f2bd4b4727f3158ab77ca76322cd555967d326a) + to branch 'ca.inverse.sogo' (head 3c99de4fc0fd90e4716ce18b2354e46dc72159ec) + + Monotone-Parent: 1f2bd4b4727f3158ab77ca76322cd555967d326a + Monotone-Parent: 3c99de4fc0fd90e4716ce18b2354e46dc72159ec + Monotone-Revision: 471dc0f5e3b2a6fc571aca4e14c0a5161cf7af0b + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-05-15T14:40:37 + Monotone-Branch: ca.inverse.sogo + commit 9b814bc58c2d39162ed8317c3cd5f246b0b0b9e7 Author: Jean Raby Date: Tue May 15 14:36:52 2012 +0000 @@ -6447,6 +9108,22 @@ Date: Tue May 15 13:24:04 2012 +0000 M ChangeLog M OpenChange/gen-property-selectors.py +commit 9692f0a73aa6c587061f7794d76c11ecb79f98cd +Merge: 1a46b34 5d149a5 +Author: Wolfgang Sourdeau +Date: Tue May 15 02:33:16 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 8ac367dca61f0a4a66df59c7c786dd0f5016050d) + to branch 'ca.inverse.sogo' (head 25f8df1c5f86087b0e7ba1ba87e86db95ad798ab) + + Monotone-Parent: 25f8df1c5f86087b0e7ba1ba87e86db95ad798ab + Monotone-Parent: 8ac367dca61f0a4a66df59c7c786dd0f5016050d + Monotone-Revision: fa858afb28392ab411b14c34ac2889901bc0e49a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-15T02:33:16 + Monotone-Branch: ca.inverse.sogo + commit 5d149a53c74041abf2b6452cb7bafa0b7da23a47 Author: Francis Lachapelle Date: Mon May 14 23:58:40 2012 +0000 @@ -6514,6 +9191,22 @@ Date: Mon May 14 20:17:21 2012 +0000 M Documentation/SOGo Native Microsoft Outlook Configuration.odt +commit c8b1f70ca4e0633b89e9fdebe67cd9bc9567765c +Merge: 7aa524a 7895169 +Author: Wolfgang Sourdeau +Date: Mon May 14 20:03:13 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 253b9d96f0f6706a2b889ef7fa7b42009eb20cd3) + to branch 'ca.inverse.sogo' (head 2978fb164d72d09703322ba90dde130c04b410b2) + + Monotone-Parent: 253b9d96f0f6706a2b889ef7fa7b42009eb20cd3 + Monotone-Parent: 2978fb164d72d09703322ba90dde130c04b410b2 + Monotone-Revision: ec60fc6d9bbb30cc304f19f19609c756f5bebcd0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-14T20:03:13 + Monotone-Branch: ca.inverse.sogo + commit 7aa524ad544838d2c50b634ff3774a7854e4ad94 Author: Wolfgang Sourdeau Date: Mon May 14 20:02:56 2012 +0000 @@ -6526,6 +9219,22 @@ Date: Mon May 14 20:02:56 2012 +0000 M Documentation/SOGo Installation Guide.odt +commit 7895169695d95883834bb4b03b18de0286bf6fd3 +Merge: 8806542 5fba279 +Author: Wolfgang Sourdeau +Date: Mon May 14 19:06:30 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 4806c2af0bd085e4a9d26b15d540681d4a14cb0a) + to branch 'ca.inverse.sogo' (head 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9) + + Monotone-Parent: 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9 + Monotone-Parent: 4806c2af0bd085e4a9d26b15d540681d4a14cb0a + Monotone-Revision: 2978fb164d72d09703322ba90dde130c04b410b2 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-14T19:06:30 + Monotone-Branch: ca.inverse.sogo + commit 5fba2796909d3eb54e3f4533fefaf67734a9350b Author: Wolfgang Sourdeau Date: Mon May 14 19:06:28 2012 +0000 @@ -6540,6 +9249,22 @@ M ChangeLog M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/UIxContactsUserFolders.js +commit 88065426fed72ff7bde21026f6e3318268769042 +Merge: f5ea18a 782709f +Author: Wolfgang Sourdeau +Date: Mon May 14 19:04:17 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 908e524c769a51dae0dcb912328a3f394bff90c0) + to branch 'ca.inverse.sogo' (head 60ad1ae0d352bd61f6595c24b454acb729bdaadf) + + Monotone-Parent: 60ad1ae0d352bd61f6595c24b454acb729bdaadf + Monotone-Parent: 908e524c769a51dae0dcb912328a3f394bff90c0 + Monotone-Revision: 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-14T19:04:17 + Monotone-Branch: ca.inverse.sogo + commit 782709f0a7c9f353ea184507eee33f2fec2a7b17 Author: Wolfgang Sourdeau Date: Mon May 14 19:04:11 2012 +0000 @@ -6553,6 +9278,37 @@ Date: Mon May 14 19:04:11 2012 +0000 M ChangeLog M UI/WebServerResources/generic.js +commit f5ea18a605d8b7573185720498b0a3ef2a864a87 +Merge: 65890ce 94aa42a +Author: Wolfgang Sourdeau +Date: Mon May 14 17:11:42 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 4158f1d28c04b0be7b69ff93cf2e4b055de655a2) + to branch 'ca.inverse.sogo' (head 115d1815352fd6df1b6effd9e0c7adea24a0b9cf) + + Monotone-Parent: 115d1815352fd6df1b6effd9e0c7adea24a0b9cf + Monotone-Parent: 4158f1d28c04b0be7b69ff93cf2e4b055de655a2 + Monotone-Revision: 60ad1ae0d352bd61f6595c24b454acb729bdaadf + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-14T17:11:42 + Monotone-Branch: ca.inverse.sogo + +commit 94aa42a4ab93f8e91ce2de23b5d13138981851a0 +Merge: 364b9f3 eea3154 +Author: Wolfgang Sourdeau +Date: Mon May 14 17:11:33 2012 +0000 + + merge of 'bb27badf50d6df9168d73f3e08a4f10ce3626700' + and 'd63fe31c81597a22c53b5925bcf6bca60fc0e252' + + Monotone-Parent: bb27badf50d6df9168d73f3e08a4f10ce3626700 + Monotone-Parent: d63fe31c81597a22c53b5925bcf6bca60fc0e252 + Monotone-Revision: 4158f1d28c04b0be7b69ff93cf2e4b055de655a2 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-14T17:11:33 + commit 364b9f3d6166448f40ee72f372d9e9d5e804f7d7 Author: Wolfgang Sourdeau Date: Mon May 14 17:11:10 2012 +0000 @@ -6566,6 +9322,22 @@ Date: Mon May 14 17:11:10 2012 +0000 M ChangeLog M UI/WebServerResources/UIxPreferences.js +commit 65890cea7d048d42081c23a0a3e66296706e5488 +Merge: 1fc1249 eea3154 +Author: Jean Raby +Date: Fri May 11 20:01:24 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head d63fe31c81597a22c53b5925bcf6bca60fc0e252) + to branch 'ca.inverse.sogo' (head 96b915fdcf61ba0f6228b00597529086ab181a3b) + + Monotone-Parent: 96b915fdcf61ba0f6228b00597529086ab181a3b + Monotone-Parent: d63fe31c81597a22c53b5925bcf6bca60fc0e252 + Monotone-Revision: 115d1815352fd6df1b6effd9e0c7adea24a0b9cf + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-05-11T20:01:24 + Monotone-Branch: ca.inverse.sogo + commit eea3154fc1c71c3698ec74d1a9489c79672215b9 Author: Jean Raby Date: Fri May 11 20:01:06 2012 +0000 @@ -6580,6 +9352,22 @@ Date: Fri May 11 20:01:06 2012 +0000 M Tests/Integration/test-caldav-scheduling.py +commit 1fc124995b232d59fb6be869c37642f252c74e33 +Merge: 5c83c13 433e3d8 +Author: Jean Raby +Date: Fri May 11 17:46:11 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head e5f291945f01977de333fd7aabf6d7109c8ec335) + to branch 'ca.inverse.sogo' (head f30a499d50e08156f7d331ab40080bbad55c19f3) + + Monotone-Parent: e5f291945f01977de333fd7aabf6d7109c8ec335 + Monotone-Parent: f30a499d50e08156f7d331ab40080bbad55c19f3 + Monotone-Revision: 96b915fdcf61ba0f6228b00597529086ab181a3b + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-05-11T17:46:11 + Monotone-Branch: ca.inverse.sogo + commit 5c83c13e0490e13879be9483d3b96f00c9cada90 Author: Jean Raby Date: Fri May 11 17:45:44 2012 +0000 @@ -6595,6 +9383,22 @@ Date: Fri May 11 17:45:44 2012 +0000 M Tests/Integration/test-caldav-scheduling.py +commit 433e3d8042d2932af539a8eaf10bf03eabac32b0 +Merge: e301c9c 6ad52fe +Author: Jean Raby +Date: Fri May 11 16:22:05 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3) + to branch 'ca.inverse.sogo' (head 08910689dba5aa9bedbc810bbd626ad6d2f21db1) + + Monotone-Parent: 08910689dba5aa9bedbc810bbd626ad6d2f21db1 + Monotone-Parent: 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3 + Monotone-Revision: f30a499d50e08156f7d331ab40080bbad55c19f3 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-05-11T16:22:05 + Monotone-Branch: ca.inverse.sogo + commit 6ad52fe047834101901506ee143bd747f255379b Author: Jean Raby Date: Fri May 11 16:20:45 2012 +0000 @@ -6626,6 +9430,22 @@ M Tests/Integration/test-caldav-scheduling.py M Tests/Integration/test-davacl.py M Tests/Integration/test-ical.py +commit 760aa0486b2a4041d5fed0538bfeb63959f50c6c +Merge: e301c9c 674f0f9 +Author: Ludovic Marcotte +Date: Thu May 10 21:33:59 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 82335b9404ce69f30e311f831868f8d13e598a46) + to branch 'ca.inverse.sogo' (head 08910689dba5aa9bedbc810bbd626ad6d2f21db1) + + Monotone-Parent: 08910689dba5aa9bedbc810bbd626ad6d2f21db1 + Monotone-Parent: 82335b9404ce69f30e311f831868f8d13e598a46 + Monotone-Revision: 244af3dc56c63ece14336e6211a7dd546a398220 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-10T21:33:59 + Monotone-Branch: ca.inverse.sogo + commit 674f0f908fa4c44f986b151a6447066ccdb7a3c0 Author: Ludovic Marcotte Date: Thu May 10 21:33:39 2012 +0000 @@ -6640,6 +9460,22 @@ Date: Thu May 10 21:33:39 2012 +0000 M Documentation/SOGo Installation Guide.odt +commit e301c9cdd7eccf04b01b4a8c55f1fa70e5c32189 +Merge: 019c9c7 d8f5324 +Author: Ludovic Marcotte +Date: Thu May 10 17:45:25 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 0240947c2fe36b028b988b7133a239ffbc323558) + to branch 'ca.inverse.sogo' (head 94fb373c2fbcbed75c514c449066c36ed469a580) + + Monotone-Parent: 0240947c2fe36b028b988b7133a239ffbc323558 + Monotone-Parent: 94fb373c2fbcbed75c514c449066c36ed469a580 + Monotone-Revision: 08910689dba5aa9bedbc810bbd626ad6d2f21db1 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-10T17:45:25 + Monotone-Branch: ca.inverse.sogo + commit 019c9c742a402cf333f65c01b5a1e1ce4f429fde Author: Ludovic Marcotte Date: Thu May 10 17:44:36 2012 +0000 @@ -6670,6 +9506,38 @@ M Documentation/SOGo Installation Guide.odt M Documentation/SOGo Mobile Devices Configuration.odt M Documentation/SOGo Mozilla Thunderbird Configuration.odt +commit d8f53244067e280f5d41ffcc9ddf3b21bc37c569 +Merge: 08648f5 7083df2 +Author: Ludovic Marcotte +Date: Wed May 9 13:53:29 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 010e63dffb557b9171f08a63428acdd11998ab56) + to branch 'ca.inverse.sogo' (head d130ee40b503d518a809601b1cab53710dbeea4b) + + Monotone-Parent: 010e63dffb557b9171f08a63428acdd11998ab56 + Monotone-Parent: d130ee40b503d518a809601b1cab53710dbeea4b + Monotone-Revision: 94fb373c2fbcbed75c514c449066c36ed469a580 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-09T13:53:29 + Monotone-Branch: ca.inverse.sogo + +commit 7083df2d2818ea35c8fe5c4e26baa4078e6cc8fc +Merge: 9e65b8b 650cbd0 +Author: Jean Raby +Date: Wed May 9 17:49:33 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 6857ec31df4746fa033c80de4b53d7d7e0a4b9e4) + to branch 'ca.inverse.sogo' (head 6ae7fe046a4b2457859b40e2f1ce7af496af87f2) + + Monotone-Parent: 6857ec31df4746fa033c80de4b53d7d7e0a4b9e4 + Monotone-Parent: 6ae7fe046a4b2457859b40e2f1ce7af496af87f2 + Monotone-Revision: d130ee40b503d518a809601b1cab53710dbeea4b + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-05-09T17:49:33 + Monotone-Branch: ca.inverse.sogo + commit 9e65b8b3e4bc1f66fa427e22bbda90ef98cfecf6 Author: Jean Raby Date: Wed May 9 17:48:51 2012 +0000 @@ -6702,6 +9570,38 @@ Date: Wed May 9 13:53:22 2012 +0000 M SOPE/GDLContentStore/EOQualifier+GCS.m M SOPE/GDLContentStore/GCSFolder.m +commit 650cbd0489a28b5aef4c610497a6f2fb836a54f5 +Merge: bb594f1 54c6983 +Author: Ludovic Marcotte +Date: Wed May 9 12:48:49 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 4a872122da5acff4772feafceee7decf55c1bd98) + to branch 'ca.inverse.sogo' (head b2d9259d01bec3e1e78582b987d4091f8472b129) + + Monotone-Parent: 4a872122da5acff4772feafceee7decf55c1bd98 + Monotone-Parent: b2d9259d01bec3e1e78582b987d4091f8472b129 + Monotone-Revision: 6ae7fe046a4b2457859b40e2f1ce7af496af87f2 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-09T12:48:49 + Monotone-Branch: ca.inverse.sogo + +commit 54c69836ab43be978df285fdf9f1ed002dcfb496 +Merge: 55ff3aa b4d661b +Author: Wolfgang Sourdeau +Date: Wed May 9 15:24:16 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head d4a2b559c00ba43032aff09497fe8be50f429e21) + to branch 'ca.inverse.sogo' (head a7e1ea6582c544441d18a19cd60774003d863f46) + + Monotone-Parent: a7e1ea6582c544441d18a19cd60774003d863f46 + Monotone-Parent: d4a2b559c00ba43032aff09497fe8be50f429e21 + Monotone-Revision: b2d9259d01bec3e1e78582b987d4091f8472b129 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-09T15:24:16 + Monotone-Branch: ca.inverse.sogo + commit bb594f19210b6e2882cc970d07784d4d02f677ae Author: Ludovic Marcotte Date: Wed May 9 12:48:44 2012 +0000 @@ -6716,6 +9616,21 @@ Date: Wed May 9 12:48:44 2012 +0000 M NEWS +commit b4d661bb01f2d458aa1ca09e7419fa617179dea5 +Merge: 93dd01d 61a2a4a +Author: Ludovic Marcotte +Date: Wed May 9 10:54:14 2012 +0000 + + merge of '4e44cee96e74269b692d100a0c98730015a49d07' + and 'ee535991d8282dcec82a7f59c0d07efbbddada4f' + + Monotone-Parent: 4e44cee96e74269b692d100a0c98730015a49d07 + Monotone-Parent: ee535991d8282dcec82a7f59c0d07efbbddada4f + Monotone-Revision: d4a2b559c00ba43032aff09497fe8be50f429e21 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-09T10:54:14 + commit 61a2a4a7ee13d9bffb5d150fbaf476f7be373ec2 Author: Francis Lachapelle Date: Wed May 9 13:31:20 2012 +0000 @@ -6781,6 +9696,22 @@ Date: Tue May 8 18:58:57 2012 +0000 M ChangeLog M UI/Contacts/UIxContactView.m +commit 55ff3aa77bb09f2386cdb23228341336f6388dca +Merge: 905c635 dfd0339 +Author: Ludovic Marcotte +Date: Tue May 8 14:43:29 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head dcd831afcbb347de38ec00c05b919923433a9f1f) + to branch 'ca.inverse.sogo' (head 8820ab3233ed6f1bdd0c2a203ea8208f8410f3bd) + + Monotone-Parent: 8820ab3233ed6f1bdd0c2a203ea8208f8410f3bd + Monotone-Parent: dcd831afcbb347de38ec00c05b919923433a9f1f + Monotone-Revision: a7e1ea6582c544441d18a19cd60774003d863f46 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-05-08T14:43:29 + Monotone-Branch: ca.inverse.sogo + commit dfd0339f9ddec972987931d00ad3a6f51cbdd3f3 Author: Ludovic Marcotte Date: Tue May 8 14:42:57 2012 +0000 @@ -7234,6 +10165,22 @@ M UI/MailerUI/German.lproj/Localizable.strings M UI/PreferencesUI/German.lproj/Localizable.strings M UI/Scheduler/German.lproj/Localizable.strings +commit e082ce8cf85887f54b10cb5f581be77c1de61018 +Merge: a4358ab cc1989d +Author: Wolfgang Sourdeau +Date: Tue May 1 18:38:43 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 546030b7b1310706d148f176ba3f7dfa1f1138b1) + to branch 'ca.inverse.sogo' (head c5348bb50866672a86152eb3750bed29a4be1e3b) + + Monotone-Parent: 546030b7b1310706d148f176ba3f7dfa1f1138b1 + Monotone-Parent: c5348bb50866672a86152eb3750bed29a4be1e3b + Monotone-Revision: 63e5b1e4803ea8f6e3495f26b87df7a20d1ee379 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-01T18:38:43 + Monotone-Branch: ca.inverse.sogo + commit a4358ab02b4b4de62dd0f8771a8cba68e7436f84 Author: Wolfgang Sourdeau Date: Tue May 1 18:38:40 2012 +0000 @@ -7247,6 +10194,22 @@ Date: Tue May 1 18:38:40 2012 +0000 M ChangeLog M SoObjects/Mailer/SOGoDraftObject.m +commit cc1989d6def3f41e24068fa10e95d01f9befb4f3 +Merge: 08b23ed d8939c8 +Author: Wolfgang Sourdeau +Date: Tue May 1 17:03:22 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 0e5184582f5d3e24e8418e6c09048eb31dd79c83) + to branch 'ca.inverse.sogo' (head dd015385747c68da0ce2d9fb49137db55e3bb32e) + + Monotone-Parent: 0e5184582f5d3e24e8418e6c09048eb31dd79c83 + Monotone-Parent: dd015385747c68da0ce2d9fb49137db55e3bb32e + Monotone-Revision: c5348bb50866672a86152eb3750bed29a4be1e3b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-01T17:03:22 + Monotone-Branch: ca.inverse.sogo + commit 08b23ed95e4f3696878a6b739f70d2a7a9eda2c2 Author: Wolfgang Sourdeau Date: Tue May 1 17:03:14 2012 +0000 @@ -7260,6 +10223,22 @@ Date: Tue May 1 17:03:14 2012 +0000 M ChangeLog M UI/WebServerResources/generic.js +commit d8939c870148c5312bef53f8abcdc3f2aabe28a8 +Merge: cc9781a 71785b1 +Author: Wolfgang Sourdeau +Date: Tue May 1 14:52:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head e9e3e99e5c78c811e3e5cb0f4742380c31e1e44c) + to branch 'ca.inverse.sogo' (head 919d33c3134c9977564cf2d69e21be184850a819) + + Monotone-Parent: 919d33c3134c9977564cf2d69e21be184850a819 + Monotone-Parent: e9e3e99e5c78c811e3e5cb0f4742380c31e1e44c + Monotone-Revision: dd015385747c68da0ce2d9fb49137db55e3bb32e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-01T14:52:28 + Monotone-Branch: ca.inverse.sogo + commit 71785b14053ca83ce9efcd27949f4ea67e680687 Author: Wolfgang Sourdeau Date: Tue May 1 14:52:20 2012 +0000 @@ -7272,6 +10251,22 @@ Date: Tue May 1 14:52:20 2012 +0000 M NEWS +commit cc9781a090d645043855cdbb33d6309c9b72fb41 +Merge: d4c34cb e054f97 +Author: Wolfgang Sourdeau +Date: Tue May 1 14:49:40 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 373797dc3c245bb7e5c9f47af99935f50e79dc16) + to branch 'ca.inverse.sogo' (head 388fbe7a186b5078c0f26161280ef319963b910d) + + Monotone-Parent: 373797dc3c245bb7e5c9f47af99935f50e79dc16 + Monotone-Parent: 388fbe7a186b5078c0f26161280ef319963b910d + Monotone-Revision: 919d33c3134c9977564cf2d69e21be184850a819 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-05-01T14:49:40 + Monotone-Branch: ca.inverse.sogo + commit d4c34cb48142af2d902530b8cbc9c0603cd5b25f Author: Wolfgang Sourdeau Date: Tue May 1 14:49:19 2012 +0000 @@ -7299,6 +10294,21 @@ Date: Tue May 1 14:47:20 2012 +0000 M ChangeLog M SoObjects/Mailer/SOGoDraftObject.m +commit 4b5c62c29b8edc17bc8f8ca103b95f77f7527a0f +Merge: c290e70 2dd99c4 +Author: Francis Lachapelle +Date: Tue May 1 13:42:18 2012 +0000 + + merge of '7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9' + and 'a5e05418d31b07428c4bc802d353b27d6d34ecab' + + Monotone-Parent: 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9 + Monotone-Parent: a5e05418d31b07428c4bc802d353b27d6d34ecab + Monotone-Revision: ebefc72cf1f85cf9726bac12a387a3b5d92e0945 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-05-01T13:42:18 + commit 2dd99c4d21ceedb64eccf9c9edac8eb7b09826c0 Author: Francis Lachapelle Date: Tue May 1 13:41:33 2012 +0000 @@ -7314,6 +10324,37 @@ Date: Tue May 1 13:41:33 2012 +0000 M UI/WebServerResources/UIxAttendeesEditor.css M UI/WebServerResources/UIxComponentEditor.css +commit a1f0d669a2937a37de1fa8b283d511c72e54c57c +Merge: 1e2e40d 19540fa +Author: Francis Lachapelle +Date: Tue May 1 00:48:46 2012 +0000 + + merge of '072677283f59903d1be242f3d96735460ef0985f' + and '4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f' + + Monotone-Parent: 072677283f59903d1be242f3d96735460ef0985f + Monotone-Parent: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f + Monotone-Revision: 672825b550345066a5eea3c60a50e21c47b5624f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-05-01T00:48:46 + +commit e054f972a27c59bad363979aeb3817bd22d805c0 +Merge: 26240ad c290e70 +Author: Ludovic Marcotte +Date: Mon Apr 30 17:19:23 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9) + to branch 'ca.inverse.sogo' (head 1a746e7d8ab981f6bbfb22f428fe19cc085bd285) + + Monotone-Parent: 1a746e7d8ab981f6bbfb22f428fe19cc085bd285 + Monotone-Parent: 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9 + Monotone-Revision: 388fbe7a186b5078c0f26161280ef319963b910d + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-04-30T17:19:23 + Monotone-Branch: ca.inverse.sogo + commit c290e70342f0cbc465419610422c523251ef9395 Author: Ludovic Marcotte Date: Mon Apr 30 17:19:00 2012 +0000 @@ -7370,6 +10411,22 @@ Date: Mon Apr 30 13:09:10 2012 +0000 M UI/WebServerResources/generic.js +commit 26240ad737f103733657d8dac603f2889bf05ed3 +Merge: 19540fa 2dd3ee9 +Author: Ludovic Marcotte +Date: Mon Apr 30 09:50:35 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f) + to branch 'ca.inverse.sogo' (head 9d7f0e2a2a1a65c1d0e27552dc78e4ee46c13778) + + Monotone-Parent: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f + Monotone-Parent: 9d7f0e2a2a1a65c1d0e27552dc78e4ee46c13778 + Monotone-Revision: 1a746e7d8ab981f6bbfb22f428fe19cc085bd285 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-04-30T09:50:35 + Monotone-Branch: ca.inverse.sogo + commit 19540fada1a97887214e89f3d632c9112ca33c3e Author: Ludovic Marcotte Date: Mon Apr 30 09:50:10 2012 +0000 @@ -7387,6 +10444,22 @@ M SoObjects/Appointments/SOGoUserFolder+Appointments.m M SoObjects/SOGo/SOGoDomainDefaults.h M SoObjects/SOGo/SOGoDomainDefaults.m +commit 2dd3ee9b72203bbce2047102ee0beebe1d9f40ec +Merge: be5a16e 79599a0 +Author: Jean Raby +Date: Thu Apr 26 13:57:29 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 65528b04d38419185ed64db626bd6ae368bfcd00) + to branch 'ca.inverse.sogo' (head 2828658dbefac205b7160b9ca55913b64dacacd6) + + Monotone-Parent: 2828658dbefac205b7160b9ca55913b64dacacd6 + Monotone-Parent: 65528b04d38419185ed64db626bd6ae368bfcd00 + Monotone-Revision: 9d7f0e2a2a1a65c1d0e27552dc78e4ee46c13778 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-04-26T13:57:29 + Monotone-Branch: ca.inverse.sogo + commit 79599a08b9c1f35665fbfb6600d15c5117781957 Author: Jean Raby Date: Thu Apr 26 13:53:15 2012 +0000 @@ -7402,6 +10475,53 @@ Date: Thu Apr 26 13:53:15 2012 +0000 M SoObjects/Contacts/NGVCard+SOGo.m +commit be5a16e3fbd24370b28f2cab6b9dc613f698bded +Merge: 3b8fb5d 24e6f4e +Author: Francis Lachapelle +Date: Thu Apr 26 12:28:44 2012 +0000 + + merge of '2a87115bccec235f2a2e55f0bc7710d46e961afd' + and '2fc38e65f96b51fa85b4171735f3413808da5422' + + Monotone-Parent: 2a87115bccec235f2a2e55f0bc7710d46e961afd + Monotone-Parent: 2fc38e65f96b51fa85b4171735f3413808da5422 + Monotone-Revision: 2828658dbefac205b7160b9ca55913b64dacacd6 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-04-26T12:28:44 + Monotone-Branch: ca.inverse.sogo + +commit a8c28faeb7fb603c3a02f4f21be4594e75788d91 +Merge: 49a7490 5b59ebf +Author: Francis Lachapelle +Date: Thu Apr 26 12:28:08 2012 +0000 + + merge of '402b5b43e7c75b50806b41e7372eed0e61a4de9f' + and '4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea' + + Monotone-Parent: 402b5b43e7c75b50806b41e7372eed0e61a4de9f + Monotone-Parent: 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea + Monotone-Revision: 06f33f8f7c4581f3ec39d5cce6e3b77a99d436b0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-04-26T12:28:08 + +commit 24e6f4ed7ca696bdf8d5ec0a3ad4a519a565c0db +Merge: 49a7490 f274406 +Author: Jean Raby +Date: Wed Apr 25 21:36:03 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 402b5b43e7c75b50806b41e7372eed0e61a4de9f) + to branch 'ca.inverse.sogo' (head aaa516c8e0f7391e21eda557b30eb4c3c80b14bc) + + Monotone-Parent: 402b5b43e7c75b50806b41e7372eed0e61a4de9f + Monotone-Parent: aaa516c8e0f7391e21eda557b30eb4c3c80b14bc + Monotone-Revision: 2fc38e65f96b51fa85b4171735f3413808da5422 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-04-25T21:36:03 + Monotone-Branch: ca.inverse.sogo + commit 49a74909d7a04cbe770b259a6f462d06c765343e Author: Jean Raby Date: Wed Apr 25 21:35:29 2012 +0000 @@ -7422,6 +10542,22 @@ Date: Wed Apr 25 21:35:29 2012 +0000 M ChangeLog M SoObjects/Contacts/NGVCard+SOGo.m +commit 3b8fb5d0be7fd3c38f4e8a18d96273e77316118e +Merge: 5b59ebf f274406 +Author: Wolfgang Sourdeau +Date: Wed Apr 25 21:32:36 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea) + to branch 'ca.inverse.sogo' (head aaa516c8e0f7391e21eda557b30eb4c3c80b14bc) + + Monotone-Parent: 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea + Monotone-Parent: aaa516c8e0f7391e21eda557b30eb4c3c80b14bc + Monotone-Revision: 2a87115bccec235f2a2e55f0bc7710d46e961afd + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-25T21:32:36 + Monotone-Branch: ca.inverse.sogo + commit 5b59ebfe1119c65a238546d46413f0a517681bf9 Author: Wolfgang Sourdeau Date: Wed Apr 25 21:32:18 2012 +0000 @@ -7436,6 +10572,22 @@ M ChangeLog M SoObjects/SOGo/SOGoUser.m M UI/PreferencesUI/UIxPreferences.m +commit f27440653fa7087bfe8e603b3e90a0810cdf6951 +Merge: dcef24c f7e9f2f +Author: Wolfgang Sourdeau +Date: Wed Apr 25 20:56:41 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head d8a0de208631b406144e740ab09b4e5a92f0e66c) + to branch 'ca.inverse.sogo' (head 356e7649cb18120413fdf16e371d74fbcd28c3e1) + + Monotone-Parent: 356e7649cb18120413fdf16e371d74fbcd28c3e1 + Monotone-Parent: d8a0de208631b406144e740ab09b4e5a92f0e66c + Monotone-Revision: aaa516c8e0f7391e21eda557b30eb4c3c80b14bc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-25T20:56:41 + Monotone-Branch: ca.inverse.sogo + commit f7e9f2fc7dd52c6d5b17c8566a10793d514f83d5 Author: Wolfgang Sourdeau Date: Wed Apr 25 20:56:14 2012 +0000 @@ -7463,6 +10615,22 @@ Date: Wed Apr 25 14:31:57 2012 +0000 M NEWS +commit dcef24cc15ad12e4a7420c76c3ba66eff3f28518 +Merge: 35314b1 ca8fbfe +Author: Wolfgang Sourdeau +Date: Tue Apr 24 18:00:56 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 9cc6d172992d23b089ad2377f66d83c176dc0fed) + to branch 'ca.inverse.sogo' (head 21360eb0c3f218f331f1eba36a06224f3429cd91) + + Monotone-Parent: 21360eb0c3f218f331f1eba36a06224f3429cd91 + Monotone-Parent: 9cc6d172992d23b089ad2377f66d83c176dc0fed + Monotone-Revision: 356e7649cb18120413fdf16e371d74fbcd28c3e1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-24T18:00:56 + Monotone-Branch: ca.inverse.sogo + commit ca8fbfe94257631d9c91554cec18e12f19e653e9 Author: Wolfgang Sourdeau Date: Tue Apr 24 18:00:49 2012 +0000 @@ -7477,6 +10645,22 @@ M ChangeLog M UI/WebServerResources/SchedulerUI.css M UI/WebServerResources/SchedulerUI.js +commit 35314b13d344fa921ae7604ab07cea9b8f867298 +Merge: 45a9a75 4873197 +Author: Wolfgang Sourdeau +Date: Tue Apr 24 17:42:22 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head a67a6a3249b2b6a4b199678bc6f32cad47300639) + to branch 'ca.inverse.sogo' (head bc199d3fb5947e961f9d63c20b6f2d472cdaff0d) + + Monotone-Parent: a67a6a3249b2b6a4b199678bc6f32cad47300639 + Monotone-Parent: bc199d3fb5947e961f9d63c20b6f2d472cdaff0d + Monotone-Revision: 21360eb0c3f218f331f1eba36a06224f3429cd91 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-24T17:42:22 + Monotone-Branch: ca.inverse.sogo + commit 45a9a751eac73a38d4cb357f3e4b7cdd6300b146 Author: Wolfgang Sourdeau Date: Tue Apr 24 17:42:16 2012 +0000 @@ -7503,6 +10687,22 @@ Date: Tue Apr 24 17:40:52 2012 +0000 M ChangeLog M UI/WebServerResources/HTMLElement.js +commit 4873197e5552c450fadddbbec417d272920d99a4 +Merge: fc7157b 781f3fb +Author: Wolfgang Sourdeau +Date: Tue Apr 24 15:32:14 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 5444115146b03d377270a0ee98d9e240781fcc6e) + to branch 'ca.inverse.sogo' (head 1a1393f78ba372cce09b37d46908cc3e7553d869) + + Monotone-Parent: 1a1393f78ba372cce09b37d46908cc3e7553d869 + Monotone-Parent: 5444115146b03d377270a0ee98d9e240781fcc6e + Monotone-Revision: bc199d3fb5947e961f9d63c20b6f2d472cdaff0d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-24T15:32:14 + Monotone-Branch: ca.inverse.sogo + commit 781f3fbf7e7b925a3657b84d7aa47bbfa6cce2e3 Author: Wolfgang Sourdeau Date: Tue Apr 24 15:32:10 2012 +0000 @@ -7516,6 +10716,22 @@ Date: Tue Apr 24 15:32:10 2012 +0000 M ChangeLog M UI/WebServerResources/generic.js +commit fc7157b3dc3205d6b2a59ca8c70fde6a5d3639d9 +Merge: 306f999 c774314 +Author: Ludovic Marcotte +Date: Tue Apr 24 11:48:06 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head fc9e1cf3f4988bae25443b6d072add3f344d30f0) + to branch 'ca.inverse.sogo' (head 6331064cc925005acad759e8c6eac99b6b7071cd) + + Monotone-Parent: 6331064cc925005acad759e8c6eac99b6b7071cd + Monotone-Parent: fc9e1cf3f4988bae25443b6d072add3f344d30f0 + Monotone-Revision: 1a1393f78ba372cce09b37d46908cc3e7553d869 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-04-24T11:48:06 + Monotone-Branch: ca.inverse.sogo + commit c774314b1b5655fc63713bdb33562eca9c81f64a Author: Ludovic Marcotte Date: Tue Apr 24 11:47:32 2012 +0000 @@ -7537,6 +10753,22 @@ M SoObjects/Contacts/SOGoContactGCSEntry.m M SoObjects/SOGo/SOGoContentObject.m M Tools/SOGoToolRestore.m +commit 306f999901f3673d7e247587859535176eb5a1de +Merge: 952d74e f9d34ea +Author: Wolfgang Sourdeau +Date: Mon Apr 23 21:19:11 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head cd39fe0df424d1e5afd5dcfa4b1c94ad707fed24) + to branch 'ca.inverse.sogo' (head 94d7b980dccff8cbae9bff2eaee5dbefc75a7dfd) + + Monotone-Parent: 94d7b980dccff8cbae9bff2eaee5dbefc75a7dfd + Monotone-Parent: cd39fe0df424d1e5afd5dcfa4b1c94ad707fed24 + Monotone-Revision: 6331064cc925005acad759e8c6eac99b6b7071cd + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-23T21:19:11 + Monotone-Branch: ca.inverse.sogo + commit f9d34ea6ec79ec208c88c2cbf6a3ce81b15e0195 Author: Wolfgang Sourdeau Date: Mon Apr 23 21:19:08 2012 +0000 @@ -7565,6 +10797,22 @@ M SOPE/NGCards/iCalRecurrenceRule.h M SOPE/NGCards/iCalRecurrenceRule.m M Tests/Unit/TestiCalRecurrenceCalculator.m +commit 952d74e7be1f612c77c6b64eec7906052cb8bb46 +Merge: 8fe06ef 0675139 +Author: Wolfgang Sourdeau +Date: Mon Apr 23 19:16:50 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head f44990050ab038029a3fa83c4918912da401bd4b) + to branch 'ca.inverse.sogo' (head 74637b0d30612389db5f908c078f94c96d2f4a04) + + Monotone-Parent: 74637b0d30612389db5f908c078f94c96d2f4a04 + Monotone-Parent: f44990050ab038029a3fa83c4918912da401bd4b + Monotone-Revision: 94d7b980dccff8cbae9bff2eaee5dbefc75a7dfd + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-23T19:16:50 + Monotone-Branch: ca.inverse.sogo + commit 067513959a07cd1439d4925ebd9442fcb6d295d9 Author: Wolfgang Sourdeau Date: Mon Apr 23 19:16:43 2012 +0000 @@ -7577,6 +10825,22 @@ Date: Mon Apr 23 19:16:43 2012 +0000 M Tests/Unit/TestiCalRecurrenceCalculator.m +commit 8fe06ef1aa569ae7311dcfdd664f7496d55825ed +Merge: 9bca029 65acbc5 +Author: Wolfgang Sourdeau +Date: Mon Apr 23 18:58:54 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head fbdbaedef2d0b93dc7ac828e0acfde7baccc8f6b) + to branch 'ca.inverse.sogo' (head 3dd0e19a5e7b771ac747db220635cb0b93d6061d) + + Monotone-Parent: 3dd0e19a5e7b771ac747db220635cb0b93d6061d + Monotone-Parent: fbdbaedef2d0b93dc7ac828e0acfde7baccc8f6b + Monotone-Revision: 74637b0d30612389db5f908c078f94c96d2f4a04 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-23T18:58:54 + Monotone-Branch: ca.inverse.sogo + commit 65acbc5ecfe9615cff49ed05f644effb10874e1d Author: Wolfgang Sourdeau Date: Mon Apr 23 18:39:26 2012 +0000 @@ -7590,6 +10854,38 @@ Date: Mon Apr 23 18:39:26 2012 +0000 M Tests/Unit/SOGoTest.h M Tests/Unit/TestSBJsonParser.m +commit 9bca029cb9ccefe2d0d32823a93131fb7dd3fdae +Merge: 5e6b689 8263cc8 +Author: Wolfgang Sourdeau +Date: Mon Apr 23 18:14:01 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 389b194bd166895ce122d73e90c04eb48d06a6a1) + to branch 'ca.inverse.sogo' (head dc082710554168e6c2a4badec1b98ec9472266d4) + + Monotone-Parent: 389b194bd166895ce122d73e90c04eb48d06a6a1 + Monotone-Parent: dc082710554168e6c2a4badec1b98ec9472266d4 + Monotone-Revision: 3dd0e19a5e7b771ac747db220635cb0b93d6061d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-23T18:14:01 + Monotone-Branch: ca.inverse.sogo + +commit 8263cc806c984343c966354203116f21340ea37a +Merge: 502b276 f481b14 +Author: Wolfgang Sourdeau +Date: Mon Apr 23 18:13:55 2012 +0000 + + merge of '4db7d3fdd4a7987df1c5a8025f88b58228fa357c' + and 'c663ade92bbaf8f47fdf0c3e5d6b9b631ac684d5' + + Monotone-Parent: 4db7d3fdd4a7987df1c5a8025f88b58228fa357c + Monotone-Parent: c663ade92bbaf8f47fdf0c3e5d6b9b631ac684d5 + Monotone-Revision: dc082710554168e6c2a4badec1b98ec9472266d4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-23T18:13:55 + Monotone-Branch: ca.inverse.sogo + commit 5e6b6893382bc3881b49008219f3bd65d698db6b Author: Wolfgang Sourdeau Date: Mon Apr 23 18:13:26 2012 +0000 @@ -7616,6 +10912,22 @@ Date: Mon Apr 23 15:17:02 2012 +0000 M SOPE/NGCards/CardElement.h +commit f481b14fb72badeae4691cb3b3d118d27c98ce22 +Merge: 63560c5 73e47a8 +Author: Ludovic Marcotte +Date: Mon Apr 23 12:59:31 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 64488d85ff930e32a07eda3c4ce9ae01e7513fc8) + to branch 'ca.inverse.sogo' (head b2a750dba2c2bf3d145e44d412e5a647e552cf59) + + Monotone-Parent: 64488d85ff930e32a07eda3c4ce9ae01e7513fc8 + Monotone-Parent: b2a750dba2c2bf3d145e44d412e5a647e552cf59 + Monotone-Revision: c663ade92bbaf8f47fdf0c3e5d6b9b631ac684d5 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-04-23T12:59:31 + Monotone-Branch: ca.inverse.sogo + commit 63560c567883e6b19ab078e7a1e8c7d39eaca7fb Author: Ludovic Marcotte Date: Mon Apr 23 12:58:56 2012 +0000 @@ -7632,6 +10944,22 @@ M ChangeLog M SoObjects/Appointments/SOGoAppointmentObject.m M SoObjects/Appointments/SOGoAppointmentOccurence.m +commit 73e47a85e41e746fd7611a11a1d22e11d054251d +Merge: 6b8d737 1d6583f +Author: Jean Raby +Date: Fri Apr 20 21:33:57 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head e290d09c6fe813e82f2e06c1cfcaab7ba2a5b3ac) + to branch 'ca.inverse.sogo' (head 5b71abea869d3dd01b8df42afd8c6631b75ce2db) + + Monotone-Parent: 5b71abea869d3dd01b8df42afd8c6631b75ce2db + Monotone-Parent: e290d09c6fe813e82f2e06c1cfcaab7ba2a5b3ac + Monotone-Revision: b2a750dba2c2bf3d145e44d412e5a647e552cf59 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-04-20T21:33:57 + Monotone-Branch: ca.inverse.sogo + commit 1d6583f2c5dfdb9817ee10055f84807197eb10e7 Author: Jean Raby Date: Fri Apr 20 21:33:35 2012 +0000 @@ -7648,6 +10976,22 @@ Date: Fri Apr 20 21:33:35 2012 +0000 M Tests/Integration/test-caldav-scheduling.py +commit 6b8d737ee7d6e8ee90a09314ae5f402e38949db3 +Merge: fc1de6d e406c4b +Author: Wolfgang Sourdeau +Date: Fri Apr 20 16:11:24 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head d0d8f431bd9bb7676b29e0f9073ed40cfc1cf9e5) + to branch 'ca.inverse.sogo' (head 7da6a3fd504496abb13e361b594cd5dfd33ee4f9) + + Monotone-Parent: 7da6a3fd504496abb13e361b594cd5dfd33ee4f9 + Monotone-Parent: d0d8f431bd9bb7676b29e0f9073ed40cfc1cf9e5 + Monotone-Revision: 5b71abea869d3dd01b8df42afd8c6631b75ce2db + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-20T16:11:24 + Monotone-Branch: ca.inverse.sogo + commit e406c4b0285ae5616508eb0509b28862e6082f93 Author: Wolfgang Sourdeau Date: Fri Apr 20 16:11:21 2012 +0000 @@ -7661,6 +11005,22 @@ Date: Fri Apr 20 16:11:21 2012 +0000 M ChangeLog M UI/WebServerResources/SchedulerUI.js +commit fc1de6d194598d9a9fe4d2da02f39c878175e048 +Merge: e20194c 5d2d426 +Author: Wolfgang Sourdeau +Date: Fri Apr 20 16:01:16 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head b58773ad261dd708b850c5cd63f53133730d2c59) + to branch 'ca.inverse.sogo' (head 541c0a21a9674ddcd98d632151eb3378403409d4) + + Monotone-Parent: 541c0a21a9674ddcd98d632151eb3378403409d4 + Monotone-Parent: b58773ad261dd708b850c5cd63f53133730d2c59 + Monotone-Revision: 7da6a3fd504496abb13e361b594cd5dfd33ee4f9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-20T16:01:16 + Monotone-Branch: ca.inverse.sogo + commit 5d2d426e33a920117eb9728d11f5abe9e142b8b3 Author: Wolfgang Sourdeau Date: Fri Apr 20 16:01:00 2012 +0000 @@ -7677,6 +11037,22 @@ M SOPE/NGCards/iCalTrigger.h M SOPE/NGCards/iCalTrigger.m M SoObjects/Appointments/iCalEvent+SOGo.m +commit e20194c9101ba52130f519e8245fe99aeace0839 +Merge: 44258de 2708e84 +Author: Wolfgang Sourdeau +Date: Fri Apr 20 14:40:10 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 404335da627fa036cf3569cb9212b3d2c29785a6) + to branch 'ca.inverse.sogo' (head 2e0ada753c27578808142ee65c32d3210cce9562) + + Monotone-Parent: 2e0ada753c27578808142ee65c32d3210cce9562 + Monotone-Parent: 404335da627fa036cf3569cb9212b3d2c29785a6 + Monotone-Revision: 541c0a21a9674ddcd98d632151eb3378403409d4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-20T14:40:10 + Monotone-Branch: ca.inverse.sogo + commit 2708e84549a273dbe632d41b2306a59b45cb4094 Author: Wolfgang Sourdeau Date: Fri Apr 20 14:40:08 2012 +0000 @@ -7689,6 +11065,22 @@ Date: Fri Apr 20 14:40:08 2012 +0000 M UI/WebServerResources/HTMLElement.js +commit 44258debd74b22d08fb0be2e618ce1c02f98b08e +Merge: 1bfbe3a c83ad28 +Author: Wolfgang Sourdeau +Date: Fri Apr 20 14:39:09 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 015d6494690201ec056395687392e68803e04210) + to branch 'ca.inverse.sogo' (head 65f631c9b4cbbbd4d2a762d4c2e1a7cd8c3f77da) + + Monotone-Parent: 015d6494690201ec056395687392e68803e04210 + Monotone-Parent: 65f631c9b4cbbbd4d2a762d4c2e1a7cd8c3f77da + Monotone-Revision: 2e0ada753c27578808142ee65c32d3210cce9562 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-20T14:39:09 + Monotone-Branch: ca.inverse.sogo + commit 1bfbe3afe9cc346ad7eed83f4db70481690e4eb3 Author: Wolfgang Sourdeau Date: Fri Apr 20 14:37:53 2012 +0000 @@ -7702,6 +11094,22 @@ Date: Fri Apr 20 14:37:53 2012 +0000 M ChangeLog M UI/WebServerResources/HTMLElement.js +commit c83ad28b98aaf950d4201e63d4065ec605c7dabf +Merge: 2346d35 c1bc3dd +Author: Wolfgang Sourdeau +Date: Fri Apr 20 13:37:53 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head ac0d12f89b420e5f1e825cebddb440417e76ce4b) + to branch 'ca.inverse.sogo' (head bf8352a50cfe2d3a45e91ddab8085ef9f724a1f1) + + Monotone-Parent: ac0d12f89b420e5f1e825cebddb440417e76ce4b + Monotone-Parent: bf8352a50cfe2d3a45e91ddab8085ef9f724a1f1 + Monotone-Revision: 65f631c9b4cbbbd4d2a762d4c2e1a7cd8c3f77da + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-20T13:37:53 + Monotone-Branch: ca.inverse.sogo + commit 2346d35d21d06730fea42dd3ac1df48b2cc05d07 Author: Wolfgang Sourdeau Date: Fri Apr 20 13:37:46 2012 +0000 @@ -7723,6 +11131,21 @@ M UI/PreferencesUI/UIxPreferences.m M UI/Templates/PreferencesUI/UIxPreferences.wox M UI/WebServerResources/UIxPreferences.js +commit f306ab6a7100f6e635513fba141ea85840074868 +Merge: ce77d78 fa4d2d3 +Author: Wolfgang Sourdeau +Date: Fri Apr 20 13:27:55 2012 +0000 + + merge of '2684d8c1336cad3425d5075a447d817d5808948d' + and '7786f49f6724383b92e91ba7998b99cfb52ceec3' + + Monotone-Parent: 2684d8c1336cad3425d5075a447d817d5808948d + Monotone-Parent: 7786f49f6724383b92e91ba7998b99cfb52ceec3 + Monotone-Revision: 0869cb2e3bedff16fb0985d9bde1c2c2a5c80820 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-20T13:27:55 + commit fa4d2d3141aaf09e59d9ecc6b6f5edbb8f5a53aa Author: Wolfgang Sourdeau Date: Fri Apr 20 13:27:21 2012 +0000 @@ -7746,6 +11169,37 @@ M UI/WebServerResources/HTMLElement.js M UI/WebServerResources/UIxPreferences.js M UI/WebServerResources/generic.js +commit 9ea333e6b6dd415de79107d377274b5c7d195e2b +Merge: 29aa61f 6a6982b +Author: Wolfgang Sourdeau +Date: Thu Apr 19 19:04:07 2012 +0000 + + merge of '3df4271ffa54be2fdec6fa5cc5170ed38c1e01df' + and '407012b144380da01f4b13cfb23faba545da887a' + + Monotone-Parent: 3df4271ffa54be2fdec6fa5cc5170ed38c1e01df + Monotone-Parent: 407012b144380da01f4b13cfb23faba545da887a + Monotone-Revision: f90d169fbc251326ea6c8a2f620e125a8a7b4168 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-19T19:04:07 + +commit c1bc3dd07a5b37aeff0349f46d9f63406be3c71a +Merge: ce77d78 3d2707b +Author: Ludovic Marcotte +Date: Thu Apr 19 18:17:18 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 2684d8c1336cad3425d5075a447d817d5808948d) + to branch 'ca.inverse.sogo' (head 2c06aa8a1cf91d9b82baa03d74b1ed5f713b7fcb) + + Monotone-Parent: 2684d8c1336cad3425d5075a447d817d5808948d + Monotone-Parent: 2c06aa8a1cf91d9b82baa03d74b1ed5f713b7fcb + Monotone-Revision: bf8352a50cfe2d3a45e91ddab8085ef9f724a1f1 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-04-19T18:17:18 + Monotone-Branch: ca.inverse.sogo + commit ce77d78e2703aba6b4650d56d2028dc0ce3c96d7 Author: Ludovic Marcotte Date: Thu Apr 19 18:16:50 2012 +0000 @@ -7763,6 +11217,38 @@ M SoObjects/Appointments/SOGoAppointmentFolder.m M UI/Scheduler/UIxCalFolderActions.h M UI/Scheduler/UIxCalFolderActions.m +commit 3d2707beaabb7d15c9df0752af4a94c0ae04a59f +Merge: 0c0cbc1 1f03d41 +Author: Ludovic Marcotte +Date: Thu Apr 19 16:30:23 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 5af155533446328556c907456566939affd0ae8f) + to branch 'ca.inverse.sogo' (head 7b006a3f6a830fdc6f0f12c3e086fc05204930cf) + + Monotone-Parent: 5af155533446328556c907456566939affd0ae8f + Monotone-Parent: 7b006a3f6a830fdc6f0f12c3e086fc05204930cf + Monotone-Revision: 2c06aa8a1cf91d9b82baa03d74b1ed5f713b7fcb + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-04-19T16:30:23 + Monotone-Branch: ca.inverse.sogo + +commit 1f03d418b34f48c0a1b1a5478318b27e128139d3 +Merge: e4f298f 9ea333e +Author: Wolfgang Sourdeau +Date: Thu Apr 19 19:04:50 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head f90d169fbc251326ea6c8a2f620e125a8a7b4168) + to branch 'ca.inverse.sogo' (head 7a9088c9a9d28598914a43d54b44dca1365e2897) + + Monotone-Parent: 7a9088c9a9d28598914a43d54b44dca1365e2897 + Monotone-Parent: f90d169fbc251326ea6c8a2f620e125a8a7b4168 + Monotone-Revision: 7b006a3f6a830fdc6f0f12c3e086fc05204930cf + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-19T19:04:50 + Monotone-Branch: ca.inverse.sogo + commit 0c0cbc19f0d8c14952cd76c4f933864020e607ce Author: Ludovic Marcotte Date: Thu Apr 19 16:29:43 2012 +0000 @@ -7778,6 +11264,22 @@ Date: Thu Apr 19 16:29:43 2012 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentObject.m +commit e4f298fee56e024992d08eb30cf243599607fc37 +Merge: 6a6982b 64d64ac +Author: Wolfgang Sourdeau +Date: Thu Apr 19 14:48:12 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 407012b144380da01f4b13cfb23faba545da887a) + to branch 'ca.inverse.sogo' (head 5afcea3436fb34710c1063b99084e3c71ffa1a5c) + + Monotone-Parent: 407012b144380da01f4b13cfb23faba545da887a + Monotone-Parent: 5afcea3436fb34710c1063b99084e3c71ffa1a5c + Monotone-Revision: 7a9088c9a9d28598914a43d54b44dca1365e2897 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-19T14:48:12 + Monotone-Branch: ca.inverse.sogo + commit 6a6982bd89be53f4f715b0e545edf9f33b2fc123 Author: Wolfgang Sourdeau Date: Thu Apr 19 14:48:07 2012 +0000 @@ -7822,6 +11324,22 @@ Date: Thu Apr 19 13:54:14 2012 +0000 M SOPE/NGCards/iCalCalendar.h M SOPE/NGCards/iCalCalendar.m +commit 64d64ac0086f1440e51bb98fd69844f43bfd25a0 +Merge: d2d1c1e a69a2d5 +Author: Wolfgang Sourdeau +Date: Thu Apr 19 13:17:26 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 605af413c10fbef80e5952f773c4450ffface034) + to branch 'ca.inverse.sogo' (head f92e3e155f030585d765d28f5eee4696fae2d5c0) + + Monotone-Parent: 605af413c10fbef80e5952f773c4450ffface034 + Monotone-Parent: f92e3e155f030585d765d28f5eee4696fae2d5c0 + Monotone-Revision: 5afcea3436fb34710c1063b99084e3c71ffa1a5c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-19T13:17:26 + Monotone-Branch: ca.inverse.sogo + commit d2d1c1e104c66e9eaf018ba075449d36a9b84e67 Author: Wolfgang Sourdeau Date: Thu Apr 19 13:17:16 2012 +0000 @@ -7835,6 +11353,22 @@ Date: Thu Apr 19 13:17:16 2012 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit a69a2d57c757561246fa1bda68399de138c04a0a +Merge: 3ff5526 3713513 +Author: Wolfgang Sourdeau +Date: Thu Apr 19 02:50:02 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head e93a01f806a40f4a4ff41e64bf05eae122e0eb6a) + to branch 'ca.inverse.sogo' (head 53c201da944fae4865d8c023837ade73f6a37bef) + + Monotone-Parent: 53c201da944fae4865d8c023837ade73f6a37bef + Monotone-Parent: e93a01f806a40f4a4ff41e64bf05eae122e0eb6a + Monotone-Revision: f92e3e155f030585d765d28f5eee4696fae2d5c0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-19T02:50:02 + Monotone-Branch: ca.inverse.sogo + commit 3713513e5185372956af2ad9d88bdba78e5eb2b8 Author: Wolfgang Sourdeau Date: Thu Apr 19 02:49:57 2012 +0000 @@ -7866,6 +11400,85 @@ M SOPE/NGCards/NSDictionary+NGCards.h M SOPE/NGCards/NSDictionary+NGCards.m M SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m +commit 3ff552642f9cab201970da67a5cb4df03feb9dd6 +Merge: dbd99fa a3ebcec +Author: Ludovic Marcotte +Date: Wed Apr 18 17:40:45 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 2b7803f8e993e96ff4490197722ef0a2a5faad70) + to branch 'ca.inverse.sogo' (head 4938b5904dac56f89cbd9c1e57f10aee6ea224e0) + + Monotone-Parent: 2b7803f8e993e96ff4490197722ef0a2a5faad70 + Monotone-Parent: 4938b5904dac56f89cbd9c1e57f10aee6ea224e0 + Monotone-Revision: 53c201da944fae4865d8c023837ade73f6a37bef + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-04-18T17:40:45 + Monotone-Branch: ca.inverse.sogo + +commit a3ebcec4a4b15160c615a395dc6bd26dfaaccd95 +Merge: 4173896 045363c +Author: Wolfgang Sourdeau +Date: Wed Apr 18 20:10:13 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 8ff4e6d2b420caded81d7317c1170ff6ce35249e) + to branch 'ca.inverse.sogo' (head 33545be02b741723c3eb86718dc21f534032fc81) + + Monotone-Parent: 33545be02b741723c3eb86718dc21f534032fc81 + Monotone-Parent: 8ff4e6d2b420caded81d7317c1170ff6ce35249e + Monotone-Revision: 4938b5904dac56f89cbd9c1e57f10aee6ea224e0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-18T20:10:13 + Monotone-Branch: ca.inverse.sogo + +commit 045363c72e46c2f64a053c242b23b117612a8d46 +Merge: ef816d1 5c8e5a1 +Author: Wolfgang Sourdeau +Date: Wed Apr 18 20:09:40 2012 +0000 + + merge of 'a49b4023ef2ea7a4f4040725d21123c9d0858bbf' + and 'bd8544b99b099a3544a5acdb3bdcc8c219709ff1' + + Monotone-Parent: a49b4023ef2ea7a4f4040725d21123c9d0858bbf + Monotone-Parent: bd8544b99b099a3544a5acdb3bdcc8c219709ff1 + Monotone-Revision: 8ff4e6d2b420caded81d7317c1170ff6ce35249e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-18T20:09:40 + +commit 4173896a865cea8aa64ef501a4fa89c46eb0f72b +Merge: 109ce64 561bdbb +Author: Wolfgang Sourdeau +Date: Wed Apr 18 20:09:02 2012 +0000 + + merge of '785de8feba6c3e190c55defa1a5e18e85c9b82ba' + and '9fc56cd3ca7051c4b29662926289d2cb181bc57a' + + Monotone-Parent: 785de8feba6c3e190c55defa1a5e18e85c9b82ba + Monotone-Parent: 9fc56cd3ca7051c4b29662926289d2cb181bc57a + Monotone-Revision: 33545be02b741723c3eb86718dc21f534032fc81 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-18T20:09:02 + Monotone-Branch: ca.inverse.sogo + +commit 561bdbb364043826594d746e090cb0f0c422d13e +Merge: ef816d1 e5d10b7 +Author: Wolfgang Sourdeau +Date: Wed Apr 18 20:04:41 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head a49b4023ef2ea7a4f4040725d21123c9d0858bbf) + to branch 'ca.inverse.sogo' (head c32cff29d1d0d305b798b73f0db514f448a0d44c) + + Monotone-Parent: a49b4023ef2ea7a4f4040725d21123c9d0858bbf + Monotone-Parent: c32cff29d1d0d305b798b73f0db514f448a0d44c + Monotone-Revision: 9fc56cd3ca7051c4b29662926289d2cb181bc57a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-18T20:04:41 + Monotone-Branch: ca.inverse.sogo + commit ef816d1f59c3dd61cbd2977fa03552d39d7a53e8 Author: Wolfgang Sourdeau Date: Wed Apr 18 20:04:23 2012 +0000 @@ -8272,6 +11885,22 @@ M UI/WebServerResources/ckeditor/skins/v2/skin.js M UI/WebServerResources/ckeditor/skins/v2/templates.css M UI/WebServerResources/ckeditor/themes/default/theme.js +commit 109ce647f3c674a941aa17431f92dd47b4ea431a +Merge: f742ca9 9db7748 +Author: Jean Raby +Date: Mon Apr 16 22:38:02 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 2c3f8544a30679096de28ae80a840c371b12d94b) + to branch 'ca.inverse.sogo' (head 0ed6b9d5a5d4a8143d08cc4652384f5073d26096) + + Monotone-Parent: 0ed6b9d5a5d4a8143d08cc4652384f5073d26096 + Monotone-Parent: 2c3f8544a30679096de28ae80a840c371b12d94b + Monotone-Revision: 785de8feba6c3e190c55defa1a5e18e85c9b82ba + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-04-16T22:38:02 + Monotone-Branch: ca.inverse.sogo + commit 9db77482d5851f48e26908ec5b5d44209b21e264 Author: Jean Raby Date: Mon Apr 16 22:37:26 2012 +0000 @@ -8287,6 +11916,22 @@ Date: Mon Apr 16 22:37:26 2012 +0000 M ChangeLog M SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m +commit e5d10b79015c2d54606d56e0000fc8d8b6a755a9 +Merge: f742ca9 6aa627a +Author: Wolfgang Sourdeau +Date: Mon Apr 16 15:25:22 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 825d6255230167e6f80d8015a569afa6bdb4cb7d) + to branch 'ca.inverse.sogo' (head 0ed6b9d5a5d4a8143d08cc4652384f5073d26096) + + Monotone-Parent: 0ed6b9d5a5d4a8143d08cc4652384f5073d26096 + Monotone-Parent: 825d6255230167e6f80d8015a569afa6bdb4cb7d + Monotone-Revision: c32cff29d1d0d305b798b73f0db514f448a0d44c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-16T15:25:22 + Monotone-Branch: ca.inverse.sogo + commit 6aa627a800d97ca346c7a17c2164c0ccf028ca9e Author: Wolfgang Sourdeau Date: Mon Apr 16 15:24:16 2012 +0000 @@ -8315,6 +11960,22 @@ Date: Mon Apr 16 15:23:24 2012 +0000 M ChangeLog M Tests/Unit/SOGoTestRunner.m +commit f742ca955b87f70868ca75f8a750d390790e5262 +Merge: 38ebd9e 88f5832 +Author: Wolfgang Sourdeau +Date: Fri Apr 13 15:17:16 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 406832bc51a0849377951d10353a33568b33877b) + to branch 'ca.inverse.sogo' (head 416744ed9dd0ac7176fec877fee4972d9f6be754) + + Monotone-Parent: 406832bc51a0849377951d10353a33568b33877b + Monotone-Parent: 416744ed9dd0ac7176fec877fee4972d9f6be754 + Monotone-Revision: 0ed6b9d5a5d4a8143d08cc4652384f5073d26096 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-13T15:17:16 + Monotone-Branch: ca.inverse.sogo + commit 38ebd9e68c76a435486141cd6cccdd7a9d55fbcf Author: Wolfgang Sourdeau Date: Fri Apr 13 15:17:12 2012 +0000 @@ -8328,6 +11989,22 @@ Date: Fri Apr 13 15:17:12 2012 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 88f58321038fd02e4ee244ef9fd7f0d36a9ee464 +Merge: a98b40c e7bfbd3 +Author: Wolfgang Sourdeau +Date: Fri Apr 13 14:04:46 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 8a447d04163521d64bfb4168d80753ce1c557f3d) + to branch 'ca.inverse.sogo' (head 12c967642fd34ef7dfd09d28c886260b0bb94796) + + Monotone-Parent: 12c967642fd34ef7dfd09d28c886260b0bb94796 + Monotone-Parent: 8a447d04163521d64bfb4168d80753ce1c557f3d + Monotone-Revision: 416744ed9dd0ac7176fec877fee4972d9f6be754 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-13T14:04:46 + Monotone-Branch: ca.inverse.sogo + commit e7bfbd3f6f8ceb5b628d14bf29d7113330be23bd Author: Wolfgang Sourdeau Date: Fri Apr 13 14:04:42 2012 +0000 @@ -8340,6 +12017,22 @@ Date: Fri Apr 13 14:04:42 2012 +0000 M SoObjects/Appointments/SOGoAppointmentFolder.m +commit a98b40c07dc6e3423d836352417c6915d9e254cb +Merge: d58b825 4c23e19 +Author: Wolfgang Sourdeau +Date: Fri Apr 13 14:02:35 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head af017f174df00d4475a8c99168a6d994257a1ca8) + to branch 'ca.inverse.sogo' (head 7988c89da6f982bafb73b22f935b081b7178d1c4) + + Monotone-Parent: 7988c89da6f982bafb73b22f935b081b7178d1c4 + Monotone-Parent: af017f174df00d4475a8c99168a6d994257a1ca8 + Monotone-Revision: 12c967642fd34ef7dfd09d28c886260b0bb94796 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-13T14:02:35 + Monotone-Branch: ca.inverse.sogo + commit 4c23e19c0cd84ed8ad90039418cbe3ac73f2bdab Author: Wolfgang Sourdeau Date: Fri Apr 13 14:02:30 2012 +0000 @@ -8353,6 +12046,22 @@ Date: Fri Apr 13 14:02:30 2012 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit d58b8258fb487da414f64f2c126bf0217b3cf982 +Merge: c270e1e 506ac6e +Author: Wolfgang Sourdeau +Date: Thu Apr 12 23:46:04 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 827061cfd7bb39eead69601b6015cb0ff6ebf1f1) + to branch 'ca.inverse.sogo' (head c228125c37bd9b5dbd64777b2809cfed1808e27f) + + Monotone-Parent: 827061cfd7bb39eead69601b6015cb0ff6ebf1f1 + Monotone-Parent: c228125c37bd9b5dbd64777b2809cfed1808e27f + Monotone-Revision: 7988c89da6f982bafb73b22f935b081b7178d1c4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-12T23:46:04 + Monotone-Branch: ca.inverse.sogo + commit c270e1e720760ed84b0a3a290f25e6d9f99ef74e Author: Wolfgang Sourdeau Date: Thu Apr 12 23:45:23 2012 +0000 @@ -8418,6 +12127,22 @@ M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.h M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 506ac6eef6b1e6036e72a45f138b65b50e22dddc +Merge: 50e160f c7017e8 +Author: Wolfgang Sourdeau +Date: Thu Apr 12 20:26:11 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 42fb4d40a22288da8859b369ec18915fb6e1164c) + to branch 'ca.inverse.sogo' (head 87772f0d5e8f3cfa7bc149b0c9d6c47a2de10789) + + Monotone-Parent: 42fb4d40a22288da8859b369ec18915fb6e1164c + Monotone-Parent: 87772f0d5e8f3cfa7bc149b0c9d6c47a2de10789 + Monotone-Revision: c228125c37bd9b5dbd64777b2809cfed1808e27f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-12T20:26:11 + Monotone-Branch: ca.inverse.sogo + commit 50e160f89501d21790a016464abf7134071480e6 Author: Wolfgang Sourdeau Date: Thu Apr 12 20:26:01 2012 +0000 @@ -8457,6 +12182,22 @@ Date: Thu Apr 12 20:24:15 2012 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit c7017e893e85c48552d5371ba12a5bf881757120 +Merge: c2dec4f 2dd2db0 +Author: Wolfgang Sourdeau +Date: Thu Apr 12 17:20:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 8084a82ca1ab7dad7f78c35f529f9e3db7d02314) + to branch 'ca.inverse.sogo' (head d32a965a357a3d40a91ce6b756792c0e03dc7414) + + Monotone-Parent: 8084a82ca1ab7dad7f78c35f529f9e3db7d02314 + Monotone-Parent: d32a965a357a3d40a91ce6b756792c0e03dc7414 + Monotone-Revision: 87772f0d5e8f3cfa7bc149b0c9d6c47a2de10789 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-12T17:20:28 + Monotone-Branch: ca.inverse.sogo + commit 2dd2db084defb55679df2515903ef2bf79fc006f Author: Wolfgang Sourdeau Date: Wed Apr 11 20:10:00 2012 +0000 @@ -8593,6 +12334,22 @@ Date: Tue Apr 10 14:48:14 2012 +0000 A debian/sogo-openchange.install-multiarch +commit fcbc47b2348c127d6b4c7198c04ef7a8f2f233c2 +Merge: 823f57d fde6d06 +Author: Wolfgang Sourdeau +Date: Thu Apr 5 18:50:43 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 2718d596001d2e9358dcce09a959434c8f775f9f) + to branch 'ca.inverse.sogo' (head 366adf06b05b4f972813f3e731ae3338140ba86e) + + Monotone-Parent: 2718d596001d2e9358dcce09a959434c8f775f9f + Monotone-Parent: 366adf06b05b4f972813f3e731ae3338140ba86e + Monotone-Revision: ba40327d7cdcc284485580a61af95f9056989d40 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-05T18:50:43 + Monotone-Branch: ca.inverse.sogo + commit 823f57deca76a40d148ee967b1bfdc9eb46f1539 Author: Wolfgang Sourdeau Date: Thu Apr 5 18:50:05 2012 +0000 @@ -8634,6 +12391,22 @@ Date: Wed Apr 4 20:37:42 2012 +0000 M debian/control M debian/control-squeeze +commit 9f0e045f35f650a9e923f6daf599fb4aeb4132ab +Merge: 3d2c13d ddc5d86 +Author: Wolfgang Sourdeau +Date: Wed Apr 4 20:28:41 2012 +0000 + + merge of '403e9c9f8b6284761ab422dee636699902d4babe' + and '9b7b6ece389f868c2c9b2bcae1bcdfd5af065e48' + + Monotone-Parent: 403e9c9f8b6284761ab422dee636699902d4babe + Monotone-Parent: 9b7b6ece389f868c2c9b2bcae1bcdfd5af065e48 + Monotone-Revision: 49a23fbd758d213ee3123b508598dcc5bdede2a5 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-04-04T20:28:41 + Monotone-Branch: ca.inverse.sogo + commit 3d2c13d1a7515879e13a8610ab67ae7d313e2497 Author: Wolfgang Sourdeau Date: Wed Apr 4 20:28:18 2012 +0000 @@ -8647,6 +12420,22 @@ Date: Wed Apr 4 20:28:18 2012 +0000 M debian/control +commit ddc5d864c381e2bedb720957ffea31dbea9e798a +Merge: e034585 fb1e560 +Author: Jean Raby +Date: Wed Apr 4 20:21:31 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 858274c7be3ad2a6383c2f85c8ad10907bb43292) + to branch 'ca.inverse.sogo' (head 929e17ff05c17b5978929e33d5250710c9674c66) + + Monotone-Parent: 858274c7be3ad2a6383c2f85c8ad10907bb43292 + Monotone-Parent: 929e17ff05c17b5978929e33d5250710c9674c66 + Monotone-Revision: 9b7b6ece389f868c2c9b2bcae1bcdfd5af065e48 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-04-04T20:21:31 + Monotone-Branch: ca.inverse.sogo + commit e034585c2bf4a5e2f61c099ff80d95fbd4c54c5f Author: Jean Raby Date: Wed Apr 4 20:14:52 2012 +0000 @@ -8787,6 +12576,21 @@ Date: Tue Apr 3 20:56:58 2012 +0000 A debian/control-squeeze M debian/rules +commit 74779785184d5033a8a5b9cb51796598f44c6cca +Merge: 823f57d 9a8e764 +Author: Francis Lachapelle +Date: Sun Apr 1 06:28:04 2012 +0000 + + merge of '2718d596001d2e9358dcce09a959434c8f775f9f' + and '8e3f662472ff8e103d015246e84fdb6ca6dba012' + + Monotone-Parent: 2718d596001d2e9358dcce09a959434c8f775f9f + Monotone-Parent: 8e3f662472ff8e103d015246e84fdb6ca6dba012 + Monotone-Revision: ae97d044860b73b0f26efc2e4ba5c8134dee8299 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-04-01T06:28:04 + commit 9a8e76481761caeb94117acc91c32e97efaf706d Author: Francis Lachapelle Date: Sat Mar 31 08:34:24 2012 +0000 @@ -8921,6 +12725,22 @@ M OpenChange/MAPIStoreObject.m M OpenChange/MAPIStoreUserContext.h M OpenChange/MAPIStoreUserContext.m +commit cd0fe5cb8702b234bf2b659dafaa731e113dfc07 +Merge: fb36ac6 64b8498 +Author: Wolfgang Sourdeau +Date: Fri Mar 30 15:28:19 2012 +0000 + + merge of '7e8a35de12dd8bb06940206b775f3f46887a4476' + and 'd1a795ace9b3ecfe78615e345153f5c37d0ca4b2' + + Monotone-Parent: 7e8a35de12dd8bb06940206b775f3f46887a4476 + Monotone-Parent: d1a795ace9b3ecfe78615e345153f5c37d0ca4b2 + Monotone-Revision: 4899b773e21bd6c56bae726bf720e184b8ef9ec0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-30T15:28:19 + Monotone-Branch: ca.inverse.sogo + commit 64b8498eac7f1aa0b900e98675889cf2daa0dd5b Author: Wolfgang Sourdeau Date: Fri Mar 30 14:09:07 2012 +0000 @@ -8934,6 +12754,22 @@ Date: Fri Mar 30 14:09:07 2012 +0000 M Version +commit aeaf1bfe6b03ea816e18000164e2ec03bfcd7a60 +Merge: f06d573 2693932 +Author: Wolfgang Sourdeau +Date: Fri Mar 30 14:08:23 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 693036245b42a3d0059f8c06a2a725e716d54c9e) + to branch 'ca.inverse.sogo' (head d93b5b4142f73cdb24bac181e6d92140b7a59313) + + Monotone-Parent: 693036245b42a3d0059f8c06a2a725e716d54c9e + Monotone-Parent: d93b5b4142f73cdb24bac181e6d92140b7a59313 + Monotone-Revision: 34215cf1c90ce31c32de705320b2cd5f2bee55ec + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-30T14:08:23 + Monotone-Branch: ca.inverse.sogo + commit f06d57373ae200b22977827be48dd8502f8feb3a Author: Wolfgang Sourdeau Date: Fri Mar 30 14:07:36 2012 +0000 @@ -8994,6 +12830,37 @@ Date: Fri Mar 30 03:58:26 2012 +0000 M Scripts/sogo.cron +commit 953fe345b2cf45820a520801d1f2c36aa47abfa8 +Merge: 7629ad5 f06d573 +Author: Francis Lachapelle +Date: Fri Mar 30 01:40:16 2012 +0000 + + merge of '033d787afbb95cb745c3e129cd4c09587b3623df' + and '693036245b42a3d0059f8c06a2a725e716d54c9e' + + Monotone-Parent: 033d787afbb95cb745c3e129cd4c09587b3623df + Monotone-Parent: 693036245b42a3d0059f8c06a2a725e716d54c9e + Monotone-Revision: 1a5084ea5db1351b0b2a65c92046fb196a2c9d41 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-03-30T01:40:16 + +commit fb36ac6efc2f89c5b31a9aae8b6131916d333e4b +Merge: 7629ad5 2693932 +Author: Francis Lachapelle +Date: Thu Mar 29 23:04:56 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_15' (head 033d787afbb95cb745c3e129cd4c09587b3623df) + to branch 'ca.inverse.sogo' (head d93b5b4142f73cdb24bac181e6d92140b7a59313) + + Monotone-Parent: 033d787afbb95cb745c3e129cd4c09587b3623df + Monotone-Parent: d93b5b4142f73cdb24bac181e6d92140b7a59313 + Monotone-Revision: 7e8a35de12dd8bb06940206b775f3f46887a4476 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-03-29T23:04:56 + Monotone-Branch: ca.inverse.sogo + commit 7629ad595a98cb6f1164838fc9c0e121256d8e38 Author: Francis Lachapelle Date: Thu Mar 29 18:26:50 2012 +0000 @@ -9170,6 +13037,22 @@ Date: Mon Mar 26 16:24:21 2012 +0000 M ChangeLog M OpenChange/MAPIApplication.m +commit 5271b50701eddd3d0d1f7429bba3f36e1c90c5aa +Merge: 027d9d6 af3dc4a +Author: Wolfgang Sourdeau +Date: Mon Mar 26 16:23:38 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_14' (head 137ce0e5b4a2b4afe3b810e582cbe613caf2bb20) + to branch 'ca.inverse.sogo' (head be8cb88c243416af5fba817c001afc33ead04b69) + + Monotone-Parent: 137ce0e5b4a2b4afe3b810e582cbe613caf2bb20 + Monotone-Parent: be8cb88c243416af5fba817c001afc33ead04b69 + Monotone-Revision: 7f28bdd3182eaceae80acddcd3e23dc4e50b2821 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-26T16:23:38 + Monotone-Branch: ca.inverse.sogo + commit 027d9d6f362142fa0e37c6b850e0ee7619e5d615 Author: Wolfgang Sourdeau Date: Mon Mar 26 16:23:02 2012 +0000 @@ -9261,6 +13144,22 @@ M ChangeLog M NEWS M Tools/SOGoToolUserPreferences.m +commit af3dc4a903bda8247db9f3ecd766bf6bca8812be +Merge: 6b9137f 41297fd +Author: Francis Lachapelle +Date: Thu Mar 22 18:05:26 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_14' (head 5a2446cca5cd90dd3efdec2eec1633c328178659) + to branch 'ca.inverse.sogo' (head ab03ed37df567704b10ca118f26a816bdccc83e0) + + Monotone-Parent: 5a2446cca5cd90dd3efdec2eec1633c328178659 + Monotone-Parent: ab03ed37df567704b10ca118f26a816bdccc83e0 + Monotone-Revision: be8cb88c243416af5fba817c001afc33ead04b69 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-03-22T18:05:26 + Monotone-Branch: ca.inverse.sogo + commit 6b9137fddda03fea584e2a6f0e6af3fa0ce58bc3 Author: Francis Lachapelle Date: Thu Mar 22 17:39:44 2012 +0000 @@ -9303,6 +13202,22 @@ Date: Thu Mar 22 17:15:29 2012 +0000 M ChangeLog M UI/MailerUI/UIxMailFolderActions.m +commit 41297fd53117173c7d46222ba7178b683425e3ae +Merge: e30a9e1 0ec64bc +Author: Wolfgang Sourdeau +Date: Thu Mar 22 17:08:10 2012 +0000 + + merge of '5dde5ea96fd96485574abc6ba0f295b147b1ff16' + and '72cfb3dcfa19c247349b29d61b4878d418d4c13e' + + Monotone-Parent: 5dde5ea96fd96485574abc6ba0f295b147b1ff16 + Monotone-Parent: 72cfb3dcfa19c247349b29d61b4878d418d4c13e + Monotone-Revision: ab03ed37df567704b10ca118f26a816bdccc83e0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-22T17:08:10 + Monotone-Branch: ca.inverse.sogo + commit e5193ddbac54ba87e244e33ec48e17c0bae260a6 Author: Francis Lachapelle Date: Thu Mar 22 15:48:03 2012 +0000 @@ -9330,6 +13245,22 @@ Date: Thu Mar 22 15:23:59 2012 +0000 M ChangeLog M OpenChange/MAPIStoreTasksMessage.m +commit 55911cd375981b4e35585136e4e2582bca1ab747 +Merge: 7a655ff 107728d +Author: Wolfgang Sourdeau +Date: Wed Mar 21 15:50:33 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_14' (head 3c8a49fe7ef93ec55aaeef9dd064be1de6052cfe) + to branch 'ca.inverse.sogo' (head d93bbab8d949fa50be1d182af68b2eecf4c79105) + + Monotone-Parent: 3c8a49fe7ef93ec55aaeef9dd064be1de6052cfe + Monotone-Parent: d93bbab8d949fa50be1d182af68b2eecf4c79105 + Monotone-Revision: 8d867d6c59e7ebea428c107ce0681159571e7c90 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-21T15:50:33 + Monotone-Branch: ca.inverse.sogo + commit 7a655ff8cefa0885ccc15bd365c4e6aa8c10c75b Author: Wolfgang Sourdeau Date: Wed Mar 21 15:50:07 2012 +0000 @@ -9401,6 +13332,22 @@ Date: Tue Mar 20 20:30:51 2012 +0000 M Version +commit 15f92315fd39e86251fdcec504363bca25c8f000 +Merge: 3a31544 ccc7e36 +Author: Wolfgang Sourdeau +Date: Tue Mar 20 20:29:39 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_14' (head 20fe3869b4c2b451d086944d0be00758c4b807f0) + to branch 'ca.inverse.sogo' (head 0917b3278898caa0cb56a12a960275816f5ab396) + + Monotone-Parent: 0917b3278898caa0cb56a12a960275816f5ab396 + Monotone-Parent: 20fe3869b4c2b451d086944d0be00758c4b807f0 + Monotone-Revision: 73343e195be838a68cfbeb8edc978d8273b1e6da + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-20T20:29:39 + Monotone-Branch: ca.inverse.sogo + commit ccc7e3652340154d867dd5ac6cad0c03d905dd68 Author: Wolfgang Sourdeau Date: Tue Mar 20 20:28:54 2012 +0000 @@ -9471,6 +13418,22 @@ Date: Tue Mar 20 18:46:05 2012 +0000 M OpenChange/NSObject+MAPIStore.m +commit e30a9e12381e0a49bdee2977b3a7b5a2bb7b31c2 +Merge: c929c64 9f74010 +Author: Francis Lachapelle +Date: Tue Mar 20 14:39:06 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_14' (head 4359e779a09c08a5fd03eda9fd8269ba9eeab6ff) + to branch 'ca.inverse.sogo' (head 4adb09f9c02af62ea07b317c5c6a14100b8204e1) + + Monotone-Parent: 4359e779a09c08a5fd03eda9fd8269ba9eeab6ff + Monotone-Parent: 4adb09f9c02af62ea07b317c5c6a14100b8204e1 + Monotone-Revision: 5dde5ea96fd96485574abc6ba0f295b147b1ff16 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-03-20T14:39:06 + Monotone-Branch: ca.inverse.sogo + commit c929c640fb28eca025218e2b1d06cfd4266b6a38 Author: Francis Lachapelle Date: Tue Mar 20 14:33:18 2012 +0000 @@ -9584,6 +13547,22 @@ Date: Mon Mar 19 19:24:16 2012 +0000 M ChangeLog M OpenChange/SOGoMAPIFSMessage.m +commit d1966f9b5c435e8f0ec101fa4799f1d77196095a +Merge: ba5620d cf97dee +Author: Wolfgang Sourdeau +Date: Mon Mar 19 16:09:09 2012 +0000 + + merge of '0bc15679c599b0a07a83838c4039891a9fb7a8bb' + and 'a080c16a5e48751ac225497ff7300f2a67b4721f' + + Monotone-Parent: 0bc15679c599b0a07a83838c4039891a9fb7a8bb + Monotone-Parent: a080c16a5e48751ac225497ff7300f2a67b4721f + Monotone-Revision: a32b67b00b6dfccd212526247098ea8c2df940a9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-19T16:09:09 + Monotone-Branch: ca.inverse.sogo + commit ba5620dcbe8170b40315772f734b6e4dbb18d474 Author: Jean Raby Date: Mon Mar 19 15:30:40 2012 +0000 @@ -9811,6 +13790,22 @@ Date: Fri Mar 16 20:41:52 2012 +0000 M Tests/Integration/test-webdavsync.py +commit d4e861733e8793704847c5c68cc598de1c9ccd54 +Merge: 7bbcd93 911b170 +Author: Wolfgang Sourdeau +Date: Fri Mar 16 20:40:47 2012 +0000 + + merge of '5b10c44689a8c7264fe76ad8de7b4e7b70c5aff9' + and '6458b9280ffad02762e0cb2a3067126b205997d6' + + Monotone-Parent: 5b10c44689a8c7264fe76ad8de7b4e7b70c5aff9 + Monotone-Parent: 6458b9280ffad02762e0cb2a3067126b205997d6 + Monotone-Revision: ae2a845cc86e684e944e2ffbb629f7bd634d985f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-16T20:40:47 + Monotone-Branch: ca.inverse.sogo + commit 911b170f32c911daebfec863bd8fa0b16c1c1086 Author: Wolfgang Sourdeau Date: Fri Mar 16 20:39:51 2012 +0000 @@ -9839,6 +13834,25 @@ Date: Fri Mar 16 17:12:53 2012 +0000 M UI/WebServerResources/UIxMailEditor.css +commit 4463c7f8bf158601c15401309878e760496d0770 +Merge: 0f56821 7c39827 +Author: Francis Lachapelle +Date: Fri Mar 16 15:39:18 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head a59a10e4b696e7b04ce4b5dffd0f66574c31525f) + to branch 'ca.inverse.sogo' (head 7fc3840c26038b9a53ac374b2e5b17f2ceeb99ab) + + Monotone-Parent: 7fc3840c26038b9a53ac374b2e5b17f2ceeb99ab + Monotone-Parent: a59a10e4b696e7b04ce4b5dffd0f66574c31525f + Monotone-Revision: 54d035c9875133872cd3d137a1234594cb96e36e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-03-16T15:39:18 + Monotone-Date: 2012-03-16T17:11:56 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit 7c398279b00b3d041342e6b84ce9d781ebb84b7e Author: Jean Raby Date: Fri Mar 16 15:39:05 2012 +0000 @@ -9897,6 +13911,21 @@ Date: Fri Mar 16 15:00:31 2012 +0000 M NEWS +commit 397d49f5a77b18dae05839e2c9856943d542c469 +Merge: dc416b0 e9e2d67 +Author: Francis Lachapelle +Date: Fri Mar 16 01:45:05 2012 +0000 + + merge of '9cacc7ba282ab08c75e02952d2f95a3f5bdf9010' + and 'c87ea9a13a8439fbe9d7e1065b37003e1752149b' + + Monotone-Parent: 9cacc7ba282ab08c75e02952d2f95a3f5bdf9010 + Monotone-Parent: c87ea9a13a8439fbe9d7e1065b37003e1752149b + Monotone-Revision: f1a374b2656fa1898821dfc1e6ab50316d7c5c5d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-03-16T01:45:05 + commit e9e2d6796bb0cb25e7d0798773d8a9a8738ede8f Author: Francis Lachapelle Date: Fri Mar 16 01:44:48 2012 +0000 @@ -9909,6 +13938,22 @@ Date: Fri Mar 16 01:44:48 2012 +0000 M UI/WebServerResources/generic.css +commit 0f568210fc24c9eee81b16c1cebb5d88aff2b7c2 +Merge: dc416b0 7d2c104 +Author: Jean Raby +Date: Thu Mar 15 21:02:00 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 9cacc7ba282ab08c75e02952d2f95a3f5bdf9010) + to branch 'ca.inverse.sogo' (head b3c1d7bab2024077b5c89d49297c6ceb5bc5aa0e) + + Monotone-Parent: 9cacc7ba282ab08c75e02952d2f95a3f5bdf9010 + Monotone-Parent: b3c1d7bab2024077b5c89d49297c6ceb5bc5aa0e + Monotone-Revision: 7fc3840c26038b9a53ac374b2e5b17f2ceeb99ab + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-03-15T21:02:00 + Monotone-Branch: ca.inverse.sogo + commit dc416b0a9591a2e804202870c3a114dcf55e4577 Author: Jean Raby Date: Thu Mar 15 21:01:25 2012 +0000 @@ -10039,6 +14084,22 @@ M UI/WebServerResources/SOGoDragHandles.js M UI/WebServerResources/UIxMailEditor.js M UI/WebServerResources/iefixes.css +commit 7d2c104a3e2c07901b9977f3d375d3b109087bb1 +Merge: 4a1b419 dcb9cb9 +Author: Francis Lachapelle +Date: Thu Mar 15 17:04:14 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 83140ea045c02e9961515cc478033e97df559cfb) + to branch 'ca.inverse.sogo' (head 90aff49e82642782d7281a87451e14601ed189b9) + + Monotone-Parent: 83140ea045c02e9961515cc478033e97df559cfb + Monotone-Parent: 90aff49e82642782d7281a87451e14601ed189b9 + Monotone-Revision: b3c1d7bab2024077b5c89d49297c6ceb5bc5aa0e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-03-15T17:04:14 + Monotone-Branch: ca.inverse.sogo + commit 4a1b4193addd9d63ce5977e3e9abcbbf90b54fee Author: Jean Raby Date: Thu Mar 15 14:59:08 2012 +0000 @@ -10225,6 +14286,22 @@ Date: Wed Mar 14 00:48:26 2012 +0000 M UI/WebServerResources/UIxFilterEditor.js +commit dcb9cb9dd54d3ef1eebed92460fa6ed437b67fa7 +Merge: 06c3f54 7518c99 +Author: Francis Lachapelle +Date: Wed Mar 14 00:34:54 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 9ecab283bcceea3e4446b4445d65cffeae83252c) + to branch 'ca.inverse.sogo' (head f9b18d8316354c8b95dc483c13880095f07294eb) + + Monotone-Parent: 9ecab283bcceea3e4446b4445d65cffeae83252c + Monotone-Parent: f9b18d8316354c8b95dc483c13880095f07294eb + Monotone-Revision: 90aff49e82642782d7281a87451e14601ed189b9 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-03-14T00:34:54 + Monotone-Branch: ca.inverse.sogo + commit 7518c994e24469f4d70431f90637e9ae1043fc3e Author: Wolfgang Sourdeau Date: Tue Mar 13 21:16:48 2012 +0000 @@ -10499,6 +14576,22 @@ Date: Mon Mar 12 00:06:06 2012 +0000 M ChangeLog M OpenChange/MAPIStoreCalendarMessage.m +commit 87d47b0c10556bdcb2fe0b51a2f438a7e8cbbc1c +Merge: d3c1388 e01985e +Author: Wolfgang Sourdeau +Date: Mon Mar 12 00:00:14 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 33ff1424b902e24430e86c14dd3abab8c93e0a34) + to branch 'ca.inverse.sogo' (head facc7e6b6f1dbd15663b7472ae5447106a067e21) + + Monotone-Parent: 33ff1424b902e24430e86c14dd3abab8c93e0a34 + Monotone-Parent: facc7e6b6f1dbd15663b7472ae5447106a067e21 + Monotone-Revision: d7f21bcf753320694e98ee257a3fd00d2ea4f4ad + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-12T00:00:14 + Monotone-Branch: ca.inverse.sogo + commit d3c138897b58dbefc3e33b71a995b116609c6b06 Author: Wolfgang Sourdeau Date: Sun Mar 11 23:59:58 2012 +0000 @@ -10583,6 +14676,22 @@ Date: Fri Mar 9 17:12:59 2012 +0000 M ChangeLog M SoObjects/SOGo/WORequest+SOGo.m +commit 8e522ca51811b5ff2212616d4cb7e292451b2ec9 +Merge: 7a30bb0 38332ae +Author: Wolfgang Sourdeau +Date: Fri Mar 9 04:18:27 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 7a9373e79859de2841589e14ffae38b4a0472211) + to branch 'ca.inverse.sogo' (head 649759ddd1b8c9f46e0e35315392ffbafa117ff9) + + Monotone-Parent: 649759ddd1b8c9f46e0e35315392ffbafa117ff9 + Monotone-Parent: 7a9373e79859de2841589e14ffae38b4a0472211 + Monotone-Revision: 40431eed7cc9565c65c5967de069938c678f2cbc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-09T04:18:27 + Monotone-Branch: ca.inverse.sogo + commit 38332aed1a0e7a7d579a0319df3b414707f977b1 Author: Wolfgang Sourdeau Date: Fri Mar 9 04:18:10 2012 +0000 @@ -10595,6 +14704,22 @@ Date: Fri Mar 9 04:18:10 2012 +0000 M ChangeLog +commit 7a30bb0eafd513b9705dafeace4260d60faff483 +Merge: 1fe00b7 16ad526 +Author: Wolfgang Sourdeau +Date: Fri Mar 9 04:17:59 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 37d86b8e5ad24c1858630f995fbaac5a979617e2) + to branch 'ca.inverse.sogo' (head 5a4402259608afb9ee27063b6a308479a1a073fb) + + Monotone-Parent: 37d86b8e5ad24c1858630f995fbaac5a979617e2 + Monotone-Parent: 5a4402259608afb9ee27063b6a308479a1a073fb + Monotone-Revision: 649759ddd1b8c9f46e0e35315392ffbafa117ff9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-09T04:17:59 + Monotone-Branch: ca.inverse.sogo + commit 1fe00b795c7f1fdbe5b3ff79f43dd58ae599f273 Author: Wolfgang Sourdeau Date: Fri Mar 9 04:17:09 2012 +0000 @@ -10695,6 +14820,22 @@ Date: Thu Mar 8 15:19:57 2012 +0000 M ChangeLog M OpenChange/MAPIStoreTypes.m +commit 0921adc22c5ed85ed454fe863bfdd6724acfa08f +Merge: 9ad607c 0993004 +Author: Francis Lachapelle +Date: Wed Mar 7 20:48:51 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 837142c1df31bc292adff9513b1f7c35f896ea83) + to branch 'ca.inverse.sogo' (head d33b0adee86f35e2abaffd30306c1e5ed174b08c) + + Monotone-Parent: 837142c1df31bc292adff9513b1f7c35f896ea83 + Monotone-Parent: d33b0adee86f35e2abaffd30306c1e5ed174b08c + Monotone-Revision: 950ec4b3237bbed086e9876da2e597c7e074531a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-03-07T20:48:51 + Monotone-Branch: ca.inverse.sogo + commit 9ad607c387dea01bf15afbf27e57edf673cabaaf Author: Francis Lachapelle Date: Wed Mar 7 20:31:08 2012 +0000 @@ -10712,6 +14853,22 @@ D SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishForward.wod A SoObjects/Mailer/SOGoMailSpanishArgentinaReply.wo/SOGoMailSpanishArgentinaReply.wod D SoObjects/Mailer/SOGoMailSpanishArgentinaReply.wo/SOGoMailSpanishReply.wod +commit 09930048b1018b9b1fcf50d4ee580d905d3d7a5b +Merge: d3b691f 165dd26 +Author: Wolfgang Sourdeau +Date: Tue Mar 6 20:33:31 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head bbb9fd8c5076db6a340935f8f7dba98b04c5b353) + to branch 'ca.inverse.sogo' (head 46315e3df3a804021e11c1adbe9642bbb8807c09) + + Monotone-Parent: 46315e3df3a804021e11c1adbe9642bbb8807c09 + Monotone-Parent: bbb9fd8c5076db6a340935f8f7dba98b04c5b353 + Monotone-Revision: d33b0adee86f35e2abaffd30306c1e5ed174b08c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-06T20:33:31 + Monotone-Branch: ca.inverse.sogo + commit 165dd26ec508fd301dcb630fcd3a9f0afd097301 Author: Wolfgang Sourdeau Date: Tue Mar 6 20:32:20 2012 +0000 @@ -10738,6 +14895,22 @@ Date: Tue Mar 6 19:46:14 2012 +0000 M ChangeLog M SoObjects/Contacts/NGVCard+SOGo.m +commit d3b691ff429365ca19f397dccf7798bdbd3fa6b1 +Merge: c429271 da91298 +Author: Wolfgang Sourdeau +Date: Fri Mar 2 20:58:03 2012 +0000 + + merge of '3d21b0780b7affb529a020d89dcbf84325264c7d' + and 'bae1be96df24577937ad8ca98b57c4533df5f763' + + Monotone-Parent: 3d21b0780b7affb529a020d89dcbf84325264c7d + Monotone-Parent: bae1be96df24577937ad8ca98b57c4533df5f763 + Monotone-Revision: 46315e3df3a804021e11c1adbe9642bbb8807c09 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-02T20:58:03 + Monotone-Branch: ca.inverse.sogo + commit c4292714b50e8bf6a3c8109493c42834b3ef0478 Author: Wolfgang Sourdeau Date: Fri Mar 2 20:44:24 2012 +0000 @@ -10806,6 +14979,22 @@ Date: Fri Mar 2 20:11:05 2012 +0000 M ChangeLog M OpenChange/gen-property-selectors.py +commit da9129835de1becb49bed1aae19d575bcf86599b +Merge: f223156 260263b +Author: Jean Raby +Date: Fri Mar 2 15:36:33 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 2db05edf03ab8974bf7e72c13532434b264cff3d) + to branch 'ca.inverse.sogo' (head 4d7bcac9e677fe169f33c5d75187e05adbfeb918) + + Monotone-Parent: 2db05edf03ab8974bf7e72c13532434b264cff3d + Monotone-Parent: 4d7bcac9e677fe169f33c5d75187e05adbfeb918 + Monotone-Revision: bae1be96df24577937ad8ca98b57c4533df5f763 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-03-02T15:36:33 + Monotone-Branch: ca.inverse.sogo + commit f223156046d9793f1d3410e7d39fb1379216d351 Author: Jean Raby Date: Fri Mar 2 15:36:12 2012 +0000 @@ -10851,6 +15040,22 @@ Date: Fri Mar 2 14:41:15 2012 +0000 M SoObjects/SOGo/GNUmakefile.preamble +commit d76e02f9441739282f72d5815e17123d90007f87 +Merge: 347bc41 f687f19 +Author: Wolfgang Sourdeau +Date: Thu Mar 1 21:58:13 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 40141d367c9c6560edf3b306cee2aa7683dad3ec) + to branch 'ca.inverse.sogo' (head d8fc3d2ee86a0b0a254a0235e85dc2c9a2b938d7) + + Monotone-Parent: 40141d367c9c6560edf3b306cee2aa7683dad3ec + Monotone-Parent: d8fc3d2ee86a0b0a254a0235e85dc2c9a2b938d7 + Monotone-Revision: 7172e18d32de3bd2bb4232516383f7087889d442 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-03-01T21:58:13 + Monotone-Branch: ca.inverse.sogo + commit 347bc411ac8cb1417971e664aa22765cb1a6146d Author: Wolfgang Sourdeau Date: Thu Mar 1 21:57:16 2012 +0000 @@ -10935,6 +15140,22 @@ Date: Thu Mar 1 15:49:10 2012 +0000 M NEWS +commit 681dd3228f5f47889012ae110023a9bf78cddff7 +Merge: bf2a663 dca85d5 +Author: Jean Raby +Date: Thu Mar 1 15:45:50 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_13' (head 3c9a6f0cbe911bb41c045765248ecc411a616633) + to branch 'ca.inverse.sogo' (head 06454d6f51cf228398d63d36b7e74eaac7080cc2) + + Monotone-Parent: 06454d6f51cf228398d63d36b7e74eaac7080cc2 + Monotone-Parent: 3c9a6f0cbe911bb41c045765248ecc411a616633 + Monotone-Revision: ef75cd511cd1ba19bc7897bde4a1822bc3ea723e + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-03-01T15:45:50 + Monotone-Branch: ca.inverse.sogo + commit dca85d5d007a5a842fca3f2d434bc80196f51043 Author: Jean Raby Date: Thu Mar 1 15:45:04 2012 +0000 @@ -11019,6 +15240,22 @@ Date: Mon Feb 27 18:43:42 2012 +0000 M ChangeLog M OpenChange/MAPIStoreUserContext.m +commit 4399b4d8f8dc326eb629bd8d425f41a62b605bde +Merge: 45a6a36 20a336e +Author: Wolfgang Sourdeau +Date: Fri Feb 24 20:11:26 2012 +0000 + + merge of '544e6a1cec3edef4870ca5917521c26d9253603b' + and 'b85ba9f2eec26821837bb7890dcb3fd9f82c2eb5' + + Monotone-Parent: 544e6a1cec3edef4870ca5917521c26d9253603b + Monotone-Parent: b85ba9f2eec26821837bb7890dcb3fd9f82c2eb5 + Monotone-Revision: 4a7c44a79feb3e8d5e76eb15e2e3fbe5c2dcf7fa + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-24T20:11:26 + Monotone-Branch: ca.inverse.sogo + commit 20a336eecde297a8c933ac26c320d95ff6c04305 Author: Wolfgang Sourdeau Date: Fri Feb 24 20:10:56 2012 +0000 @@ -11047,6 +15284,22 @@ Date: Thu Feb 23 23:34:26 2012 +0000 M ChangeLog M OpenChange/MAPIStoreMailContext.m +commit c497b03aa5665c81cc98448afac6c97172d74607 +Merge: 0396709 1c9a3b5 +Author: Wolfgang Sourdeau +Date: Thu Feb 23 23:28:27 2012 +0000 + + merge of '4b9d34d20bce0208c3cf667d2c6e640fc0f7da7d' + and '84bd96711bb8cbccbe1b4ca017c6310b86d64421' + + Monotone-Parent: 4b9d34d20bce0208c3cf667d2c6e640fc0f7da7d + Monotone-Parent: 84bd96711bb8cbccbe1b4ca017c6310b86d64421 + Monotone-Revision: a1668784bf0e7d4c0f6537e4fd960651c40e912b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-23T23:28:27 + Monotone-Branch: ca.inverse.sogo + commit 1c9a3b5eda7fceb1c927e3a1a701d107f04ce713 Author: Wolfgang Sourdeau Date: Thu Feb 23 23:27:59 2012 +0000 @@ -11079,6 +15332,22 @@ Date: Thu Feb 23 21:23:23 2012 +0000 M Documentation/SOGo Installation Guide.odt +commit 2ef3ac85993b50c243564360e1921f67eb00de39 +Merge: 030e88c 7815b34 +Author: Wolfgang Sourdeau +Date: Thu Feb 23 21:16:59 2012 +0000 + + merge of '89d4328e421b6f950b0a53ffcca28a53dc97e2ce' + and 'e8c7d8a4465a1b9357c1d9f201dec2b93c5f3507' + + Monotone-Parent: 89d4328e421b6f950b0a53ffcca28a53dc97e2ce + Monotone-Parent: e8c7d8a4465a1b9357c1d9f201dec2b93c5f3507 + Monotone-Revision: 5ef3839ff2c5bebdaca10693e61a632e208289c6 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-23T21:16:59 + Monotone-Branch: ca.inverse.sogo + commit 030e88c9087ae5aefd6ea142ed63dfa43e26c969 Author: Wolfgang Sourdeau Date: Thu Feb 23 21:16:22 2012 +0000 @@ -11166,6 +15435,22 @@ Date: Wed Feb 22 20:56:02 2012 +0000 M Documentation/SOGo Installation Guide.odt +commit 88e1596a8231a7dc731722d332764a47f3934749 +Merge: 6ce0c29 68e8a28 +Author: Wolfgang Sourdeau +Date: Wed Feb 22 18:38:02 2012 +0000 + + merge of '3be1457342206d81824250d57633322dda8fb4d9' + and 'c110b42afb9f73f9a8ea6c766ec8e46b798c7316' + + Monotone-Parent: 3be1457342206d81824250d57633322dda8fb4d9 + Monotone-Parent: c110b42afb9f73f9a8ea6c766ec8e46b798c7316 + Monotone-Revision: 96995dfe0ebbe5ac457207cfdbc88ebaa23b3068 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-22T18:38:02 + Monotone-Branch: ca.inverse.sogo + commit 68e8a288467278880ab77f9d0e49a1a85e247998 Author: Wolfgang Sourdeau Date: Wed Feb 22 18:37:58 2012 +0000 @@ -11181,6 +15466,22 @@ M ChangeLog M SoObjects/SOGo/SQLSource.h M SoObjects/SOGo/SQLSource.m +commit 8cef32c6119af86ccb6d1019948029717b08f484 +Merge: 3274bd1 e056309 +Author: Wolfgang Sourdeau +Date: Wed Feb 22 14:46:24 2012 +0000 + + merge of '53ba3739a8b7ce64040a91695b40bad1a7d7e1aa' + and '9c35c13adaec0c9fe67e19acb1c73a22271aa714' + + Monotone-Parent: 53ba3739a8b7ce64040a91695b40bad1a7d7e1aa + Monotone-Parent: 9c35c13adaec0c9fe67e19acb1c73a22271aa714 + Monotone-Revision: 3d26091bec393e3abf8d2b6033e0737e09c207b9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-22T14:46:24 + Monotone-Branch: ca.inverse.sogo + commit 3274bd1f4c6d549afc3cca4dc35a2ae55ccb33e8 Author: Wolfgang Sourdeau Date: Wed Feb 22 14:44:22 2012 +0000 @@ -11352,6 +15653,22 @@ M UI/Scheduler/UIxComponentEditor.m M UI/Templates/SchedulerUI/UIxComponentEditor.wox M UI/WebServerResources/UIxComponentEditor.js +commit cb6a4530e1d66d404a4fd9f8f6d383a84d40c2f5 +Merge: 80934d7 18eab08 +Author: Wolfgang Sourdeau +Date: Mon Feb 20 19:48:50 2012 +0000 + + merge of '15825926d3d6130838a6e8a925fb390321c6e5fa' + and '7f4c04f0c1883efb437cd0189f442b20c0063c82' + + Monotone-Parent: 15825926d3d6130838a6e8a925fb390321c6e5fa + Monotone-Parent: 7f4c04f0c1883efb437cd0189f442b20c0063c82 + Monotone-Revision: 5066f4418986dc6df8b207002b41f82bc9e2bb8b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-20T19:48:50 + Monotone-Branch: ca.inverse.sogo + commit 18eab081650cd7ca43d171b5607f7c90b8aabafc Author: Wolfgang Sourdeau Date: Mon Feb 20 19:47:58 2012 +0000 @@ -11389,6 +15706,22 @@ M ChangeLog M OpenChange/MAPIStoreObject.h M OpenChange/MAPIStoreObject.m +commit 446b4e333f6f3c85590fa9b95876af4d7abf56c4 +Merge: 9948048 3c6cdd8 +Author: Wolfgang Sourdeau +Date: Fri Feb 17 19:00:53 2012 +0000 + + merge of '177dc270d3d2e9cdaa12bcd9273e1af23ee99d72' + and '75ed7ffc63cde2539fbad2651b19e8b944cba52e' + + Monotone-Parent: 177dc270d3d2e9cdaa12bcd9273e1af23ee99d72 + Monotone-Parent: 75ed7ffc63cde2539fbad2651b19e8b944cba52e + Monotone-Revision: 04bea15431a5d37d2c52ccda4a30d78b57741793 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-17T19:00:53 + Monotone-Branch: ca.inverse.sogo + commit 3c6cdd8708ec66dfe36a2476d17796b67198c3e2 Author: Wolfgang Sourdeau Date: Fri Feb 17 18:59:57 2012 +0000 @@ -11484,6 +15817,22 @@ Date: Wed Feb 15 19:33:37 2012 +0000 M Tests/Integration/test-sieve.py +commit b57db60cea3da4210bbb1754e77b8367b93455f7 +Merge: eb64356 1834ed6 +Author: Jean Raby +Date: Wed Feb 15 18:14:58 2012 +0000 + + merge of '057f323db2fa6be4670dc58350ff09cbbc11113b' + and '99a21f22aaef25992c4ef5afd7e525c0b3aca3cd' + + Monotone-Parent: 057f323db2fa6be4670dc58350ff09cbbc11113b + Monotone-Parent: 99a21f22aaef25992c4ef5afd7e525c0b3aca3cd + Monotone-Revision: fb63130e235a425b2051b359e3504ed4d8916859 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-02-15T18:14:58 + Monotone-Branch: ca.inverse.sogo + commit eb643568581453d65bc1a58c7542f7a82b83d91d Author: Jean Raby Date: Wed Feb 15 18:14:19 2012 +0000 @@ -11499,6 +15848,22 @@ Date: Wed Feb 15 18:14:19 2012 +0000 M Tests/Integration/test-webdavsync.py +commit dc0083ba4d2b74ad10eb0bd87ee0176bca9e014d +Merge: c198255 da111aa +Author: Wolfgang Sourdeau +Date: Tue Feb 14 21:24:10 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head c5233a2a4e6a6abdb50191daf1eb589c9ff5cf80) + to branch 'ca.inverse.sogo' (head 212622191a26c7b5f257c536a45dfea03f404bc1) + + Monotone-Parent: 212622191a26c7b5f257c536a45dfea03f404bc1 + Monotone-Parent: c5233a2a4e6a6abdb50191daf1eb589c9ff5cf80 + Monotone-Revision: e18b5ae2235fde5d7f7f569ead8452a2217d9b5c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-14T21:24:10 + Monotone-Branch: ca.inverse.sogo + commit da111aa6cc902c98545021250d0c359dbf5899bb Author: Wolfgang Sourdeau Date: Tue Feb 14 21:23:31 2012 +0000 @@ -11513,6 +15878,38 @@ M ChangeLog M SoObjects/SOGo/SOGoUserManager.m M SoObjects/SOGo/SQLSource.m +commit c198255870e1f4d1e4009a72a7e63d43a21900e5 +Merge: d3dc7d7 0616134 +Author: Wolfgang Sourdeau +Date: Tue Feb 14 16:35:37 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 68e5a2b8ae68f37745584028ad7764b76dcc5794) + to branch 'ca.inverse.sogo' (head d25ef2fb65bbd470f5702fcc034aa1e9a2b5d66c) + + Monotone-Parent: 68e5a2b8ae68f37745584028ad7764b76dcc5794 + Monotone-Parent: d25ef2fb65bbd470f5702fcc034aa1e9a2b5d66c + Monotone-Revision: 212622191a26c7b5f257c536a45dfea03f404bc1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-14T16:35:37 + Monotone-Branch: ca.inverse.sogo + +commit 0616134d20bb95dc1c7822f22a4c055539013ae0 +Merge: 486c711 186023c +Author: Ludovic Marcotte +Date: Tue Feb 14 15:51:34 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 07da2515c4d2be88823f4531db65f3d4d995acdc) + to branch 'ca.inverse.sogo' (head 3d47f593fbb200a77cb1c9523f3d158473420274) + + Monotone-Parent: 07da2515c4d2be88823f4531db65f3d4d995acdc + Monotone-Parent: 3d47f593fbb200a77cb1c9523f3d158473420274 + Monotone-Revision: d25ef2fb65bbd470f5702fcc034aa1e9a2b5d66c + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-02-14T15:51:34 + Monotone-Branch: ca.inverse.sogo + commit 486c7115fb7b30daab31b14afbd6c71ceab8398b Author: Ludovic Marcotte Date: Tue Feb 14 15:51:23 2012 +0000 @@ -11588,6 +15985,22 @@ Date: Tue Feb 14 14:33:17 2012 +0000 M ChangeLog M OpenChange/MAPIStoreCalendarMessage.m +commit a2748856297f40665f38bcf4ce70985cc8e98c69 +Merge: 8c5021e a5cc420 +Author: Wolfgang Sourdeau +Date: Mon Feb 13 19:46:45 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 738bb5934b9505acd57737d65ba73eb95e8a9379) + to branch 'ca.inverse.sogo' (head e64532f3ef4ab8be3e40ad24d893b4867d0af1d5) + + Monotone-Parent: 738bb5934b9505acd57737d65ba73eb95e8a9379 + Monotone-Parent: e64532f3ef4ab8be3e40ad24d893b4867d0af1d5 + Monotone-Revision: 68d30b4cdc1cec564b3d0e8651e00e945881b5ce + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-13T19:46:45 + Monotone-Branch: ca.inverse.sogo + commit 8c5021e3d05f991c063deb41be0c1ead7b063ca3 Author: Wolfgang Sourdeau Date: Mon Feb 13 19:46:08 2012 +0000 @@ -11659,6 +16072,22 @@ M UI/Contacts/UIxContactFoldersView.m M UI/Contacts/UIxContactsListActions.m M UI/MailerUI/UIxMailEditor.m +commit e8abd08d316425e830fa5b056677e46eb060ab24 +Merge: cd1d4d6 d275748 +Author: Francis Lachapelle +Date: Sat Feb 11 06:50:52 2012 +0000 + + merge of 'a3b799159abc70880dcdddcf22236376e1646a5d' + and 'e3472120a6c1a2370d18a7cf44e52e53f93b7323' + + Monotone-Parent: a3b799159abc70880dcdddcf22236376e1646a5d + Monotone-Parent: e3472120a6c1a2370d18a7cf44e52e53f93b7323 + Monotone-Revision: d4394b4b92fdfda720d67698c9fbadc75787ad18 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-02-11T06:50:52 + Monotone-Branch: ca.inverse.sogo + commit d27574862bc28030dbe37230f5cb598ed49b6374 Author: Francis Lachapelle Date: Sat Feb 11 01:20:48 2012 +0000 @@ -11810,6 +16239,23 @@ Date: Wed Feb 8 15:41:57 2012 +0000 M ChangeLog M UI/WebServerResources/ContactsUI.js +commit d3dc7d7be85003f59c6219c67876c23bdde5a6bf +Merge: 486c711 76ca9fb +Author: Francis Lachapelle +Date: Wed Feb 8 14:58:01 2012 +0000 + + merge of '07da2515c4d2be88823f4531db65f3d4d995acdc' + and '12cffe17c857f344b88a2e8225bd29d25d96b049' + + Monotone-Parent: 07da2515c4d2be88823f4531db65f3d4d995acdc + Monotone-Parent: 12cffe17c857f344b88a2e8225bd29d25d96b049 + Monotone-Revision: 68e5a2b8ae68f37745584028ad7764b76dcc5794 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-08T14:58:01 + Monotone-Date: 2012-02-14T16:34:48 + commit 76ca9fb0b7ffdf55155d4dfc305f9044b4957111 Author: Wolfgang Sourdeau Date: Tue Feb 14 15:58:17 2012 +0000 @@ -11823,6 +16269,22 @@ Date: Tue Feb 14 15:58:17 2012 +0000 M ChangeLog M SoObjects/SOGo/SOGoSQLUserProfile.m +commit a5cc420a1b73e2610fb9fb4a457148d4ef5e0295 +Merge: 0e72bbe 3548f15 +Author: Francis Lachapelle +Date: Wed Feb 8 07:38:57 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 6a3d48cf816cd9dd300983790541d39c969393c6) + to branch 'ca.inverse.sogo' (head 99d4bc909bf50d700f93573eaceabb2e45fb55e7) + + Monotone-Parent: 6a3d48cf816cd9dd300983790541d39c969393c6 + Monotone-Parent: 99d4bc909bf50d700f93573eaceabb2e45fb55e7 + Monotone-Revision: e64532f3ef4ab8be3e40ad24d893b4867d0af1d5 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-02-08T07:38:57 + Monotone-Branch: ca.inverse.sogo + commit 0e72bbe01c68bb1153cf9d5ffcffa17f78b8867c Author: Francis Lachapelle Date: Wed Feb 8 07:38:17 2012 +0000 @@ -11837,6 +16299,22 @@ Date: Wed Feb 8 07:38:17 2012 +0000 M debian/sogo.docs +commit 3548f1554fd792f88f90c7c0ecf3a65401a0b2e5 +Merge: c255ce9 d2efc90 +Author: Francis Lachapelle +Date: Wed Feb 8 05:03:45 2012 +0000 + + merge of '6e9bec6a824b22501c8cbc518a56410d6d896cb0' + and 'f67fbb0139df60f0e98c0aede6b166d1a8b15d81' + + Monotone-Parent: 6e9bec6a824b22501c8cbc518a56410d6d896cb0 + Monotone-Parent: f67fbb0139df60f0e98c0aede6b166d1a8b15d81 + Monotone-Revision: 99d4bc909bf50d700f93573eaceabb2e45fb55e7 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-02-08T05:03:45 + Monotone-Branch: ca.inverse.sogo + commit c255ce92fdf85e6d914eeebdb853c146f3475cc7 Author: Wolfgang Sourdeau Date: Mon Feb 13 15:09:06 2012 +0000 @@ -11851,6 +16329,22 @@ Date: Mon Feb 13 15:09:06 2012 +0000 M Tests/Unit/TestNSString+URLEscaping.m M UI/Templates/ContactsUI/UIxContactView.wox +commit 01149d98cb1282c28833b49ad6ed66b24177d0c7 +Merge: 9f4270b f93e9b5 +Author: Wolfgang Sourdeau +Date: Mon Feb 13 15:07:48 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 235258efee8273e9b6d2822d3d5da125520631c7) + to branch 'ca.inverse.sogo' (head 57b39725f8c002b9b6cb9b05ad3fa2e2401cd46b) + + Monotone-Parent: 235258efee8273e9b6d2822d3d5da125520631c7 + Monotone-Parent: 57b39725f8c002b9b6cb9b05ad3fa2e2401cd46b + Monotone-Revision: b84d2ade488d31149ffc7e1bd8b78b98c3331703 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-13T15:07:48 + Monotone-Branch: ca.inverse.sogo + commit f93e9b5b9d3bb147b01026a7c8874ac0bad09edf Author: Wolfgang Sourdeau Date: Mon Feb 13 14:50:00 2012 +0000 @@ -11880,6 +16374,22 @@ Date: Thu Feb 9 20:34:52 2012 +0000 M SoObjects/SOGo/NSString+Utilities.m M UI/WebServerResources/JavascriptAPIExtensions.js +commit d2efc90fca2871080df389bd7907fec65e2e99ba +Merge: 9f4270b 499c4d1 +Author: Francis Lachapelle +Date: Wed Feb 8 04:24:33 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 235258efee8273e9b6d2822d3d5da125520631c7) + to branch 'ca.inverse.sogo' (head b2bfdd5b59fed2950707131eca171b4758bcd635) + + Monotone-Parent: 235258efee8273e9b6d2822d3d5da125520631c7 + Monotone-Parent: b2bfdd5b59fed2950707131eca171b4758bcd635 + Monotone-Revision: f67fbb0139df60f0e98c0aede6b166d1a8b15d81 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-02-08T04:24:33 + Monotone-Branch: ca.inverse.sogo + commit 9f4270be399d6911552cc28b7858d2a6861d7f90 Author: Francis Lachapelle Date: Wed Feb 8 04:19:53 2012 +0000 @@ -12046,6 +16556,22 @@ Date: Tue Feb 7 14:24:46 2012 +0000 M NEWS +commit a79036fbf9b4c087b2e58beba6f986623c573e2d +Merge: b27f0de 1c77687 +Author: Francis Lachapelle +Date: Tue Feb 7 14:12:46 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 2b438d60e3231cf7f4811dadaf9a91a62885d15b) + to branch 'ca.inverse.sogo' (head 2a5d61f1ed60b9d00203fc41d7b5af818e00391f) + + Monotone-Parent: 2a5d61f1ed60b9d00203fc41d7b5af818e00391f + Monotone-Parent: 2b438d60e3231cf7f4811dadaf9a91a62885d15b + Monotone-Revision: 96f11391475b0d4e71002f19f89309839d039b36 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-02-07T14:12:46 + Monotone-Branch: ca.inverse.sogo + commit 1c77687067369a8eb10bf06f9dfd3ee88d51f00d Author: Francis Lachapelle Date: Tue Feb 7 14:00:04 2012 +0000 @@ -12408,6 +16934,22 @@ Date: Fri Feb 3 17:24:37 2012 +0000 M ChangeLog +commit 037711bd24da43db35b4542712c721e99e583dda +Merge: 3fbf557 4d4629e +Author: Wolfgang Sourdeau +Date: Fri Feb 3 17:24:10 2012 +0000 + + merge of '55d114b1af490a0c317169a03805f2c3a6873525' + and '8c5a9e9cc065204a82679aa77cc03ea009be7cfd' + + Monotone-Parent: 55d114b1af490a0c317169a03805f2c3a6873525 + Monotone-Parent: 8c5a9e9cc065204a82679aa77cc03ea009be7cfd + Monotone-Revision: 6e6ddde0b781ba8a6c4605edf730ec8e82cded23 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-03T17:24:10 + Monotone-Branch: ca.inverse.sogo + commit 4d4629e816858414a3f3e118760f905ba829a322 Author: Wolfgang Sourdeau Date: Fri Feb 3 17:23:56 2012 +0000 @@ -12449,6 +16991,22 @@ Date: Fri Feb 3 17:00:47 2012 +0000 M ChangeLog +commit b9266a4e53bba32068b0b2b2aacbe69fec313470 +Merge: b436b16 d065753 +Author: Francis Lachapelle +Date: Fri Feb 3 16:59:00 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 7d5711d36b09624f7b8bf3747c0b7c2d743b3d00) + to branch 'ca.inverse.sogo' (head 15b9d9900d3605d1920661f52678d25d93c587ef) + + Monotone-Parent: 15b9d9900d3605d1920661f52678d25d93c587ef + Monotone-Parent: 7d5711d36b09624f7b8bf3747c0b7c2d743b3d00 + Monotone-Revision: ac81d77fda86dad3ce300e48e20f65bd639b24cb + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-02-03T16:59:00 + Monotone-Branch: ca.inverse.sogo + commit d0657536196882e19985c854d12b4c0e784fc7c1 Author: Francis Lachapelle Date: Fri Feb 3 16:53:21 2012 +0000 @@ -12493,6 +17051,21 @@ Date: Fri Feb 3 16:00:44 2012 +0000 M SOPE/NGCards/ChangeLog M SOPE/NGCards/iCalDailyRecurrenceCalculator.m +commit 227bcbd57b46f81834760d5516e3538a2d1af9b4 +Merge: fa7b14d 120218b +Author: Francis Lachapelle +Date: Fri Feb 3 15:40:51 2012 +0000 + + merge of '2c1d66ae690f870d8322c7ae173e86f08455f25f' + and 'b71a73ffd81fa207977122c92575c810ad315108' + + Monotone-Parent: 2c1d66ae690f870d8322c7ae173e86f08455f25f + Monotone-Parent: b71a73ffd81fa207977122c92575c810ad315108 + Monotone-Revision: 41ae9527101a616e7849988930fe0399bf14919f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-02-03T15:40:51 + commit 120218b7f649f3fd5c74f66f7d97cad7558fafc4 Author: Francis Lachapelle Date: Fri Feb 3 15:40:36 2012 +0000 @@ -12505,6 +17078,22 @@ Date: Fri Feb 3 15:40:36 2012 +0000 M SoObjects/Appointments/SOGoAppointmentObject.m +commit b436b1641abd52b235af8e644f09f8fefb09c25b +Merge: f620cef f1a3bdd +Author: Wolfgang Sourdeau +Date: Fri Feb 3 15:06:37 2012 +0000 + + merge of '876471503a0b45122655ff11d2726d5413827ddb' + and 'fdb9e758160f3e3509c45bb379d9169a3eb0118a' + + Monotone-Parent: 876471503a0b45122655ff11d2726d5413827ddb + Monotone-Parent: fdb9e758160f3e3509c45bb379d9169a3eb0118a + Monotone-Revision: 15b9d9900d3605d1920661f52678d25d93c587ef + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-02-03T15:06:37 + Monotone-Branch: ca.inverse.sogo + commit f1a3bdd884004ef6262f02509de7650383dcd3b7 Author: Wolfgang Sourdeau Date: Fri Feb 3 15:05:55 2012 +0000 @@ -12616,6 +17205,21 @@ M ChangeLog M UI/MailerUI/UIxMailAccountActions.m M UI/MailerUI/UIxMailMainFrame.m +commit 28e64b2076025c22ce218328933653857d6cb225 +Merge: eceffe8 a9807c5 +Author: Francis Lachapelle +Date: Thu Feb 2 19:55:50 2012 +0000 + + merge of '1efb09bf023898a5a0088c9ba29ca00f1a304611' + and 'e44dbcb80563c6b1e0330f9be451c0793811c85f' + + Monotone-Parent: 1efb09bf023898a5a0088c9ba29ca00f1a304611 + Monotone-Parent: e44dbcb80563c6b1e0330f9be451c0793811c85f + Monotone-Revision: ab2ccda92b2df4cd7482934e46d69ed541d0ead8 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-02-02T19:55:50 + commit a9807c520ffa946e0b5702c65011d6358ca4c1ed Author: Francis Lachapelle Date: Thu Feb 2 19:54:53 2012 +0000 @@ -12632,6 +17236,22 @@ M UI/WebServerResources/UIxPreferences.css M UI/WebServerResources/UIxPreferences.js M UI/WebServerResources/generic.css +commit f620cef0d3b2a8d3c77e0db45b19a31862b55d0d +Merge: eceffe8 82b2bed +Author: Jean Raby +Date: Thu Feb 2 18:05:51 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 1efb09bf023898a5a0088c9ba29ca00f1a304611) + to branch 'ca.inverse.sogo' (head 638f19a902b772b34bc553dda4b8925b5d0639df) + + Monotone-Parent: 1efb09bf023898a5a0088c9ba29ca00f1a304611 + Monotone-Parent: 638f19a902b772b34bc553dda4b8925b5d0639df + Monotone-Revision: 876471503a0b45122655ff11d2726d5413827ddb + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-02-02T18:05:51 + Monotone-Branch: ca.inverse.sogo + commit eceffe862ea696094f966c9e37d04d285986bc77 Author: Jean Raby Date: Thu Feb 2 18:05:36 2012 +0000 @@ -12771,6 +17391,22 @@ Date: Thu Feb 2 01:38:50 2012 +0000 M ChangeLog M OpenChange/MAPIApplication.m +commit 3c4fd611d82a47f7d88fb2040b032ad6c776ccbc +Merge: 0f87c1e 0d00046 +Author: Francis Lachapelle +Date: Wed Feb 1 21:12:25 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 05f8b72feb6a6c81f20462457e2dbc6c47ae9edc) + to branch 'ca.inverse.sogo' (head dc4e3d958b052eb7529db6b61731e80df56ed412) + + Monotone-Parent: 05f8b72feb6a6c81f20462457e2dbc6c47ae9edc + Monotone-Parent: dc4e3d958b052eb7529db6b61731e80df56ed412 + Monotone-Revision: ba1ab7317c5e8c4b1e95d7e3f299bfd9ea38b10d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-02-01T21:12:25 + Monotone-Branch: ca.inverse.sogo + commit 0f87c1e6487cc5cbe0b13bc869bb634c222be6fc Author: Francis Lachapelle Date: Wed Feb 1 21:11:28 2012 +0000 @@ -12802,6 +17438,53 @@ M UI/WebServerResources/UIxContactsUserRightsEditor.js M UI/WebServerResources/UIxMailUserRightsEditor.css M UI/WebServerResources/UIxMailUserRightsEditor.js +commit 0d0004682361d858353237c6ac291163c62a7c64 +Merge: a0060fd af67e99 +Author: Ludovic Marcotte +Date: Wed Feb 1 12:06:02 2012 +0000 + + merge of '38034fab3edb528144b8d3e433e6e9bb5ff1a41c' + and 'b139a3df2315bd61a2f9fda08016ffdb761d0018' + + Monotone-Parent: 38034fab3edb528144b8d3e433e6e9bb5ff1a41c + Monotone-Parent: b139a3df2315bd61a2f9fda08016ffdb761d0018 + Monotone-Revision: dc4e3d958b052eb7529db6b61731e80df56ed412 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-02-01T12:06:02 + Monotone-Branch: ca.inverse.sogo + +commit 16edbd7024c90503b579fb8c9848e7719de4228e +Merge: 21b84c6 d49193f +Author: Francis Lachapelle +Date: Tue Jan 31 21:53:10 2012 +0000 + + merge of '6418d36640f538c1fb05b31bb43b1a778ad3c093' + and 'eae8192649cef1bdd72533a053dc0aef3baca4e7' + + Monotone-Parent: 6418d36640f538c1fb05b31bb43b1a778ad3c093 + Monotone-Parent: eae8192649cef1bdd72533a053dc0aef3baca4e7 + Monotone-Revision: d880f3f750251d35b56db7d720ccacbdeead7540 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-31T21:53:10 + +commit af67e998017c09b923dfaffca0babc8be350b921 +Merge: 21b84c6 ff5da80 +Author: Jean Raby +Date: Tue Jan 31 20:22:21 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 6418d36640f538c1fb05b31bb43b1a778ad3c093) + to branch 'ca.inverse.sogo' (head 87ae038b39b0598ccb505cbc8b555dcbfd4abbb8) + + Monotone-Parent: 6418d36640f538c1fb05b31bb43b1a778ad3c093 + Monotone-Parent: 87ae038b39b0598ccb505cbc8b555dcbfd4abbb8 + Monotone-Revision: b139a3df2315bd61a2f9fda08016ffdb761d0018 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-01-31T20:22:21 + Monotone-Branch: ca.inverse.sogo + commit 21b84c60a5dfb904c6623dc9c487c342b7db4e50 Author: Jean Raby Date: Tue Jan 31 20:22:10 2012 +0000 @@ -12901,6 +17584,22 @@ Date: Mon Jan 30 21:36:48 2012 +0000 M ChangeLog +commit 153d78a94414007cbdcd4b7311058c3bc75be159 +Merge: 3bb6a1b ff5da80 +Author: Wolfgang Sourdeau +Date: Mon Jan 30 21:36:32 2012 +0000 + + merge of '4012894fc79b7641cebac42647c13996d86e9eca' + and '87ae038b39b0598ccb505cbc8b555dcbfd4abbb8' + + Monotone-Parent: 4012894fc79b7641cebac42647c13996d86e9eca + Monotone-Parent: 87ae038b39b0598ccb505cbc8b555dcbfd4abbb8 + Monotone-Revision: c8d70dff99b3d65489f2eb27876957a819f70431 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-30T21:36:32 + Monotone-Branch: ca.inverse.sogo + commit 3bb6a1b975c8a1ca12ac26be0e5604198db21cb7 Author: Wolfgang Sourdeau Date: Mon Jan 30 20:47:07 2012 +0000 @@ -12945,6 +17644,38 @@ M ChangeLog M OpenChange/MAPIStoreUserContext.h M OpenChange/MAPIStoreUserContext.m +commit ef2485e56b0e0e3512126a909190deef8764b2f1 +Merge: fab8df2 054847d +Author: Wolfgang Sourdeau +Date: Mon Jan 30 20:13:26 2012 +0000 + + merge of '0f6736fbdcac680f48a921ca2664b95bc58943fa' + and '6b3a3195262782a0783af8640a0fb24dd1103387' + + Monotone-Parent: 0f6736fbdcac680f48a921ca2664b95bc58943fa + Monotone-Parent: 6b3a3195262782a0783af8640a0fb24dd1103387 + Monotone-Revision: 0a8c7dabf7593bb4006f867c16170e5c59ac875a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-30T20:13:26 + Monotone-Branch: ca.inverse.sogo + +commit ff5da80b7c59199b943d7337c2c5beb625f4a60d +Merge: fab8df2 ac5fce2 +Author: Francis Lachapelle +Date: Mon Jan 30 20:12:39 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 8036e636bb63c425915c350dea2d93a7021a1058) + to branch 'ca.inverse.sogo' (head 0f6736fbdcac680f48a921ca2664b95bc58943fa) + + Monotone-Parent: 0f6736fbdcac680f48a921ca2664b95bc58943fa + Monotone-Parent: 8036e636bb63c425915c350dea2d93a7021a1058 + Monotone-Revision: 87ae038b39b0598ccb505cbc8b555dcbfd4abbb8 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-30T20:12:39 + Monotone-Branch: ca.inverse.sogo + commit ac5fce2cda9267d6a26ae14cd35f2a848f5b0948 Author: Francis Lachapelle Date: Mon Jan 30 20:12:18 2012 +0000 @@ -12987,6 +17718,22 @@ M OpenChange/MAPIStoreContactsContext.m M OpenChange/MAPIStoreGCSBaseContext.m M OpenChange/MAPIStoreTasksContext.m +commit fab8df2d9389eff7d0206cdcb20e6b5a6d452074 +Merge: 1573291 9f8c705 +Author: Francis Lachapelle +Date: Mon Jan 30 20:01:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 4d8fb1ed0734fbcfd6dc4e68194b48101ac46567) + to branch 'ca.inverse.sogo' (head 18a9f2ed7229757c1bbe4882195c7c1a807365d8) + + Monotone-Parent: 18a9f2ed7229757c1bbe4882195c7c1a807365d8 + Monotone-Parent: 4d8fb1ed0734fbcfd6dc4e68194b48101ac46567 + Monotone-Revision: 0f6736fbdcac680f48a921ca2664b95bc58943fa + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-30T20:01:28 + Monotone-Branch: ca.inverse.sogo + commit 9f8c705eafeae4793d9785b014fa644edddef7ea Author: Francis Lachapelle Date: Mon Jan 30 19:59:05 2012 +0000 @@ -13026,6 +17773,21 @@ Date: Mon Jan 30 19:51:38 2012 +0000 M UI/WebServerResources/UIxPreferences.js +commit 7dcdc01a6e5421248aa68ef2b5a3fab3fa1b210d +Merge: 2948ef3 c3e1b58 +Author: Francis Lachapelle +Date: Mon Jan 30 19:44:20 2012 +0000 + + merge of 'b5720d1cdf1d7a97ffae696deda5507c61e52da1' + and 'd4d75da556a634766f5532f5398f2f94ef2ba8df' + + Monotone-Parent: b5720d1cdf1d7a97ffae696deda5507c61e52da1 + Monotone-Parent: d4d75da556a634766f5532f5398f2f94ef2ba8df + Monotone-Revision: bfece4528b81534d630f73e8a0253a500274486d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-30T19:44:20 + commit c3e1b585506e8bcdcbeb33dcb8b3abd2d2a3f44d Author: Francis Lachapelle Date: Mon Jan 30 19:43:55 2012 +0000 @@ -13052,6 +17814,22 @@ Date: Mon Jan 30 19:43:38 2012 +0000 M SoObjects/Appointments/SOGoCalendarComponent.m +commit 1573291b02dbd0ad9315fea7ee56429ea74eceab +Merge: 4b81cb1 2948ef3 +Author: Ludovic Marcotte +Date: Mon Jan 30 19:07:34 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head b5720d1cdf1d7a97ffae696deda5507c61e52da1) + to branch 'ca.inverse.sogo' (head 9235e5dc4d151a3cba8ad842ac39e1b2d18c8201) + + Monotone-Parent: 9235e5dc4d151a3cba8ad842ac39e1b2d18c8201 + Monotone-Parent: b5720d1cdf1d7a97ffae696deda5507c61e52da1 + Monotone-Revision: 18a9f2ed7229757c1bbe4882195c7c1a807365d8 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-30T19:07:34 + Monotone-Branch: ca.inverse.sogo + commit 2948ef366963fffd5810248f62763e5c01c17b71 Author: Ludovic Marcotte Date: Mon Jan 30 19:07:24 2012 +0000 @@ -13145,6 +17923,22 @@ Date: Sun Jan 29 19:41:50 2012 +0000 M ChangeLog +commit 58fbfea325e4c0033084676fc163001ed30e76d1 +Merge: 3ce82f7 fa298c8 +Author: Wolfgang Sourdeau +Date: Sun Jan 29 19:41:23 2012 +0000 + + merge of '6e52ef029c1ba3330e77bd6dcc994c86557f4533' + and 'f9a1466ff29e3870ab75ba13c8294afbb2c94f0c' + + Monotone-Parent: 6e52ef029c1ba3330e77bd6dcc994c86557f4533 + Monotone-Parent: f9a1466ff29e3870ab75ba13c8294afbb2c94f0c + Monotone-Revision: 91b83ade7a4eee6cb72c4f6f7e456706d0484cf0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-29T19:41:23 + Monotone-Branch: ca.inverse.sogo + commit 3ce82f744d247ab8c69c6381aa77526b8e01ba61 Author: Wolfgang Sourdeau Date: Sun Jan 29 19:40:44 2012 +0000 @@ -13160,6 +17954,22 @@ M OpenChange/GNUmakefile A OpenChange/MAPIStoreUserContext.h A OpenChange/MAPIStoreUserContext.m +commit fa298c8b0707ec720f3bd265b62fee2962f209fa +Merge: 9da91b0 e6806a7 +Author: Ludovic Marcotte +Date: Fri Jan 27 20:37:06 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 78e0e48d54b37e3da54b0ecca3eb1ed2dd1b41f7) + to branch 'ca.inverse.sogo' (head 8daffcffafece4be7e0553a181f9186e385e2b77) + + Monotone-Parent: 78e0e48d54b37e3da54b0ecca3eb1ed2dd1b41f7 + Monotone-Parent: 8daffcffafece4be7e0553a181f9186e385e2b77 + Monotone-Revision: f9a1466ff29e3870ab75ba13c8294afbb2c94f0c + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-27T20:37:06 + Monotone-Branch: ca.inverse.sogo + commit 9da91b055fd3232d3a7de995c65ed4a2c3983fce Author: Ludovic Marcotte Date: Fri Jan 27 20:37:00 2012 +0000 @@ -13189,6 +17999,38 @@ Date: Fri Jan 27 15:24:00 2012 +0000 M ChangeLog +commit 0ba25b4cd54be6eb98fa3c1a7335eb725ae996c2 +Merge: d43a252 87e3db5 +Author: Ludovic Marcotte +Date: Fri Jan 27 15:23:19 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 15c306f9d11152fee321b11e184bc75e9e2be6f8) + to branch 'ca.inverse.sogo' (head 0314a56a186d909c3c83333916d6b43946976a9f) + + Monotone-Parent: 0314a56a186d909c3c83333916d6b43946976a9f + Monotone-Parent: 15c306f9d11152fee321b11e184bc75e9e2be6f8 + Monotone-Revision: b1c3c4abdd41b8895de8a28a2a5fe6ce0af01caf + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-27T15:23:19 + Monotone-Branch: ca.inverse.sogo + +commit d43a2520315ef2180e1b212bad4494125ab8058f +Merge: 031d7b8 3f4197f +Author: Ludovic Marcotte +Date: Fri Jan 27 15:22:57 2012 +0000 + + merge of '402d2e80afd5b6d503eb69f531d01bada65a2a51' + and '881d0e4a9a9117f8671dd4758b691044c07a1247' + + Monotone-Parent: 402d2e80afd5b6d503eb69f531d01bada65a2a51 + Monotone-Parent: 881d0e4a9a9117f8671dd4758b691044c07a1247 + Monotone-Revision: 0314a56a186d909c3c83333916d6b43946976a9f + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-27T15:22:57 + Monotone-Branch: ca.inverse.sogo + commit 87e3db53911d202e2f36ac7402e56c794a092e4d Author: Ludovic Marcotte Date: Fri Jan 27 15:21:51 2012 +0000 @@ -13205,6 +18047,22 @@ M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m M SoObjects/Appointments/SOGoAppointmentFolderObject.m +commit 031d7b8c63b6874d6c185453cff8e82a8fac031d +Merge: 6fdf82f 671feec +Author: Ludovic Marcotte +Date: Fri Jan 27 13:48:19 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head ee188ecf014aadf3749779aa50df66d72a126c71) + to branch 'ca.inverse.sogo' (head 11580fb345165bd8e5c0aa63ea2a877918103825) + + Monotone-Parent: 11580fb345165bd8e5c0aa63ea2a877918103825 + Monotone-Parent: ee188ecf014aadf3749779aa50df66d72a126c71 + Monotone-Revision: 402d2e80afd5b6d503eb69f531d01bada65a2a51 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-27T13:48:19 + Monotone-Branch: ca.inverse.sogo + commit 671feec0b41b063bb07734823d75aade1f8bea2d Author: Ludovic Marcotte Date: Fri Jan 27 13:47:45 2012 +0000 @@ -13219,6 +18077,22 @@ Date: Fri Jan 27 13:47:45 2012 +0000 M UI/PreferencesUI/English.lproj/Localizable.strings +commit 6fdf82f0f82c1b68df1f35168ea2a433deae8fb5 +Merge: f5b8a68 d629811 +Author: Ludovic Marcotte +Date: Fri Jan 27 13:31:43 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 3e4e00b49a457f4533668ca39d8371e85202e49c) + to branch 'ca.inverse.sogo' (head 3dc6d9dff558dfb935fde8eee2c978d9a9d1a774) + + Monotone-Parent: 3dc6d9dff558dfb935fde8eee2c978d9a9d1a774 + Monotone-Parent: 3e4e00b49a457f4533668ca39d8371e85202e49c + Monotone-Revision: 11580fb345165bd8e5c0aa63ea2a877918103825 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-27T13:31:43 + Monotone-Branch: ca.inverse.sogo + commit d629811e4ec149f9895930f6a553f97607bd8db2 Author: Ludovic Marcotte Date: Fri Jan 27 13:31:37 2012 +0000 @@ -13330,6 +18204,22 @@ M OpenChange/MAPIStoreNotesContext.m M OpenChange/MAPIStoreSOGo.m M OpenChange/MAPIStoreTasksContext.m +commit f5b8a68af9b3d48ea8249f9d0c0a165b845043c9 +Merge: c4783b1 68b99f2 +Author: Ludovic Marcotte +Date: Thu Jan 26 18:20:04 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 6bee8aebb26a5d4337cc6ae5400d1573f789be82) + to branch 'ca.inverse.sogo' (head f2612a8cd144efc05fbd0847e973f12e72643c9b) + + Monotone-Parent: 6bee8aebb26a5d4337cc6ae5400d1573f789be82 + Monotone-Parent: f2612a8cd144efc05fbd0847e973f12e72643c9b + Monotone-Revision: 3dc6d9dff558dfb935fde8eee2c978d9a9d1a774 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-26T18:20:04 + Monotone-Branch: ca.inverse.sogo + commit c4783b14d0a7a9a8c9b414a40d090aab14b95340 Author: Ludovic Marcotte Date: Thu Jan 26 18:19:44 2012 +0000 @@ -13360,6 +18250,22 @@ Date: Thu Jan 26 16:27:18 2012 +0000 M SoObjects/SOGo/LDAPSource.m +commit 9ad7a6fa08d0ad5417b390fe25ab694375b07026 +Merge: 2d03fb1 128a055 +Author: Ludovic Marcotte +Date: Thu Jan 26 16:26:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 64559b055668abe30f492544f049160b05cf7ab9) + to branch 'ca.inverse.sogo' (head deed692cb3c352022ee720bc7f7b2d91e734367b) + + Monotone-Parent: 64559b055668abe30f492544f049160b05cf7ab9 + Monotone-Parent: deed692cb3c352022ee720bc7f7b2d91e734367b + Monotone-Revision: 24936b7a90184df1eebd3fa1c0df81c4dcbb2751 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-26T16:26:28 + Monotone-Branch: ca.inverse.sogo + commit 2d03fb105544d5d095fffd8200331276b433e6c2 Author: Ludovic Marcotte Date: Thu Jan 26 16:22:28 2012 +0000 @@ -13377,6 +18283,21 @@ M Documentation/SOGo Installation Guide.odt M SoObjects/SOGo/LDAPSource.h M SoObjects/SOGo/LDAPSource.m +commit aefadd691d51178110d3e2537c3ddedefa3c9a56 +Merge: 455cc7d 222f0fe +Author: Francis Lachapelle +Date: Thu Jan 26 14:48:18 2012 +0000 + + merge of '8e433a63a6503dd3c80bf9a1462fdf7fe56d4c09' + and 'f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c' + + Monotone-Parent: 8e433a63a6503dd3c80bf9a1462fdf7fe56d4c09 + Monotone-Parent: f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c + Monotone-Revision: 05f7c7299403692e01480ce30ae2a612e6172f84 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-26T14:48:18 + commit 455cc7d692a2f3cd3c1adf018122ab26f3149982 Author: Francis Lachapelle Date: Thu Jan 26 14:47:47 2012 +0000 @@ -13392,6 +18313,22 @@ Date: Thu Jan 26 14:47:47 2012 +0000 M UI/WebServerResources/UIxContactsUserFolders.js M UI/WebServerResources/dtree.css +commit 128a05501a58e49887a8a80871f2a7b6d96e277b +Merge: e792ff0 222f0fe +Author: Ludovic Marcotte +Date: Wed Jan 25 20:28:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c) + to branch 'ca.inverse.sogo' (head 57bf65070b9e7165596b27d1753f3eecf15f29f9) + + Monotone-Parent: 57bf65070b9e7165596b27d1753f3eecf15f29f9 + Monotone-Parent: f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c + Monotone-Revision: deed692cb3c352022ee720bc7f7b2d91e734367b + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-25T20:28:28 + Monotone-Branch: ca.inverse.sogo + commit 222f0fe21e072a70068f7e4ee31c73f36a8db6f6 Author: Ludovic Marcotte Date: Wed Jan 25 20:26:30 2012 +0000 @@ -13435,6 +18372,38 @@ Date: Tue Jan 24 05:53:55 2012 +0000 M UI/Scheduler/UIxCalListingActions.m +commit e792ff03dd3928113693881e8f51a3f576a985c6 +Merge: 31de344 f16cefa +Author: Jean Raby +Date: Fri Jan 20 18:50:16 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head ecc0c907192778ee08a07fb020aa037de83d7bed) + to branch 'ca.inverse.sogo' (head 8c454beced4065ab33a74905784cb670a0285959) + + Monotone-Parent: 8c454beced4065ab33a74905784cb670a0285959 + Monotone-Parent: ecc0c907192778ee08a07fb020aa037de83d7bed + Monotone-Revision: 57bf65070b9e7165596b27d1753f3eecf15f29f9 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-01-20T18:50:16 + Monotone-Branch: ca.inverse.sogo + +commit 31de3448c4042f907a8b70b47d0a97c0f38aebc9 +Merge: 7dc9e4b 11a22d5 +Author: Jean Raby +Date: Fri Jan 20 18:48:21 2012 +0000 + + 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 + commit f16cefad3190c5d26a912638a24ca832dd94e7e1 Author: Jean Raby Date: Fri Jan 20 18:43:29 2012 +0000 @@ -13450,6 +18419,22 @@ Date: Fri Jan 20 18:43:29 2012 +0000 A Scripts/sql-update-1.3.11_to_1.3.12-mysql.sh M Scripts/sql-update-1.3.11_to_1.3.12.sh +commit 11a22d590b6cf95d42f81b994f46e655e863ba93 +Merge: 29ce019 a02ed4b +Author: Wolfgang Sourdeau +Date: Fri Jan 20 16:44:09 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head e13dda2a639bb68b9e67d7b4dd75235d9d98ef1b) + to branch 'ca.inverse.sogo' (head f9d2bf55bd46e8957cdcb8f5fb95a1102244215f) + + Monotone-Parent: e13dda2a639bb68b9e67d7b4dd75235d9d98ef1b + Monotone-Parent: f9d2bf55bd46e8957cdcb8f5fb95a1102244215f + Monotone-Revision: f06b5c51d33b49e9e8e5c1bd337b720f3d1f28e0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-20T16:44:09 + Monotone-Branch: ca.inverse.sogo + commit 29ce01947ae71e461cb56949ebdd828e79bedf53 Author: Wolfgang Sourdeau Date: Fri Jan 20 16:43:48 2012 +0000 @@ -13491,6 +18476,22 @@ Date: Fri Jan 20 00:39:21 2012 +0000 M Documentation/SOGo Native Microsoft Outlook Configuration.odt +commit a02ed4b4a6f060ecf214aa4343a66eb19f0b4717 +Merge: 5c8f684 4ec198d +Author: Francis Lachapelle +Date: Thu Jan 19 22:08:27 2012 +0000 + + merge of '330348e97f6cabdaec8e12cd5622c44de762c086' + and 'ffd7393157c88a834c33d2ca30dc76ef3026c253' + + Monotone-Parent: 330348e97f6cabdaec8e12cd5622c44de762c086 + Monotone-Parent: ffd7393157c88a834c33d2ca30dc76ef3026c253 + Monotone-Revision: f9d2bf55bd46e8957cdcb8f5fb95a1102244215f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-19T22:08:27 + Monotone-Branch: ca.inverse.sogo + commit 4ec198dbd7a5940c20e80a9eaace66d27ff5c637 Author: Wolfgang Sourdeau Date: Fri Jan 20 01:36:31 2012 +0000 @@ -13504,6 +18505,38 @@ Date: Fri Jan 20 01:36:31 2012 +0000 M Tests/Integration/GNUmakefile.preamble +commit 5c8f684f68b80b40d4b276e744ba004d2fac23f4 +Merge: d4bdec2 3561895 +Author: Ludovic Marcotte +Date: Fri Jan 20 01:06:46 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 72afba9e20695bc88d32c0eb61dd396b9f67e013) + to branch 'ca.inverse.sogo' (head 7350e2dc1cd7b8d9ac3163e46a58367520a711b2) + + Monotone-Parent: 72afba9e20695bc88d32c0eb61dd396b9f67e013 + Monotone-Parent: 7350e2dc1cd7b8d9ac3163e46a58367520a711b2 + Monotone-Revision: 330348e97f6cabdaec8e12cd5622c44de762c086 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-20T01:06:46 + Monotone-Branch: ca.inverse.sogo + +commit 35618953d3a8da19c0737593f1be65ad245ab01a +Merge: b3fc0c1 9c5070d +Author: Ludovic Marcotte +Date: Fri Jan 20 00:42:28 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head e06508d0c983ab0f20c49852cea74409f575b9c0) + to branch 'ca.inverse.sogo' (head 1cafe7a57bb95258d6e78d2bc0a96b00fcdb0325) + + Monotone-Parent: 1cafe7a57bb95258d6e78d2bc0a96b00fcdb0325 + Monotone-Parent: e06508d0c983ab0f20c49852cea74409f575b9c0 + Monotone-Revision: 7350e2dc1cd7b8d9ac3163e46a58367520a711b2 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2012-01-20T00:42:28 + Monotone-Branch: ca.inverse.sogo + commit b620736a86166269d6f1a0eb99f6fc358d884270 Author: Francis Lachapelle Date: Thu Jan 19 21:47:42 2012 +0000 @@ -13519,6 +18552,22 @@ Date: Thu Jan 19 21:47:42 2012 +0000 M ChangeLog M UI/WebServerResources/UIxMailToSelection.js +commit 7dc9e4b9e6efd257364a46bbd5c02cbc80732146 +Merge: b3fc0c1 d417ac4 +Author: Jean Raby +Date: Wed Jan 18 21:13:10 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 391c1e195976b5875d916503b0d547cda96a8d27) + to branch 'ca.inverse.sogo' (head 1cafe7a57bb95258d6e78d2bc0a96b00fcdb0325) + + Monotone-Parent: 1cafe7a57bb95258d6e78d2bc0a96b00fcdb0325 + Monotone-Parent: 391c1e195976b5875d916503b0d547cda96a8d27 + Monotone-Revision: 83421e247100566d2b53cc3aabf6af4e829a9145 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-01-18T21:13:10 + Monotone-Branch: ca.inverse.sogo + commit d417ac4a1cee1d3719afb844743640e9c75f3fed Author: Jean Raby Date: Wed Jan 18 21:12:37 2012 +0000 @@ -13534,6 +18583,22 @@ Date: Wed Jan 18 21:12:37 2012 +0000 M debian/control M sogo.spec +commit b3fc0c148823dcc1bb52fbc0e126a4b361a62a8d +Merge: 7003b0d c8de67e +Author: Jean Raby +Date: Wed Jan 18 19:13:39 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head e9d0934cdcf296ed289800c9d1ac79e23c626dff) + to branch 'ca.inverse.sogo' (head 64af02cee8887fd3481d476d2c1a32bae0209e18) + + Monotone-Parent: 64af02cee8887fd3481d476d2c1a32bae0209e18 + Monotone-Parent: e9d0934cdcf296ed289800c9d1ac79e23c626dff + Monotone-Revision: 1cafe7a57bb95258d6e78d2bc0a96b00fcdb0325 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-01-18T19:13:39 + Monotone-Branch: ca.inverse.sogo + commit c8de67e1f44cc2e2ee442dfaee97bdf8bf70c45d Author: Jean Raby Date: Wed Jan 18 19:11:20 2012 +0000 @@ -13560,6 +18625,22 @@ Date: Wed Jan 18 16:16:11 2012 +0000 M debian/sogo.init +commit 7003b0d9a3f2fb223db2543cdb8ddd55cc464c6c +Merge: edf7715 8db30c1 +Author: Wolfgang Sourdeau +Date: Tue Jan 17 19:53:38 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head d7e3b62e2d085f5bc624b04dd91f11f866364b13) + to branch 'ca.inverse.sogo' (head b9e528a27e01ed03f230f04af5fbb3e72756f192) + + Monotone-Parent: b9e528a27e01ed03f230f04af5fbb3e72756f192 + Monotone-Parent: d7e3b62e2d085f5bc624b04dd91f11f866364b13 + Monotone-Revision: 64af02cee8887fd3481d476d2c1a32bae0209e18 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-17T19:53:38 + Monotone-Branch: ca.inverse.sogo + commit 8db30c1149f53787f68d8de1e3b1e0cb30594b67 Author: Wolfgang Sourdeau Date: Tue Jan 17 19:52:51 2012 +0000 @@ -13573,6 +18654,22 @@ Date: Tue Jan 17 19:52:51 2012 +0000 M ChangeLog M UI/WebServerResources/UIxFilterEditor.js +commit edf77158c8365978108ccf47189e3e1b3a219c14 +Merge: 1746d30 f554845 +Author: Wolfgang Sourdeau +Date: Mon Jan 16 20:19:10 2012 +0000 + + merge of '181c204ddec5a60db59ce4a63428f75cb20a7a81' + and '711719c8f61430104774de2c64f475461e66414d' + + Monotone-Parent: 181c204ddec5a60db59ce4a63428f75cb20a7a81 + Monotone-Parent: 711719c8f61430104774de2c64f475461e66414d + Monotone-Revision: b9e528a27e01ed03f230f04af5fbb3e72756f192 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-16T20:19:10 + Monotone-Branch: ca.inverse.sogo + commit 1746d307f339b8c82aed681d25958966871d6b55 Author: Wolfgang Sourdeau Date: Mon Jan 16 20:18:39 2012 +0000 @@ -13620,6 +18717,22 @@ Date: Sat Jan 14 18:46:52 2012 +0000 M ChangeLog M UI/WebServerResources/UIxPreferences.js +commit e451ed46b49d1d93587203e26792198874cdfa52 +Merge: 007cd57 537604d +Author: Francis Lachapelle +Date: Fri Jan 13 18:43:45 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 2dbc97722788e379c2eff9b155881604caafcc5a) + to branch 'ca.inverse.sogo' (head cd6f87a655862b556c2f1e1031a0cdd43a995041) + + Monotone-Parent: 2dbc97722788e379c2eff9b155881604caafcc5a + Monotone-Parent: cd6f87a655862b556c2f1e1031a0cdd43a995041 + Monotone-Revision: e3e0e252ab28dd87b80ca4f37b899dd9c416634b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-13T18:43:45 + Monotone-Branch: ca.inverse.sogo + commit 007cd578ec73b62fbc552b7516a8bc48614c23b4 Author: Francis Lachapelle Date: Fri Jan 13 18:43:29 2012 +0000 @@ -13680,6 +18793,22 @@ Date: Thu Jan 12 22:12:02 2012 +0000 M SoObjects/SOGo/LDAPSource.m +commit b26858fdc29a490831c94c39bf72d2f718a03b35 +Merge: 84909dd 56ad0c3 +Author: Francis Lachapelle +Date: Thu Jan 12 21:01:06 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head c241a8e1e716fa0db3e4f4e370c051096cc2c3e2) + to branch 'ca.inverse.sogo' (head d807738c8f35c5080fb2e1684404fb8d992c8032) + + Monotone-Parent: c241a8e1e716fa0db3e4f4e370c051096cc2c3e2 + Monotone-Parent: d807738c8f35c5080fb2e1684404fb8d992c8032 + Monotone-Revision: 62ee066ad239ea56d6f2dc0b73f12d399813d68c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-12T21:01:06 + Monotone-Branch: ca.inverse.sogo + commit 84909dd628dbd19554db6e3362c9e774194fa180 Author: Francis Lachapelle Date: Thu Jan 12 20:52:14 2012 +0000 @@ -13757,6 +18886,38 @@ M ChangeLog M OpenChange/MAPIStoreAppointmentWrapper.m M OpenChange/MAPIStoreCalendarMessage.m +commit a1cd165aa089908622d3fbf7c783219e00ad9d23 +Merge: 4c2762e 799be61 +Author: Wolfgang Sourdeau +Date: Thu Jan 12 14:58:20 2012 +0000 + + merge of '59576b63b875c6db3416e7be726b196610b856a3' + and 'cde43d75f3e5fde963846340d291c77e63d995f9' + + Monotone-Parent: 59576b63b875c6db3416e7be726b196610b856a3 + Monotone-Parent: cde43d75f3e5fde963846340d291c77e63d995f9 + Monotone-Revision: d0b2cce64733874b10da170e30bdcb9f9730f61e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-12T14:58:20 + Monotone-Branch: ca.inverse.sogo + +commit 799be616575dbbd91ea028fe0097170891d4a9b9 +Merge: 74a4c00 335ba60 +Author: Francis Lachapelle +Date: Thu Jan 12 13:56:30 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head ed15d4f340fd47347d881c8826eb40a2dc22763d) + to branch 'ca.inverse.sogo' (head c19f9b62fb1cd88301e4921d8d23bb5b5169fb45) + + Monotone-Parent: c19f9b62fb1cd88301e4921d8d23bb5b5169fb45 + Monotone-Parent: ed15d4f340fd47347d881c8826eb40a2dc22763d + Monotone-Revision: cde43d75f3e5fde963846340d291c77e63d995f9 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-12T13:56:30 + Monotone-Branch: ca.inverse.sogo + commit 335ba606b4deeebfc966b86215a96281b27d3b43 Author: Francis Lachapelle Date: Thu Jan 12 13:55:08 2012 +0000 @@ -13799,6 +18960,22 @@ Date: Thu Jan 12 03:45:04 2012 +0000 M ChangeLog M OpenChange/MAPIStoreGCSMessageTable.m +commit 124d237f2db9fcc8ec6a671e4c62974734308902 +Merge: 677c374 ca798c6 +Author: Wolfgang Sourdeau +Date: Thu Jan 12 03:42:17 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head aa2df14071d3f06710efeac3490e7780366f1b42) + to branch 'ca.inverse.sogo' (head 07cee513cf2aa27a1e3b8d634bb8482ad3645cdf) + + Monotone-Parent: 07cee513cf2aa27a1e3b8d634bb8482ad3645cdf + Monotone-Parent: aa2df14071d3f06710efeac3490e7780366f1b42 + Monotone-Revision: 401881ecc26daa2ed137a36540462655a8e4504c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-12T03:42:17 + Monotone-Branch: ca.inverse.sogo + commit ca798c646e23b8c36a25c3f698dc5ef915dc3c6c Author: Wolfgang Sourdeau Date: Thu Jan 12 03:42:00 2012 +0000 @@ -13812,6 +18989,37 @@ Date: Thu Jan 12 03:42:00 2012 +0000 M SOPE/NGCards/ChangeLog M SOPE/NGCards/NSString+NGCards.m +commit 677c374d56be99b1f15ab432513d33d8797f3bd2 +Merge: 85effb2 d5377f9 +Author: Wolfgang Sourdeau +Date: Tue Jan 10 17:43:18 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head d4b6685b33be650d23fc020ef3de5d203cb4557e) + to branch 'ca.inverse.sogo' (head 38edb6b526df653889b897cf6ff9643dfd3ffad2) + + Monotone-Parent: 38edb6b526df653889b897cf6ff9643dfd3ffad2 + Monotone-Parent: d4b6685b33be650d23fc020ef3de5d203cb4557e + Monotone-Revision: 07cee513cf2aa27a1e3b8d634bb8482ad3645cdf + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-10T17:43:18 + Monotone-Branch: ca.inverse.sogo + +commit d5377f90b5024acf4ef5d4ee6b0bd7f6485dab78 +Merge: 322b21c 0e1a6f4 +Author: Wolfgang Sourdeau +Date: Tue Jan 10 17:42:37 2012 +0000 + + merge of '134ea580b291c807ad6e5ffe49e8525c1539cbb2' + and '7d1b1b8ef84e818ba107d3af4dd79c52c376205a' + + Monotone-Parent: 134ea580b291c807ad6e5ffe49e8525c1539cbb2 + Monotone-Parent: 7d1b1b8ef84e818ba107d3af4dd79c52c376205a + Monotone-Revision: d4b6685b33be650d23fc020ef3de5d203cb4557e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-10T17:42:37 + commit 322b21c3d7c9cb2b5539e9614cab4228df97a511 Author: Wolfgang Sourdeau Date: Tue Jan 10 17:42:33 2012 +0000 @@ -13839,6 +19047,38 @@ Date: Tue Jan 10 17:35:01 2012 +0000 M ChangeLog M OpenChange/MAPIStoreMailFolder.m +commit 22c803dda4554ccd4c4b360ccb0eb745874a1419 +Merge: 6b5806d 0569c0e +Author: Wolfgang Sourdeau +Date: Tue Jan 10 17:33:30 2012 +0000 + + merge of '61d1836a0a9510a982d1e6754c642bc95932251c' + and 'ad2935dcd60331c29ad6e514b5a61fefaec7d69c' + + Monotone-Parent: 61d1836a0a9510a982d1e6754c642bc95932251c + Monotone-Parent: ad2935dcd60331c29ad6e514b5a61fefaec7d69c + Monotone-Revision: d9f13a2035f812bf584e6ed63e858a9373cd11c8 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-10T17:33:30 + Monotone-Branch: ca.inverse.sogo + +commit f55484537064c427a7b9e51ae944b2e4ca897421 +Merge: 6b5806d 0e1a6f4 +Author: Jean Raby +Date: Tue Jan 10 17:24:00 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 7d1b1b8ef84e818ba107d3af4dd79c52c376205a) + to branch 'ca.inverse.sogo' (head 61d1836a0a9510a982d1e6754c642bc95932251c) + + Monotone-Parent: 61d1836a0a9510a982d1e6754c642bc95932251c + Monotone-Parent: 7d1b1b8ef84e818ba107d3af4dd79c52c376205a + Monotone-Revision: 711719c8f61430104774de2c64f475461e66414d + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-01-10T17:24:00 + Monotone-Branch: ca.inverse.sogo + commit 0e1a6f4abd29fb86d922e550ec1700af7e473c80 Author: Jean Raby Date: Tue Jan 10 17:23:48 2012 +0000 @@ -13854,6 +19094,22 @@ Date: Tue Jan 10 17:23:48 2012 +0000 M Documentation/SOGo Installation Guide.odt M Scripts/sogo.cron +commit 6b5806dcdd3f81355b504de26957a7c6874408d6 +Merge: dbfb83d 31962a0 +Author: Jean Raby +Date: Tue Jan 10 17:04:47 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 29783e64b9a7d49e5e0be8ac1b56c15bb344190f) + to branch 'ca.inverse.sogo' (head b34c698acd51d633a7d276d6fbbcab8a47e7e460) + + Monotone-Parent: 29783e64b9a7d49e5e0be8ac1b56c15bb344190f + Monotone-Parent: b34c698acd51d633a7d276d6fbbcab8a47e7e460 + Monotone-Revision: 61d1836a0a9510a982d1e6754c642bc95932251c + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-01-10T17:04:47 + Monotone-Branch: ca.inverse.sogo + commit dbfb83d24eaccc4a7956ab4a5b3d1eac8fc29316 Author: Jean Raby Date: Tue Jan 10 17:03:48 2012 +0000 @@ -13934,6 +19190,22 @@ Date: Mon Jan 9 16:41:22 2012 +0000 M OpenChange/MAPIStoreCalendarFolder.m M OpenChange/MAPIStoreMailFolder.m +commit 5468b9b1a2d01703b66d4604dae5f2e383a969bd +Merge: 13d6240 be34aee +Author: Wolfgang Sourdeau +Date: Mon Jan 9 16:38:18 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head f5ba6db440f5a8ba817af65dea12b4a616fdfe71) + to branch 'ca.inverse.sogo' (head df5dd81d62db331ba5c8de9f2257f9430c586534) + + Monotone-Parent: df5dd81d62db331ba5c8de9f2257f9430c586534 + Monotone-Parent: f5ba6db440f5a8ba817af65dea12b4a616fdfe71 + Monotone-Revision: 31373520d86c320c1658f22e3bde2eee178c2003 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-09T16:38:18 + Monotone-Branch: ca.inverse.sogo + commit be34aeee0e393ac774826f5199b754b38da71834 Author: Wolfgang Sourdeau Date: Mon Jan 9 16:36:51 2012 +0000 @@ -13947,6 +19219,22 @@ Date: Mon Jan 9 16:36:51 2012 +0000 M SOPE/NGCards/ChangeLog M SOPE/NGCards/NSString+NGCards.m +commit 13d6240038cfb88a150d5f61f4339f72f2d0b1f7 +Merge: a55fe27 353757f +Author: Wolfgang Sourdeau +Date: Fri Jan 6 14:36:47 2012 +0000 + + merge of '0def0e9f316e25be6056fa81895ad9297459eaca' + and 'c82bd90e75ed49d6ff6bdcbb89b1abd0e37397fe' + + Monotone-Parent: 0def0e9f316e25be6056fa81895ad9297459eaca + Monotone-Parent: c82bd90e75ed49d6ff6bdcbb89b1abd0e37397fe + Monotone-Revision: df5dd81d62db331ba5c8de9f2257f9430c586534 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-06T14:36:47 + Monotone-Branch: ca.inverse.sogo + commit a55fe2793c16285a01abd27116b8b70b7db9d022 Author: Wolfgang Sourdeau Date: Fri Jan 6 14:35:55 2012 +0000 @@ -13993,6 +19281,22 @@ Date: Thu Jan 5 15:03:05 2012 +0000 M ChangeLog M SoObjects/SOGo/SOGoUserManager.m +commit bedee82eaf7b0509b1be6e5f32606de9af477e78 +Merge: 831771c 15e6063 +Author: Wolfgang Sourdeau +Date: Wed Jan 4 15:27:58 2012 +0000 + + merge of '61b0fdce16f6c0727e58cc97232171b41008ed41' + and 'bb276eea8dc76b5c71f49df1d23424ab19015233' + + Monotone-Parent: 61b0fdce16f6c0727e58cc97232171b41008ed41 + Monotone-Parent: bb276eea8dc76b5c71f49df1d23424ab19015233 + Monotone-Revision: f70b5b1e5f982c1feda21a5227e3bc26f8dc7f66 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2012-01-04T15:27:58 + Monotone-Branch: ca.inverse.sogo + commit 15e606341e7c8b086bde8bdf5831082ec3135b84 Author: Wolfgang Sourdeau Date: Wed Jan 4 15:26:30 2012 +0000 @@ -14085,6 +19389,21 @@ M SoObjects/Appointments/SOGoAptMailNotification.m M SoObjects/Appointments/SOGoAptMailReceipt.m M SoObjects/Appointments/SOGoAptMailUpdate.m +commit 3579c514a8dded7ae94c7163e7111be91ae9f45d +Merge: 51cd566 67dc174 +Author: Francis Lachapelle +Date: Tue Jan 3 21:45:31 2012 +0000 + + merge of '379924109229c07d133fc063329a33e5f0dc987d' + and 'b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0' + + Monotone-Parent: 379924109229c07d133fc063329a33e5f0dc987d + Monotone-Parent: b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0 + Monotone-Revision: e3a548e4955e0964c4a0211759ff98c585efda44 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2012-01-03T21:45:31 + commit 51cd566744027733f2ffcf862d73b36aed00a10d Author: Francis Lachapelle Date: Tue Jan 3 21:42:23 2012 +0000 @@ -14112,6 +19431,37 @@ Date: Tue Jan 3 21:11:31 2012 +0000 M ChangeLog +commit 444a208f86d8c408a9b36506a434c7369e8db302 +Merge: 67dc174 ad7259b +Author: Jean Raby +Date: Tue Jan 3 21:08:29 2012 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0) + to branch 'ca.inverse.sogo' (head f2f2f66b3df579ca384e578aded6976b6634ffcb) + + Monotone-Parent: b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0 + Monotone-Parent: f2f2f66b3df579ca384e578aded6976b6634ffcb + Monotone-Revision: 71d893c6f56295ecb4a106a46e10ccc403627cc4 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-01-03T21:08:29 + Monotone-Branch: ca.inverse.sogo + +commit 67dc174db81aca956194813c7f3f847d974eef1c +Merge: 13cfabb cbe9d53 +Author: Jean Raby +Date: Tue Jan 3 20:53:39 2012 +0000 + + merge of '36b1155b71ef197756bd93ba282a5a89126511e7' + and '76bba460617a7f4d7ee1f66a47e8918059e6f046' + + Monotone-Parent: 36b1155b71ef197756bd93ba282a5a89126511e7 + Monotone-Parent: 76bba460617a7f4d7ee1f66a47e8918059e6f046 + Monotone-Revision: b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0 + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2012-01-03T20:53:39 + commit 13cfabbfa68c3e0ef4d28e46d6805bfa49e3cefe Author: Jean Raby Date: Tue Jan 3 20:42:34 2012 +0000 @@ -14204,6 +19554,22 @@ M ChangeLog A SoObjects/SOGo/LDAPSourceSchema.h A SoObjects/SOGo/LDAPSourceSchema.m +commit 7ea37d7cf961d4a9c30c9ec9a30fd03d4ee2d34e +Merge: 3bd05c5 4ba4c62 +Author: Wolfgang Sourdeau +Date: Fri Dec 30 20:40:05 2011 +0000 + + merge of '25877fc1df88b6744ec26e868946fc19cfd28cb8' + and '61fe02b6c3bc4f0aa3797d661d014d8c256b0de9' + + Monotone-Parent: 25877fc1df88b6744ec26e868946fc19cfd28cb8 + Monotone-Parent: 61fe02b6c3bc4f0aa3797d661d014d8c256b0de9 + Monotone-Revision: d8a02a76c20d760d00a46a0e98b6ca134a05cbc7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-30T20:40:05 + Monotone-Branch: ca.inverse.sogo + commit 4ba4c622bc4ea0a8b0ad3e136862e6b407ab56a1 Author: Wolfgang Sourdeau Date: Fri Dec 30 20:39:07 2011 +0000 @@ -14337,6 +19703,22 @@ Date: Fri Dec 30 19:32:02 2011 +0000 M Tools/GNUmakefile +commit 3bd05c5c6291761692524d91d39c46ec87cf8995 +Merge: fd3d125 b98c309 +Author: Ludovic Marcotte +Date: Fri Dec 30 16:59:19 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 2c40f25dddacc34d66befa0a7c8e6c93868a9a92) + to branch 'ca.inverse.sogo' (head ed89880eae2839f1f4714817c94287a44216b46f) + + Monotone-Parent: 2c40f25dddacc34d66befa0a7c8e6c93868a9a92 + Monotone-Parent: ed89880eae2839f1f4714817c94287a44216b46f + Monotone-Revision: 25877fc1df88b6744ec26e868946fc19cfd28cb8 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-12-30T16:59:19 + Monotone-Branch: ca.inverse.sogo + commit fd3d125d20cf4c677ccec62d89271d84040c4c1f Author: Ludovic Marcotte Date: Fri Dec 30 16:59:13 2011 +0000 @@ -14354,6 +19736,22 @@ M OGoContentStore/appointment.ocs M OGoContentStore/contact.ocs M SOPE/GDLContentStore/GCSSpecialQueries.m +commit b98c3094538de12d8d69377df74f9ac85b5ef536 +Merge: 481de5d b195bb4 +Author: Ludovic Marcotte +Date: Fri Dec 30 13:38:23 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 5e690b49423932996ff78f8ea2c1881306f09fa3) + to branch 'ca.inverse.sogo' (head 9582cd981c9aaa5c838be5f369c02ac3de3a914a) + + Monotone-Parent: 5e690b49423932996ff78f8ea2c1881306f09fa3 + Monotone-Parent: 9582cd981c9aaa5c838be5f369c02ac3de3a914a + Monotone-Revision: ed89880eae2839f1f4714817c94287a44216b46f + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-12-30T13:38:23 + Monotone-Branch: ca.inverse.sogo + commit 481de5d6541be48376b14830ef4a20306336b465 Author: Ludovic Marcotte Date: Fri Dec 30 13:38:17 2011 +0000 @@ -14368,6 +19766,22 @@ Date: Fri Dec 30 13:38:17 2011 +0000 M SoObjects/SOGo/SQLSource.m +commit b195bb4f5d2b7a0eceaa8349a4a791290af294f2 +Merge: 4d6400d d557432 +Author: Ludovic Marcotte +Date: Fri Dec 30 12:29:43 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 0b1c93d1d141650c6567513a3f7a175ca4d27623) + to branch 'ca.inverse.sogo' (head ef3b7b820476c95b81d85daf664d6dafb9bac144) + + Monotone-Parent: 0b1c93d1d141650c6567513a3f7a175ca4d27623 + Monotone-Parent: ef3b7b820476c95b81d85daf664d6dafb9bac144 + Monotone-Revision: 9582cd981c9aaa5c838be5f369c02ac3de3a914a + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-12-30T12:29:43 + Monotone-Branch: ca.inverse.sogo + commit 4d6400d6f71dacc29687ffd881eade68c41bedc6 Author: Ludovic Marcotte Date: Fri Dec 30 12:29:18 2011 +0000 @@ -14383,6 +19797,22 @@ Date: Fri Dec 30 12:29:18 2011 +0000 M UI/MainUI/NorwegianBokmal.lproj/Locale M UI/MainUI/NorwegianNynorsk.lproj/Locale +commit d557432766ed34e53d4b48e0adc6b6a0bf968fcd +Merge: 50e107f 961de2a +Author: Ludovic Marcotte +Date: Fri Dec 30 12:21:05 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 57c10d31c6098096fecd1a8325950d007a357271) + to branch 'ca.inverse.sogo' (head b4e03e63565eb6e8c043c7047716bde04729f417) + + Monotone-Parent: 57c10d31c6098096fecd1a8325950d007a357271 + Monotone-Parent: b4e03e63565eb6e8c043c7047716bde04729f417 + Monotone-Revision: ef3b7b820476c95b81d85daf664d6dafb9bac144 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-12-30T12:21:05 + Monotone-Branch: ca.inverse.sogo + commit 50e107f1cac33eb08a85017a7caa7effb7b9b454 Author: Ludovic Marcotte Date: Fri Dec 30 12:20:57 2011 +0000 @@ -14398,6 +19828,22 @@ Date: Fri Dec 30 12:20:57 2011 +0000 M NEWS M SoObjects/SOGo/SOGoCache.m +commit 961de2a6c0bde52ca311f36e67268e12cb689096 +Merge: 516dcdb e15c234 +Author: Ludovic Marcotte +Date: Thu Dec 29 17:50:58 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 3c7106a946b0d9786d46c4f0c0a7e5bc1e5f8684) + to branch 'ca.inverse.sogo' (head f8e03957efcb10a5fb933549ff0f13db2842bece) + + Monotone-Parent: 3c7106a946b0d9786d46c4f0c0a7e5bc1e5f8684 + Monotone-Parent: f8e03957efcb10a5fb933549ff0f13db2842bece + Monotone-Revision: b4e03e63565eb6e8c043c7047716bde04729f417 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-12-29T17:50:58 + Monotone-Branch: ca.inverse.sogo + commit 516dcdb2559dfbef1c536a329e0e4375fbb93089 Author: Ludovic Marcotte Date: Thu Dec 29 17:50:48 2011 +0000 @@ -14420,6 +19866,22 @@ M UI/MailerUI/UIxMailMainFrame.m M UI/Templates/MailerUI/UIxMailMainFrame.wox M UI/WebServerResources/MailerUI.js +commit e15c234e428cb94c3e55dea97fd3455359919c66 +Merge: dcc991c 5799804 +Author: Ludovic Marcotte +Date: Thu Dec 29 12:24:53 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head a4f6c377a41454eb21ed5b253cb7d07fc2c1a55e) + to branch 'ca.inverse.sogo' (head 441881b5757d734efa6d8072844aa767ef1709e2) + + Monotone-Parent: 441881b5757d734efa6d8072844aa767ef1709e2 + Monotone-Parent: a4f6c377a41454eb21ed5b253cb7d07fc2c1a55e + Monotone-Revision: f8e03957efcb10a5fb933549ff0f13db2842bece + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-12-29T12:24:53 + Monotone-Branch: ca.inverse.sogo + commit 5799804274c178c846f50c2aa8f405feeac26ec3 Author: Ludovic Marcotte Date: Thu Dec 29 12:24:43 2011 +0000 @@ -14701,6 +20163,21 @@ D UI/Templates/SOGoFolderDanishDenmarkAdditionAdvisory.wox D UI/Templates/SOGoFolderDanishDenmarkRemovalAdvisory.wox A UI/Templates/SOGoFolderDanishRemovalAdvisory.wox +commit 90a5c9ee21a67f7c05f05ffbeec6c48e86f098e2 +Merge: 0a69733 50e522d +Author: Francis Lachapelle +Date: Sun Dec 18 01:59:14 2011 +0000 + + merge of '62e33503bd06b9731084aa5fc492080cd0b5dcd4' + and '8869aacc55c49a49f77e9f056912a8ff12222283' + + Monotone-Parent: 62e33503bd06b9731084aa5fc492080cd0b5dcd4 + Monotone-Parent: 8869aacc55c49a49f77e9f056912a8ff12222283 + Monotone-Revision: ab0d6aa948262973d1cb1c1b5c2028965a306451 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-12-18T01:59:14 + commit 0a69733c6279a50d674f923c89c2f88c972b9883 Author: Francis Lachapelle Date: Sun Dec 18 01:54:38 2011 +0000 @@ -14713,6 +20190,22 @@ Date: Sun Dec 18 01:54:38 2011 +0000 M UI/MailerUI/English.lproj/Localizable.strings +commit e20065465bd962c551291129b6e108bd5c46a34f +Merge: 81f3350 50e522d +Author: Ludovic Marcotte +Date: Thu Dec 15 19:45:00 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_12' (head 8869aacc55c49a49f77e9f056912a8ff12222283) + to branch 'ca.inverse.sogo' (head 46c94a711dad0272d530ac34edf0d0a9918b7510) + + Monotone-Parent: 46c94a711dad0272d530ac34edf0d0a9918b7510 + Monotone-Parent: 8869aacc55c49a49f77e9f056912a8ff12222283 + Monotone-Revision: 9f17d2137546528e36f23d8a37a6bbdb69bc3a3f + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-12-15T19:45:00 + Monotone-Branch: ca.inverse.sogo + commit 50e522dfdc3e6289d612013c2f22f3e311cd05e9 Author: Ludovic Marcotte Date: Thu Dec 15 19:44:12 2011 +0000 @@ -14806,6 +20299,22 @@ Date: Tue Dec 13 20:57:17 2011 +0000 M Version +commit 8684783f5208b1cf2421ebcaa4ef28c67c6bdf2f +Merge: 4167e3c de5a5b7 +Author: Francis Lachapelle +Date: Mon Dec 12 20:29:33 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head 9fbe0432fec0c87f118dd55eb0e70029389d2787) + to branch 'ca.inverse.sogo' (head ee7e90f1330d408f103d33ccc17c37695163679c) + + Monotone-Parent: 9fbe0432fec0c87f118dd55eb0e70029389d2787 + Monotone-Parent: ee7e90f1330d408f103d33ccc17c37695163679c + Monotone-Revision: bd0348a425f6da021c2112f826cdf74f28b386b9 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-12-12T20:29:33 + Monotone-Branch: ca.inverse.sogo + commit 4167e3c45d964b7574166dda7987e8f39b914db4 Author: Francis Lachapelle Date: Mon Dec 12 20:22:55 2011 +0000 @@ -14860,6 +20369,22 @@ M Documentation/SOGo Installation Guide.odt M Documentation/SOGo Mobile Devices Configuration.odt M Documentation/SOGo Mozilla Thunderbird Configuration.odt +commit de5a5b7f0abb3c8fa9e0c780d53dbf563d24bcc1 +Merge: 68d84ea de961aa +Author: Wolfgang Sourdeau +Date: Mon Dec 12 17:24:28 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head 33a6acd0b9cf83c40083b83b53daf3d23ec7025e) + to branch 'ca.inverse.sogo' (head d263fe7caa9864fdf83b4c9e6c0acbdaa033ab62) + + Monotone-Parent: 33a6acd0b9cf83c40083b83b53daf3d23ec7025e + Monotone-Parent: d263fe7caa9864fdf83b4c9e6c0acbdaa033ab62 + Monotone-Revision: ee7e90f1330d408f103d33ccc17c37695163679c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-12T17:24:28 + Monotone-Branch: ca.inverse.sogo + commit 68d84eaa23db01103cf242de3356e7984490cbbc Author: Wolfgang Sourdeau Date: Mon Dec 12 17:24:12 2011 +0000 @@ -14935,6 +20460,22 @@ Date: Mon Dec 12 14:40:10 2011 +0000 M UI/MailerUI/Toolbars/SOGoDraftObject.toolbar M UI/MailerUI/Toolbars/SOGoMailObject.toolbar +commit de961aa009a77bd3aebeb891b9b33ac556e08d70 +Merge: 59a0198 ea782ff +Author: Wolfgang Sourdeau +Date: Fri Dec 9 21:04:56 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head 479f9e8a751025c1d9ce8f8818e1257e66ac7642) + to branch 'ca.inverse.sogo' (head 5c2e6a64d8a42480b9e72830e52a8321f3f27ea1) + + Monotone-Parent: 479f9e8a751025c1d9ce8f8818e1257e66ac7642 + Monotone-Parent: 5c2e6a64d8a42480b9e72830e52a8321f3f27ea1 + Monotone-Revision: d263fe7caa9864fdf83b4c9e6c0acbdaa033ab62 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-09T21:04:56 + Monotone-Branch: ca.inverse.sogo + commit 59a0198e600489d994c5d2bc5dc5296818f95c40 Author: Wolfgang Sourdeau Date: Fri Dec 9 21:04:45 2011 +0000 @@ -14947,6 +20488,22 @@ Date: Fri Dec 9 21:04:45 2011 +0000 M UI/WebServerResources/iefixes.css +commit ea782ffe9bf19275507091561503a8d6e6792cec +Merge: 95e42d3 f0ced36 +Author: Francis Lachapelle +Date: Fri Dec 9 17:14:31 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head 533c5fea139373885b136bf6d41275a80a56967b) + to branch 'ca.inverse.sogo' (head 9850237da78a7c61ca9647d852a8027ec6d8b273) + + Monotone-Parent: 533c5fea139373885b136bf6d41275a80a56967b + Monotone-Parent: 9850237da78a7c61ca9647d852a8027ec6d8b273 + Monotone-Revision: 5c2e6a64d8a42480b9e72830e52a8321f3f27ea1 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-12-09T17:14:31 + Monotone-Branch: ca.inverse.sogo + commit 95e42d38f754dc701de20a9c300dc9b0d34c6b9b Author: Francis Lachapelle Date: Fri Dec 9 16:34:11 2011 +0000 @@ -14979,6 +20536,22 @@ Date: Fri Dec 9 16:33:43 2011 +0000 M ChangeLog M UI/MainUI/SOGoRootPage.m +commit f0ced36ca2d4a033e070bc36a4cc0f044a858493 +Merge: 50ae9cd bb5cf04 +Author: Wolfgang Sourdeau +Date: Fri Dec 9 16:01:36 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head 8c58bbcc380816930dac5d8da2d1d682049a6349) + to branch 'ca.inverse.sogo' (head 82d10e9354b60ee49f531a6cb8861982f714498c) + + Monotone-Parent: 82d10e9354b60ee49f531a6cb8861982f714498c + Monotone-Parent: 8c58bbcc380816930dac5d8da2d1d682049a6349 + Monotone-Revision: 9850237da78a7c61ca9647d852a8027ec6d8b273 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-09T16:01:36 + Monotone-Branch: ca.inverse.sogo + commit bb5cf04e7e502fce0a7b4e35a9a8d29c5bd2020a Author: Wolfgang Sourdeau Date: Fri Dec 9 14:54:00 2011 +0000 @@ -15056,6 +20629,22 @@ Date: Fri Dec 9 14:47:39 2011 +0000 M ChangeLog M UI/WebServerResources/generic.js +commit 50ae9cddfaa17a6dcebe9fb0bae1e0ae4ac6902f +Merge: 86c4de2 2dd37a5 +Author: Wolfgang Sourdeau +Date: Fri Dec 9 02:00:02 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head 18957933ff736ec180d169de7fd49cb3822d876b) + to branch 'ca.inverse.sogo' (head 706eb04192b3639905eba9bfb1e2433cacc45280) + + Monotone-Parent: 18957933ff736ec180d169de7fd49cb3822d876b + Monotone-Parent: 706eb04192b3639905eba9bfb1e2433cacc45280 + Monotone-Revision: 82d10e9354b60ee49f531a6cb8861982f714498c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-09T02:00:02 + Monotone-Branch: ca.inverse.sogo + commit 86c4de27d8c54a5fad2f9061c0fceb1d8d4e5051 Author: Francis Lachapelle Date: Thu Dec 8 22:53:07 2011 +0000 @@ -15149,6 +20738,37 @@ Date: Thu Dec 8 19:08:23 2011 +0000 M UI/MainUI/NorwegianBokmal.lproj/Locale M UI/MainUI/NorwegianNynorsk.lproj/Locale +commit 663028cb9d2861334cd403f57215e6fc645d3f29 +Merge: bc171e9 bbd40c4 +Author: Wolfgang Sourdeau +Date: Thu Dec 8 15:05:45 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head fd3f07ba5f4f69cd1854b37655cacacbbf850787) + to branch 'ca.inverse.sogo' (head 8a3245a182ef9dff851cee5ace6db39fa33a3b6c) + + Monotone-Parent: 8a3245a182ef9dff851cee5ace6db39fa33a3b6c + Monotone-Parent: fd3f07ba5f4f69cd1854b37655cacacbbf850787 + Monotone-Revision: 120ae771577fbc85a9d527667354ae451deab5eb + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-08T15:05:45 + Monotone-Branch: ca.inverse.sogo + +commit bbd40c49dfd890c679b9d06ec72eeed50349fcc1 +Merge: 51d7c14 5758f1d +Author: Wolfgang Sourdeau +Date: Thu Dec 8 15:03:18 2011 +0000 + + merge of '0e0730fe59a4d574138454dc943c443900fe67b6' + and '3c7a201fa0fd3707b904e5173f62765c592e904b' + + Monotone-Parent: 0e0730fe59a4d574138454dc943c443900fe67b6 + Monotone-Parent: 3c7a201fa0fd3707b904e5173f62765c592e904b + Monotone-Revision: fd3f07ba5f4f69cd1854b37655cacacbbf850787 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-08T15:03:18 + commit 5758f1d848067d61ec1e9c1ba81269c687bb38f5 Author: Wolfgang Sourdeau Date: Thu Dec 8 15:03:09 2011 +0000 @@ -15163,6 +20783,22 @@ M SOPE/GDLContentStore/ChangeLog M SOPE/GDLContentStore/GCSFolder.m M SOPE/GDLContentStore/GCSFolderManager.m +commit bc171e93cdfc217a60a1875052b69b919b8e41b9 +Merge: 2446b6f bb13005 +Author: Wolfgang Sourdeau +Date: Wed Dec 7 16:14:28 2011 +0000 + + merge of 'f584567c8afbbff241518e2921242b309817109e' + and 'f5a1afa00cd2252fc46729f5c1ce5772b833cfb6' + + Monotone-Parent: f584567c8afbbff241518e2921242b309817109e + Monotone-Parent: f5a1afa00cd2252fc46729f5c1ce5772b833cfb6 + Monotone-Revision: 8a3245a182ef9dff851cee5ace6db39fa33a3b6c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-07T16:14:28 + Monotone-Branch: ca.inverse.sogo + commit 2446b6f9fe4bb7de2771d5c0097702faca8aa8c2 Author: Wolfgang Sourdeau Date: Wed Dec 7 16:14:03 2011 +0000 @@ -15189,6 +20825,22 @@ Date: Wed Dec 7 16:13:52 2011 +0000 M OpenChange/GNUmakefile +commit bb13005f52bc1f4cf0bd7a862c3557ffe75d16b5 +Merge: 51d7c14 ac7e0f1 +Author: Francis Lachapelle +Date: Tue Dec 6 23:51:45 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head 0e0730fe59a4d574138454dc943c443900fe67b6) + to branch 'ca.inverse.sogo' (head 2f66e7e50e9a88d5279a512e70f1bd7c6c5c6531) + + Monotone-Parent: 0e0730fe59a4d574138454dc943c443900fe67b6 + Monotone-Parent: 2f66e7e50e9a88d5279a512e70f1bd7c6c5c6531 + Monotone-Revision: f5a1afa00cd2252fc46729f5c1ce5772b833cfb6 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-12-06T23:51:45 + Monotone-Branch: ca.inverse.sogo + commit 51d7c146fbd447a25a050d5e1c32b9fb793defac Author: Francis Lachapelle Date: Tue Dec 6 19:28:44 2011 +0000 @@ -15205,6 +20857,22 @@ M ChangeLog M UI/WebServerResources/ContactsUI.js M UI/WebServerResources/HTMLElement.js +commit ac7e0f1da353cff43722efa432794597a4b07cef +Merge: 2a575c3 e05939e +Author: Wolfgang Sourdeau +Date: Tue Dec 6 17:38:57 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head 9c4be3d7d32f456638c073296f3c3b84ca2f6ea9) + to branch 'ca.inverse.sogo' (head 83063c0c69ff54ec2fbc43e2dd50c1c6a80bcf1a) + + Monotone-Parent: 83063c0c69ff54ec2fbc43e2dd50c1c6a80bcf1a + Monotone-Parent: 9c4be3d7d32f456638c073296f3c3b84ca2f6ea9 + Monotone-Revision: 2f66e7e50e9a88d5279a512e70f1bd7c6c5c6531 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-06T17:38:57 + Monotone-Branch: ca.inverse.sogo + commit e05939e8a04c7d547c5430c01d15acf4d73d8b2a Author: Wolfgang Sourdeau Date: Tue Dec 6 17:38:40 2011 +0000 @@ -15218,6 +20886,37 @@ Date: Tue Dec 6 17:38:40 2011 +0000 M ChangeLog M SoObjects/Appointments/iCalEvent+SOGo.m +commit 2a575c3b4947b8d506995d468ef5ba7e9af6c4ac +Merge: 15a67ab 071db38 +Author: Wolfgang Sourdeau +Date: Tue Dec 6 16:05:10 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head f1a929eda62ac5fe22596efe98c5a812783f90c5) + to branch 'ca.inverse.sogo' (head ac5c5df6110e5b3eeddb58ae28a4da10b7e43c94) + + Monotone-Parent: ac5c5df6110e5b3eeddb58ae28a4da10b7e43c94 + Monotone-Parent: f1a929eda62ac5fe22596efe98c5a812783f90c5 + Monotone-Revision: 83063c0c69ff54ec2fbc43e2dd50c1c6a80bcf1a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-06T16:05:10 + Monotone-Branch: ca.inverse.sogo + +commit 071db38df97c3bcbbf59ab7c42e75c475af9e7f4 +Merge: 59017c5 872ae91 +Author: Wolfgang Sourdeau +Date: Tue Dec 6 16:04:49 2011 +0000 + + merge of '802a04b5081d0264febb32e1dcf222a8d0d1a263' + and 'de58c17588816674c9047955ef96df3f119e8fd1' + + Monotone-Parent: 802a04b5081d0264febb32e1dcf222a8d0d1a263 + Monotone-Parent: de58c17588816674c9047955ef96df3f119e8fd1 + Monotone-Revision: f1a929eda62ac5fe22596efe98c5a812783f90c5 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-06T16:04:49 + commit 59017c5b942cfb4669621bc0dbe557ac5803d94c Author: Wolfgang Sourdeau Date: Tue Dec 6 16:04:04 2011 +0000 @@ -15246,6 +20945,21 @@ Date: Tue Dec 6 15:11:05 2011 +0000 M UI/MainUI/DanishDenmark.lproj/Localizable.strings M UI/PreferencesUI/DanishDenmark.lproj/Localizable.strings +commit a0afdf866f99241f48282ad9c3fd2407eb87229f +Merge: 600d517 0fab9ed +Author: Wolfgang Sourdeau +Date: Tue Dec 6 15:08:09 2011 +0000 + + merge of '29ee33c12159479ee3901d1552b1ea488728ec05' + and '317388b9ab7cf72dd79c9577c59e2eb3dda1298a' + + Monotone-Parent: 29ee33c12159479ee3901d1552b1ea488728ec05 + Monotone-Parent: 317388b9ab7cf72dd79c9577c59e2eb3dda1298a + Monotone-Revision: 11ef456e45cbaea55e39d4b6ddb6751f4f233acc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-06T15:08:09 + commit 600d517b24446312e97ad28c3d3b19f58f3536db Author: Wolfgang Sourdeau Date: Tue Dec 6 15:07:35 2011 +0000 @@ -15272,6 +20986,36 @@ Date: Tue Dec 6 14:43:17 2011 +0000 A UI/Templates/UIxLoading.wox +commit c2229901b9deaa7771608f10afb5868d252ca38d +Merge: 56d8a33 a797439 +Author: Wolfgang Sourdeau +Date: Tue Dec 6 01:37:49 2011 +0000 + + merge of '63ee524117cc9ce93494633a63d1159b33b05365' + and '8f2c57869f8130681b14781691613a5160c86dc2' + + Monotone-Parent: 63ee524117cc9ce93494633a63d1159b33b05365 + Monotone-Parent: 8f2c57869f8130681b14781691613a5160c86dc2 + Monotone-Revision: 1ea08f6ec84d602c5e78b6c440e2f7d6297a82cd + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-06T01:37:49 + +commit 56d8a337d1c1bf558e2088a7a35c9fc5e4bf2294 +Merge: 07e484e 188e947 +Author: Wolfgang Sourdeau +Date: Mon Dec 5 20:55:24 2011 +0000 + + merge of '1f66f69ac041c4c07572f485c685adf50bf6866c' + and 'dba9e298691b115fdb536d3e5610f71142ab4ee3' + + Monotone-Parent: 1f66f69ac041c4c07572f485c685adf50bf6866c + Monotone-Parent: dba9e298691b115fdb536d3e5610f71142ab4ee3 + Monotone-Revision: 63ee524117cc9ce93494633a63d1159b33b05365 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-05T20:55:24 + commit 07e484e5aef8639f49713047595640bdec3b4da9 Author: Wolfgang Sourdeau Date: Mon Dec 5 20:55:11 2011 +0000 @@ -15286,6 +21030,22 @@ Date: Mon Dec 5 20:55:11 2011 +0000 M UI/WebServerResources/SchedulerUI.css +commit 15a67ab68c33a0ce4c7df756af16261a1fd38676 +Merge: 06e5b46 8c98315 +Author: Wolfgang Sourdeau +Date: Mon Dec 5 16:42:13 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head 7be89eb338128de0cf7f68aeb1ed4852cf15bc96) + to branch 'ca.inverse.sogo' (head 67b04dc1826e6a365d562a81554e430a185f049e) + + Monotone-Parent: 67b04dc1826e6a365d562a81554e430a185f049e + Monotone-Parent: 7be89eb338128de0cf7f68aeb1ed4852cf15bc96 + Monotone-Revision: ac5c5df6110e5b3eeddb58ae28a4da10b7e43c94 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-05T16:42:13 + Monotone-Branch: ca.inverse.sogo + commit 8c983152ee8f67fe804e7986ef5d9fdb2ecfc388 Author: Wolfgang Sourdeau Date: Mon Dec 5 16:42:05 2011 +0000 @@ -15311,6 +21071,22 @@ Date: Mon Dec 5 15:21:53 2011 +0000 M Version +commit f751790d86b70b8cb02e12c2a1079de2b8c2f108 +Merge: e2a4a1b 182f442 +Author: Wolfgang Sourdeau +Date: Mon Dec 5 15:21:32 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_11' (head dd98907b2d09b3cd66d8a6ef15da440b85e98478) + to branch 'ca.inverse.sogo' (head 7671984f4de4c2e75f994c09f3c03934090088b2) + + Monotone-Parent: 7671984f4de4c2e75f994c09f3c03934090088b2 + Monotone-Parent: dd98907b2d09b3cd66d8a6ef15da440b85e98478 + Monotone-Revision: b0847062df5606c06fbb9461db56bce7d76a8332 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-05T15:21:32 + Monotone-Branch: ca.inverse.sogo + commit 182f442a4dddce0d1ed0162652fe87bb77bca571 Author: Wolfgang Sourdeau Date: Mon Dec 5 15:19:45 2011 +0000 @@ -15760,6 +21536,22 @@ Date: Thu Dec 1 22:33:46 2011 +0000 M ChangeLog M OpenChange/MAPIStoreContext.m +commit 49f733033f84622e5b5993f7488588465f38125f +Merge: e04ef30 8bf49a0 +Author: Wolfgang Sourdeau +Date: Thu Dec 1 22:30:52 2011 +0000 + + merge of '1cc45a54646b7c2b2f5f308de913308b94603cc6' + and '4fc05589d27078390d22daa4cafe9389c886c583' + + Monotone-Parent: 1cc45a54646b7c2b2f5f308de913308b94603cc6 + Monotone-Parent: 4fc05589d27078390d22daa4cafe9389c886c583 + Monotone-Revision: e13446efcded2d880cbb5bb48b3bde3b54faf46e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-12-01T22:30:52 + Monotone-Branch: ca.inverse.sogo + commit 8bf49a0d2f3d22622ae28da9b55bf947d564022b Author: Wolfgang Sourdeau Date: Thu Dec 1 22:30:25 2011 +0000 @@ -15963,6 +21755,39 @@ Date: Thu Dec 1 02:11:09 2011 +0000 M Version +commit e04ef3039dc2772b4953e0457110fff23f4316dd +Merge: 3e961a8 ca8f241 +Author: Francis Lachapelle +Date: Wed Nov 30 22:50:45 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head c77fdc314da75a342268360460b4eb2adfb41c9c) + to branch 'ca.inverse.sogo' (head bbb8c6d413d58aed3320b954f516c9ab2d0b0329) + + Monotone-Parent: bbb8c6d413d58aed3320b954f516c9ab2d0b0329 + Monotone-Parent: c77fdc314da75a342268360460b4eb2adfb41c9c + Monotone-Revision: 1cc45a54646b7c2b2f5f308de913308b94603cc6 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-30T22:50:45 + Monotone-Branch: ca.inverse.sogo + Monotone-Tag: SOGo_v1.3.10 + +commit 3e961a83fb72ea7da9d39abf437de7064206953f +Merge: 4c78dfc d026f82 +Author: Wolfgang Sourdeau +Date: Wed Nov 30 15:11:12 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head a96cbe44e3664528e8b96cf10301c6a34afdd80e) + to branch 'ca.inverse.sogo' (head a7c71d116cd3e44573b0f929774cb879c253f577) + + Monotone-Parent: a7c71d116cd3e44573b0f929774cb879c253f577 + Monotone-Parent: a96cbe44e3664528e8b96cf10301c6a34afdd80e + Monotone-Revision: bbb8c6d413d58aed3320b954f516c9ab2d0b0329 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-30T15:11:12 + Monotone-Branch: ca.inverse.sogo + commit d026f8201c872f91e2bb9db975b4f02431202deb Author: Wolfgang Sourdeau Date: Wed Nov 30 15:11:10 2011 +0000 @@ -15977,6 +21802,22 @@ M SoObjects/Appointments/SOGoAppointmentFolders.m M SoObjects/Appointments/SOGoUserFolder+Appointments.m M SoObjects/SOGo/SOGoUserFolder.m +commit 4c78dfc02449110f9720e43d11439ee0a58a4d2b +Merge: bdac79e d2172bf +Author: Wolfgang Sourdeau +Date: Wed Nov 30 15:07:17 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head c1e7ef32360364c6b7731d28d8fd3d1c67f5e9e5) + to branch 'ca.inverse.sogo' (head 196512840d27c4350e03e7125e886b09ed4def3a) + + Monotone-Parent: 196512840d27c4350e03e7125e886b09ed4def3a + Monotone-Parent: c1e7ef32360364c6b7731d28d8fd3d1c67f5e9e5 + Monotone-Revision: a7c71d116cd3e44573b0f929774cb879c253f577 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-30T15:07:17 + Monotone-Branch: ca.inverse.sogo + commit d2172bfc8915718ddbdafaee2ffb2e7c920ab86b Author: Wolfgang Sourdeau Date: Wed Nov 30 15:07:09 2011 +0000 @@ -16002,6 +21843,22 @@ Date: Wed Nov 30 14:58:39 2011 +0000 M Version +commit 0930892605c33619af278c3abdb2e83f86d99e0c +Merge: b90400b 4e81565 +Author: Wolfgang Sourdeau +Date: Wed Nov 30 14:55:30 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head e1d9c79bd6c5862141ce684d5c07afe5be283b15) + to branch 'ca.inverse.sogo' (head 6b6c2b39b25856934b5a687c610bcd0b60732c42) + + Monotone-Parent: 6b6c2b39b25856934b5a687c610bcd0b60732c42 + Monotone-Parent: e1d9c79bd6c5862141ce684d5c07afe5be283b15 + Monotone-Revision: c848a704ccb578f33ab987c1380dd78a884e9eab + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-30T14:55:30 + Monotone-Branch: ca.inverse.sogo + commit 4e81565817f89d6e9fb1dddcb1e2ae5eea007458 Author: Wolfgang Sourdeau Date: Wed Nov 30 14:54:41 2011 +0000 @@ -16246,6 +22103,21 @@ Date: Wed Nov 30 03:10:06 2011 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 0e0045e310de98b2e9bb19219712eb8bfc2692dc +Merge: 64dd572 3102078 +Author: Francis Lachapelle +Date: Tue Nov 29 13:30:12 2011 +0000 + + merge of '242b11744a01859b09e976093dc5b526d501fd87' + and 'bd8c503633ded64868962b0c33e0dcbdc1f4a744' + + Monotone-Parent: 242b11744a01859b09e976093dc5b526d501fd87 + Monotone-Parent: bd8c503633ded64868962b0c33e0dcbdc1f4a744 + Monotone-Revision: f3c2aef97584736f86e933c6d26f36e424321aac + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-29T13:30:12 + commit 3102078a6eeae72d4c65e088c80661b7af084c4b Author: Francis Lachapelle Date: Tue Nov 29 13:30:07 2011 +0000 @@ -16262,6 +22134,22 @@ Date: Tue Nov 29 13:30:07 2011 +0000 M Documentation/SOGo Installation Guide.odt M Documentation/architecture.png +commit b90400b4fcd19049deb689376f9b5de10a3ee436 +Merge: 3c8bc5c f6a4361 +Author: Francis Lachapelle +Date: Tue Nov 29 13:24:47 2011 +0000 + + merge of '05b2de9f911d3fd0fc4d6ffdd99cb5e065864668' + and 'e9477f4a12eed5d158a5e34e27faaf0765a0a74f' + + Monotone-Parent: 05b2de9f911d3fd0fc4d6ffdd99cb5e065864668 + Monotone-Parent: e9477f4a12eed5d158a5e34e27faaf0765a0a74f + Monotone-Revision: 6b6c2b39b25856934b5a687c610bcd0b60732c42 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-29T13:24:47 + Monotone-Branch: ca.inverse.sogo + commit 3c8bc5c15717e5025f803af7ca7399d722e5643d Author: Wolfgang Sourdeau Date: Tue Nov 29 14:18:25 2011 +0000 @@ -16307,6 +22195,38 @@ M ChangeLog M OpenChange/MAPIStoreContext.h M OpenChange/MAPIStoreContext.m +commit 7d1068e7492f8f98f8605d1a30db414d9e2c189d +Merge: 64dd572 4e00e3d +Author: Wolfgang Sourdeau +Date: Mon Nov 28 16:45:30 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head 242b11744a01859b09e976093dc5b526d501fd87) + to branch 'ca.inverse.sogo' (head dc7b93b4c30fe18929219d3cedbd50f5bbe6a9d1) + + Monotone-Parent: 242b11744a01859b09e976093dc5b526d501fd87 + Monotone-Parent: dc7b93b4c30fe18929219d3cedbd50f5bbe6a9d1 + Monotone-Revision: fb8ba445e08690bfab22a30460b8df60a58af1c7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-28T16:45:30 + Monotone-Branch: ca.inverse.sogo + +commit 4e00e3d9f0f418f45a056d65b3ed0c254b324b46 +Merge: e6cb2e5 1ed60b2 +Author: Wolfgang Sourdeau +Date: Mon Nov 28 16:45:21 2011 +0000 + + merge of '436e83c1fc0fbad5d73e55ddc0e6c6137396a091' + and '6699076194ac4efb63b946034ffe6cca67448a39' + + Monotone-Parent: 436e83c1fc0fbad5d73e55ddc0e6c6137396a091 + Monotone-Parent: 6699076194ac4efb63b946034ffe6cca67448a39 + Monotone-Revision: dc7b93b4c30fe18929219d3cedbd50f5bbe6a9d1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-28T16:45:21 + Monotone-Branch: ca.inverse.sogo + commit 64dd572b4b8f3c42926acc687bae34cb8b6ecca8 Author: Wolfgang Sourdeau Date: Mon Nov 28 16:37:04 2011 +0000 @@ -16320,6 +22240,22 @@ Date: Mon Nov 28 16:37:04 2011 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit e6cb2e5d2eefd6f707629a88edea60836362a24c +Merge: 281c510 7d96a03 +Author: Wolfgang Sourdeau +Date: Fri Nov 25 21:51:14 2011 +0000 + + merge of '247b6208e1bc91f25c79675ce09027ed27ecdee9' + and '65c58f14cba59a1b1570f99f07e122c332dc16c9' + + Monotone-Parent: 247b6208e1bc91f25c79675ce09027ed27ecdee9 + Monotone-Parent: 65c58f14cba59a1b1570f99f07e122c332dc16c9 + Monotone-Revision: 436e83c1fc0fbad5d73e55ddc0e6c6137396a091 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-25T21:51:14 + Monotone-Branch: ca.inverse.sogo + commit 7d96a03ca88ceafef1bc4870d97f9658ad98b454 Author: Wolfgang Sourdeau Date: Fri Nov 25 21:51:07 2011 +0000 @@ -16333,6 +22269,22 @@ Date: Fri Nov 25 21:51:07 2011 +0000 M SoObjects/SOGo/SOGoGCSFolder.m +commit 1ed60b23dea25af76f4081fd06e4926b83b34ec3 +Merge: 281c510 b844d71 +Author: Ludovic Marcotte +Date: Fri Nov 25 21:19:58 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head 533cf8ab1e070968af4fbbe2ddbd0d66b8fd2b7b) + to branch 'ca.inverse.sogo' (head 247b6208e1bc91f25c79675ce09027ed27ecdee9) + + Monotone-Parent: 247b6208e1bc91f25c79675ce09027ed27ecdee9 + Monotone-Parent: 533cf8ab1e070968af4fbbe2ddbd0d66b8fd2b7b + Monotone-Revision: 6699076194ac4efb63b946034ffe6cca67448a39 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-11-25T21:19:58 + Monotone-Branch: ca.inverse.sogo + commit b844d7193fcd37ccbc5af7afa11d78e607169ddf Author: Francis Lachapelle Date: Fri Nov 25 01:36:35 2011 +0000 @@ -16348,6 +22300,22 @@ Date: Fri Nov 25 01:36:35 2011 +0000 A UI/WebServerResources/dragdot.png M UI/WebServerResources/generic.css +commit 281c510f15e9a6a10c8ecdb580038e2b6026ff74 +Merge: 8e564e0 a98c947 +Author: Ludovic Marcotte +Date: Thu Nov 24 20:55:35 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head 17499446a7bcff456b8470a83c44e2d4b341cc21) + to branch 'ca.inverse.sogo' (head 703f02d08f0caace5f4f0e96efe038c6207e9f28) + + Monotone-Parent: 17499446a7bcff456b8470a83c44e2d4b341cc21 + Monotone-Parent: 703f02d08f0caace5f4f0e96efe038c6207e9f28 + Monotone-Revision: 247b6208e1bc91f25c79675ce09027ed27ecdee9 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-11-24T20:55:35 + Monotone-Branch: ca.inverse.sogo + commit 8e564e0ae301d8de5047fd390bb7170f7c6e15ea Author: Ludovic Marcotte Date: Thu Nov 24 19:52:22 2011 +0000 @@ -16365,6 +22333,22 @@ M UI/MailerUI/German.lproj/Localizable.strings M UI/MainUI/German.lproj/Localizable.strings M UI/PreferencesUI/German.lproj/Localizable.strings +commit a98c947d7e1c87cbcd97c56a7a011a5b66e7589f +Merge: 58c9f912 afaf219 +Author: Wolfgang Sourdeau +Date: Thu Nov 24 19:45:21 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head ba2ef33fb2014db9241eaddd86c886921a3cf802) + to branch 'ca.inverse.sogo' (head cb6221113308044eac92ed5634a235fa9b8140ef) + + Monotone-Parent: ba2ef33fb2014db9241eaddd86c886921a3cf802 + Monotone-Parent: cb6221113308044eac92ed5634a235fa9b8140ef + Monotone-Revision: 703f02d08f0caace5f4f0e96efe038c6207e9f28 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-24T19:45:21 + Monotone-Branch: ca.inverse.sogo + commit c39e6b2eba88fb542e2d7b2b184a1d9aa4c64f3c Author: Ludovic Marcotte Date: Thu Nov 24 19:44:52 2011 +0000 @@ -16422,6 +22406,21 @@ Date: Thu Nov 24 07:48:16 2011 +0000 D UI/Common/UIxJSClose.h D UI/Common/UIxJSClose.m +commit 651a938aea739ee664a304624140c78adcd33601 +Merge: 8e564e0 8cba150 +Author: Francis Lachapelle +Date: Thu Nov 24 07:45:44 2011 +0000 + + merge of '17499446a7bcff456b8470a83c44e2d4b341cc21' + and '8f98146395a5826ccfe93f7881144f6813f07068' + + Monotone-Parent: 17499446a7bcff456b8470a83c44e2d4b341cc21 + Monotone-Parent: 8f98146395a5826ccfe93f7881144f6813f07068 + Monotone-Revision: 91104e04b3ba763294cc8bad97370133142eee86 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-24T07:45:44 + commit 8cba150cf40d4a943dc23d34d22f914a834bd6b0 Author: Francis Lachapelle Date: Thu Nov 24 07:42:24 2011 +0000 @@ -16541,6 +22540,22 @@ M ChangeLog M OpenChange/MAPIStoreTypes.h M OpenChange/MAPIStoreTypes.m +commit e9425a928122796f1d018ec4999a023dc1ce7c43 +Merge: 5c3121a 5a7b42d +Author: Wolfgang Sourdeau +Date: Tue Nov 22 17:49:25 2011 +0000 + + merge of '1c6331f7285001088f0ae617c98daa1544595cc1' + and 'dbda0a122c502c53d25654eada72e93bc8865a35' + + Monotone-Parent: 1c6331f7285001088f0ae617c98daa1544595cc1 + Monotone-Parent: dbda0a122c502c53d25654eada72e93bc8865a35 + Monotone-Revision: 8da45ab6716906aaf63acf12643978541601c34c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-22T17:49:25 + Monotone-Branch: ca.inverse.sogo + commit 5a7b42ddf43a26cc3f176d6ca20262a340582fbd Author: Wolfgang Sourdeau Date: Tue Nov 22 17:48:46 2011 +0000 @@ -16563,6 +22578,22 @@ M OpenChange/NSArray+MAPIStore.m M OpenChange/NSObject+MAPIStore.h M OpenChange/NSObject+MAPIStore.m +commit 5c3121a9d3637dcc4690ad9cc0864b31aaa3afad +Merge: 7a82a3d 7063644 +Author: Francis Lachapelle +Date: Mon Nov 21 20:48:29 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head fdaa328ccd09482653fc768fbb48964163c257d9) + to branch 'ca.inverse.sogo' (head 157b737337e2cd599c6a85f573fbd507b9e7b73e) + + Monotone-Parent: 157b737337e2cd599c6a85f573fbd507b9e7b73e + Monotone-Parent: fdaa328ccd09482653fc768fbb48964163c257d9 + Monotone-Revision: 1c6331f7285001088f0ae617c98daa1544595cc1 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-21T20:48:29 + Monotone-Branch: ca.inverse.sogo + commit 70636441bb03d8d46d33e8ab87851c5babcfdc9b Author: Francis Lachapelle Date: Mon Nov 21 19:26:07 2011 +0000 @@ -16578,6 +22609,37 @@ Date: Mon Nov 21 19:26:07 2011 +0000 M SOPE/NGCards/ChangeLog M SOPE/NGCards/iCalTimeZone.m +commit 7a82a3d03212c6a440b289261d5a0ffa1a55da84 +Merge: fcd0333 a1b4d16 +Author: Francis Lachapelle +Date: Mon Nov 21 14:52:42 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head c4570925f011f2af2dfe09f5e9cc51de5bd1e13e) + to branch 'ca.inverse.sogo' (head 4f36a1c10a12396aed17d84ab4be1adc520d1663) + + Monotone-Parent: 4f36a1c10a12396aed17d84ab4be1adc520d1663 + Monotone-Parent: c4570925f011f2af2dfe09f5e9cc51de5bd1e13e + Monotone-Revision: 157b737337e2cd599c6a85f573fbd507b9e7b73e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-21T14:52:42 + Monotone-Branch: ca.inverse.sogo + +commit a1b4d1684000d50a3fb19ec926573c327a42793e +Merge: 489458c 701187a +Author: Francis Lachapelle +Date: Mon Nov 21 14:22:08 2011 +0000 + + merge of '1d2d40d84e94a64591b3d3ea0025de0405dfd68c' + and '95314ab7581495c05fc3d577e9be1094af542af0' + + Monotone-Parent: 1d2d40d84e94a64591b3d3ea0025de0405dfd68c + Monotone-Parent: 95314ab7581495c05fc3d577e9be1094af542af0 + Monotone-Revision: c4570925f011f2af2dfe09f5e9cc51de5bd1e13e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-21T14:22:08 + commit 701187aef2c77291171e567adeb0176c5d5fda87 Author: Francis Lachapelle Date: Mon Nov 21 14:21:09 2011 +0000 @@ -16607,6 +22669,21 @@ Date: Mon Nov 21 14:18:17 2011 +0000 M ChangeLog +commit 73cb9d81dcef8cac3c9a3be710d5eadc02142a66 +Merge: 79c0c23 413bb60 +Author: Ludovic Marcotte +Date: Mon Nov 21 14:17:10 2011 +0000 + + merge of '387161e51d5f56bffe765c8e46dec729db13794d' + and '9349907ea60fdc16f7e49e777a53ccaa1117180d' + + Monotone-Parent: 387161e51d5f56bffe765c8e46dec729db13794d + Monotone-Parent: 9349907ea60fdc16f7e49e777a53ccaa1117180d + Monotone-Revision: 59b56f2b68665cf95f155fd09f8d371b92ed3b5c + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-11-21T14:17:10 + commit 79c0c2362b262f558eaef9611eb0e53a1c743d8a Author: Ludovic Marcotte Date: Mon Nov 21 14:15:14 2011 +0000 @@ -17169,6 +23246,38 @@ A SOPE/NGCards/TimeZones/UPDATING M SoObjects/SOGo/SOGoGCSFolder.m M SoObjects/SOGo/SOGoSieveManager.m +commit 2120f912e99654ce4327dccdf57aa3ae6547f748 +Merge: 01be7b7 c8d3a27 +Author: Francis Lachapelle +Date: Thu Nov 17 19:12:00 2011 +0000 + + merge of '6927dc6b0ecbc6c5c3061a56fd1e91ef658279ae' + and 'a17a69e9927890a7e540310c825ce032371dd170' + + Monotone-Parent: 6927dc6b0ecbc6c5c3061a56fd1e91ef658279ae + Monotone-Parent: a17a69e9927890a7e540310c825ce032371dd170 + Monotone-Revision: 3c5a6df780ff102d3e46b983c98119061a8c507e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-17T19:12:00 + Monotone-Branch: ca.inverse.sogo + +commit 01be7b7d8f8a0da888ba111aad068d2e986d6a26 +Merge: 88d818d cb4341d +Author: Francis Lachapelle +Date: Thu Nov 17 19:08:52 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head 00afe1e795cd37cafff7687d6f1b8502f4f5735e) + to branch 'ca.inverse.sogo' (head dd0644b62704e75dfed8a39a7e286d593f0014e0) + + Monotone-Parent: 00afe1e795cd37cafff7687d6f1b8502f4f5735e + Monotone-Parent: dd0644b62704e75dfed8a39a7e286d593f0014e0 + Monotone-Revision: 6927dc6b0ecbc6c5c3061a56fd1e91ef658279ae + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-17T19:08:52 + Monotone-Branch: ca.inverse.sogo + commit cb4341db75433148156d4f2a94e962b62be3da3e Author: Wolfgang Sourdeau Date: Thu Nov 17 18:39:42 2011 +0000 @@ -17218,6 +23327,22 @@ M ChangeLog A OpenChange/MAPIStoreSamDBUtils.h A OpenChange/MAPIStoreSamDBUtils.m +commit b998b6db61f7763556edf638bd6617986b29623c +Merge: 6f13029 d1cd50c +Author: Wolfgang Sourdeau +Date: Thu Nov 17 16:22:22 2011 +0000 + + merge of '419d3afdcfcc1cddf8eef1f0311d418b03b0d1a0' + and '9d44b483787d6b5bf34a75581975d592ab901570' + + Monotone-Parent: 419d3afdcfcc1cddf8eef1f0311d418b03b0d1a0 + Monotone-Parent: 9d44b483787d6b5bf34a75581975d592ab901570 + Monotone-Revision: 1cc1f0928d45b737424141e1efb38e5b729b89d7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-17T16:22:22 + Monotone-Branch: ca.inverse.sogo + commit 6f13029d21f863a3f0f716d272f923c4cd02dc65 Author: Wolfgang Sourdeau Date: Thu Nov 17 16:15:38 2011 +0000 @@ -17238,6 +23363,22 @@ M OpenChange/MAPIStoreMailVolatileMessage.m M OpenChange/MAPIStoreMessage.h M OpenChange/MAPIStoreMessage.m +commit c8d3a2735e29896a7b4692d3a50283d61244bcdc +Merge: c331ff1 cb4341d +Author: Ludovic Marcotte +Date: Thu Nov 17 15:31:23 2011 +0000 + + merge of '6ec97f8aa3c0da79e5ef04809f3d7fce566e64b3' + and 'dd0644b62704e75dfed8a39a7e286d593f0014e0' + + Monotone-Parent: 6ec97f8aa3c0da79e5ef04809f3d7fce566e64b3 + Monotone-Parent: dd0644b62704e75dfed8a39a7e286d593f0014e0 + Monotone-Revision: a17a69e9927890a7e540310c825ce032371dd170 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-11-17T15:31:23 + Monotone-Branch: ca.inverse.sogo + commit c331ff11eb8d294da668037b3222b18cc746ca3b Author: Ludovic Marcotte Date: Thu Nov 17 15:30:58 2011 +0000 @@ -17830,6 +23971,37 @@ Date: Wed Nov 16 15:13:53 2011 +0000 M ChangeLog M SoObjects/SOGo/SOGoSieveManager.m +commit 9c22393497d859679e0a336f01c5669e2db71bd0 +Merge: f5b7591 9327121 +Author: Wolfgang Sourdeau +Date: Wed Nov 16 00:36:48 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head c07d2a981f46840c7c328cc149a30955094d55fa) + to branch 'ca.inverse.sogo' (head 010eef1ea5b26dac2a3c224005feae5d974cdef7) + + Monotone-Parent: 010eef1ea5b26dac2a3c224005feae5d974cdef7 + Monotone-Parent: c07d2a981f46840c7c328cc149a30955094d55fa + Monotone-Revision: 92cceaf860bbf56d983063471093858a3871ec23 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-16T00:36:48 + Monotone-Branch: ca.inverse.sogo + +commit 9327121e8cd195e4fbdd15ac1afb3f8034ff6dae +Merge: b2619eb 29a2f00 +Author: Wolfgang Sourdeau +Date: Wed Nov 16 00:35:46 2011 +0000 + + merge of '6798bdb0fb99d7a2b5d2bf8f53bfdb2f0fc14344' + and '995d4602fd5344c45acc187996f93eaed7de1712' + + Monotone-Parent: 6798bdb0fb99d7a2b5d2bf8f53bfdb2f0fc14344 + Monotone-Parent: 995d4602fd5344c45acc187996f93eaed7de1712 + Monotone-Revision: c07d2a981f46840c7c328cc149a30955094d55fa + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-16T00:35:46 + commit 29a2f0072d0b09e4ad97317040e9ce728ca906a9 Author: Wolfgang Sourdeau Date: Wed Nov 16 00:35:23 2011 +0000 @@ -18029,6 +24201,22 @@ Date: Tue Nov 15 11:58:01 2011 +0000 M UI/WebServerResources/SOGoRootPage.js +commit f5b7591413d8218b6c4220f27026ea5c81caa3cd +Merge: 1de1c3f 5a7ecd8 +Author: Francis Lachapelle +Date: Tue Nov 15 11:48:33 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_10' (head 2e5b0e4a79c403ee6edc14f5ee20c4e0decb6219) + to branch 'ca.inverse.sogo' (head 4fa9d5f232411da95f6ddd4d8c85a15ca4aa18d8) + + Monotone-Parent: 2e5b0e4a79c403ee6edc14f5ee20c4e0decb6219 + Monotone-Parent: 4fa9d5f232411da95f6ddd4d8c85a15ca4aa18d8 + Monotone-Revision: 010eef1ea5b26dac2a3c224005feae5d974cdef7 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-11-15T11:48:33 + Monotone-Branch: ca.inverse.sogo + commit 5a7ecd8615464f3e1aef826978800d27e879cc66 Author: Francis Lachapelle Date: Tue Nov 15 11:47:02 2011 +0000 @@ -18636,6 +24824,22 @@ Date: Thu Nov 3 13:56:35 2011 +0000 M UI/MainUI/Norwegian.lproj/Localizable.strings +commit d02400dfc11f31637a135f18fa96b5af9090b08a +Merge: f8931e0 203af6a +Author: Wolfgang Sourdeau +Date: Thu Nov 3 13:41:24 2011 +0000 + + merge of '51381931f3aace686a6d1f39fd9e8ff37174e41c' + and 'dc7f4b5bfd6f1e20c6244c01ec2af24c5f5baba3' + + Monotone-Parent: 51381931f3aace686a6d1f39fd9e8ff37174e41c + Monotone-Parent: dc7f4b5bfd6f1e20c6244c01ec2af24c5f5baba3 + Monotone-Revision: faa665d09f8735444e5cc6f1e0ca073851cbab3f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-11-03T13:41:24 + Monotone-Branch: ca.inverse.sogo + commit f8931e0e09eb79a91abe797ba5e8898bb2df93c4 Author: Wolfgang Sourdeau Date: Thu Nov 3 13:40:11 2011 +0000 @@ -19428,6 +25632,22 @@ M ChangeLog M OpenChange/MAPIStoreFSMessage.m M OpenChange/MAPIStoreVolatileMessage.m +commit 89e76a2bb2f3cd94266dd7fba63d949c878ebc82 +Merge: 530a339 6c4ed0d +Author: Wolfgang Sourdeau +Date: Thu Oct 27 21:38:38 2011 +0000 + + merge of '213bbc308bab313d8aeeda0c97702d2718560a33' + and '3d423e4f0281b17bb64e43dcc170a072949b70cb' + + Monotone-Parent: 213bbc308bab313d8aeeda0c97702d2718560a33 + Monotone-Parent: 3d423e4f0281b17bb64e43dcc170a072949b70cb + Monotone-Revision: 479a80bcb5b10e43ecadc5b5db6efa34926e52a0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-27T21:38:38 + Monotone-Branch: ca.inverse.sogo + commit 530a339d720837d20f02ca9dd62a957e00856052 Author: Wolfgang Sourdeau Date: Thu Oct 27 21:38:17 2011 +0000 @@ -19441,6 +25661,23 @@ Date: Thu Oct 27 21:38:17 2011 +0000 M sogo.spec +commit 6c4ed0de464ae94c72d24947a4047368438fd884 +Merge: e06056d 94efd85 +Author: Francis Lachapelle +Date: Thu Oct 27 20:13:51 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_9' (head f094ea8727e7110bffdeac78126137ceea63eda5) + to branch 'ca.inverse.sogo' (head 5cdce5bcdd485012bf16a49a2dd5dfddaae270c0) + + Monotone-Parent: 5cdce5bcdd485012bf16a49a2dd5dfddaae270c0 + Monotone-Parent: f094ea8727e7110bffdeac78126137ceea63eda5 + Monotone-Revision: 3d423e4f0281b17bb64e43dcc170a072949b70cb + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-27T20:13:51 + Monotone-Branch: ca.inverse.sogo + Monotone-Tag: SOGo_v1.3.9 + commit 94efd85764db009d7d2f066aac5e08a0a0e72c82 Author: Francis Lachapelle Date: Thu Oct 27 18:50:42 2011 +0000 @@ -19602,6 +25839,22 @@ Date: Wed Oct 26 21:29:36 2011 +0000 M ChangeLog M OpenChange/MAPIStoreMessage.m +commit 7779b20e7c2879b49afa5e01810243154a44dba7 +Merge: 13ba718 14e4288 +Author: Francis Lachapelle +Date: Wed Oct 26 19:33:25 2011 +0000 + + merge of '419aa9c6f9c2f99bd8f553de4a4cc7e43960b964' + and 'c3411f7017bb6e32f1e36f27be244fc31dc045fb' + + Monotone-Parent: 419aa9c6f9c2f99bd8f553de4a4cc7e43960b964 + Monotone-Parent: c3411f7017bb6e32f1e36f27be244fc31dc045fb + Monotone-Revision: d8051095a654a9aefa21bff1eaec9672b5ddb438 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-26T19:33:25 + Monotone-Branch: ca.inverse.sogo + commit 14e42881c9f972e927b8ece3232b4f8bbf3ae894 Author: Francis Lachapelle Date: Wed Oct 26 19:27:45 2011 +0000 @@ -19618,6 +25871,22 @@ Date: Wed Oct 26 19:27:45 2011 +0000 M Version +commit dcf0925ece9c1879dc60b6ceae44a7b452ca50c2 +Merge: 96e783b 6957715 +Author: Francis Lachapelle +Date: Wed Oct 26 19:11:52 2011 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_9' (head a8c1ef20873db2c870d93bd5f81876e3cb41c719) + to branch 'ca.inverse.sogo' (head 231e422b9b38aa18cacf5236082f57d828dbf8f2) + + Monotone-Parent: 231e422b9b38aa18cacf5236082f57d828dbf8f2 + Monotone-Parent: a8c1ef20873db2c870d93bd5f81876e3cb41c719 + Monotone-Revision: 6eb618087a406a6325b55eae8131b9965c37aed9 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-26T19:11:52 + Monotone-Branch: ca.inverse.sogo + commit 69577156025c774f4da16a4d484eac7b048a0fe5 Author: Francis Lachapelle Date: Wed Oct 26 19:10:04 2011 +0000 @@ -19755,6 +26024,22 @@ Date: Wed Oct 26 15:23:01 2011 +0000 M ChangeLog M OpenChange/MAPIStoreMessage.m +commit 07c172fac94e6309a993678baefd661bdce2b567 +Merge: c6b716e d59f55e +Author: Wolfgang Sourdeau +Date: Wed Oct 26 15:16:33 2011 +0000 + + merge of '6d629d88d3b01fa71fac5c998333eed2c61c6232' + and 'a0aad18e83de9385156d83958ccb5e65c0a45d62' + + Monotone-Parent: 6d629d88d3b01fa71fac5c998333eed2c61c6232 + Monotone-Parent: a0aad18e83de9385156d83958ccb5e65c0a45d62 + Monotone-Revision: 7842c8950fe912d981925f06e3b7a2f432bc5f2a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-26T15:16:33 + Monotone-Branch: ca.inverse.sogo + commit c6b716ef62d54a3ff8a37f76627fb344ca6c5040 Author: Wolfgang Sourdeau Date: Wed Oct 26 15:15:17 2011 +0000 @@ -19946,6 +26231,21 @@ Date: Tue Oct 25 17:34:49 2011 +0000 M ChangeLog M OpenChange/gen-property-selectors.py +commit 4d1be0c5ae573b4f5f6c6cc099c0a94a1372c06b +Merge: 5f3b6f5 51f742c +Author: Francis Lachapelle +Date: Tue Oct 25 15:38:21 2011 +0000 + + propagate from branch 'ca.inverse.sogo' (head 28db46689fe3ccc299be6164973466befdedb0f7) + to branch 'ca.inverse.sogo.1_3_9' (head 7df38448b3a1432fc26a95fbe40e2c8524140008) + + Monotone-Parent: 28db46689fe3ccc299be6164973466befdedb0f7 + Monotone-Parent: 7df38448b3a1432fc26a95fbe40e2c8524140008 + Monotone-Revision: e58cd8ddee83e89995547f174e7a1a6085b2a8f0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-25T15:38:21 + commit 5f3b6f51650c33e559b010a6ed49c99d03d1d258 Author: Wolfgang Sourdeau Date: Mon Oct 24 20:48:53 2011 +0000 @@ -20049,6 +26349,22 @@ Date: Mon Oct 24 16:10:40 2011 +0000 M UI/WebServerResources/MailerUI.js +commit 305ce721d88ef2bc9b6b3c471f54754d32d04842 +Merge: f1da116 37d2f44 +Author: Wolfgang Sourdeau +Date: Fri Oct 21 23:45:09 2011 +0000 + + merge of 'afd67b085b60bc29f1319198a1796a532db22ebf' + and 'c0c3d56a3486d587b4e272a42efcc42e8a77897e' + + Monotone-Parent: afd67b085b60bc29f1319198a1796a532db22ebf + Monotone-Parent: c0c3d56a3486d587b4e272a42efcc42e8a77897e + Monotone-Revision: 004e35b648d1070b320f15c658e3294fe8cc154e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-21T23:45:09 + Monotone-Branch: ca.inverse.sogo + commit 37d2f449b325f9f5b11481a0464d40be7d472262 Author: Wolfgang Sourdeau Date: Fri Oct 21 23:44:29 2011 +0000 @@ -20182,6 +26498,22 @@ Date: Tue Oct 18 19:47:19 2011 +0000 M OpenChange/GNUmakefile M OpenChange/MAPIStoreSOGo.m +commit bb08315a0b3574c55734160121798f1ccb421e18 +Merge: 9caf038 e376b60 +Author: Wolfgang Sourdeau +Date: Tue Oct 18 19:24:46 2011 +0000 + + merge of 'c98e3872a8bdd768ed6e254e52f9956140773146' + and 'f547e80f0b37a2309a16da53656017a4ee10f80b' + + Monotone-Parent: c98e3872a8bdd768ed6e254e52f9956140773146 + Monotone-Parent: f547e80f0b37a2309a16da53656017a4ee10f80b + Monotone-Revision: 6d01c80e5eec109ea98411f9b345712653571eee + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-18T19:24:46 + Monotone-Branch: ca.inverse.sogo + commit 9caf03820b3952a2484615e2291bc10d141b8c97 Author: Francis Lachapelle Date: Tue Oct 18 19:09:19 2011 +0000 @@ -20199,6 +26531,38 @@ Date: Tue Oct 18 19:09:19 2011 +0000 M ChangeLog M UI/WebServerResources/generic.js +commit 4ec2cd31d1c09f73bd07b117d8eb48028981a1bd +Merge: 3e9ce2d b68e3b5 +Author: Francis Lachapelle +Date: Tue Oct 18 19:00:29 2011 +0000 + + merge of 'c3a6f31e848fe565a228ae5d9bf30dfdc905bea8' + and 'eda5c525a4bff80cf6f3bc99808aeca62b525c78' + + Monotone-Parent: c3a6f31e848fe565a228ae5d9bf30dfdc905bea8 + Monotone-Parent: eda5c525a4bff80cf6f3bc99808aeca62b525c78 + Monotone-Revision: f770d812a46b526af6dd29630df45683a5bf503d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-18T19:00:29 + Monotone-Branch: ca.inverse.sogo + +commit 3e9ce2db0a8f8b4dccb2f2a70e82a5bf99607852 +Merge: 53721a7 cd48336 +Author: Francis Lachapelle +Date: Tue Oct 18 18:58:55 2011 +0000 + + merge of '0b64839fea2e383dcc57f754615f294e164d5826' + and '9cd374b5145ecb4b9e8a0e2131e87d85796cbba9' + + Monotone-Parent: 0b64839fea2e383dcc57f754615f294e164d5826 + Monotone-Parent: 9cd374b5145ecb4b9e8a0e2131e87d85796cbba9 + Monotone-Revision: c3a6f31e848fe565a228ae5d9bf30dfdc905bea8 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-18T18:58:55 + Monotone-Branch: ca.inverse.sogo + commit cd483369660def410d8ab90fc18ccc42101fc5f0 Author: Francis Lachapelle Date: Tue Oct 18 18:24:26 2011 +0000 @@ -20286,6 +26650,22 @@ Date: Mon Oct 17 19:06:55 2011 +0000 M sogo.spec +commit 96685401dde2712e9096bc06d962c9ca412da23e +Merge: d3607df 77c2e71 +Author: Wolfgang Sourdeau +Date: Mon Oct 17 19:02:45 2011 +0000 + + merge of '6ad817abd0c038e9c0fd0d18eb1cdcbca563a507' + and 'bf6121d3dc97f8818e141ab359174b9b83aefbb7' + + Monotone-Parent: 6ad817abd0c038e9c0fd0d18eb1cdcbca563a507 + Monotone-Parent: bf6121d3dc97f8818e141ab359174b9b83aefbb7 + Monotone-Revision: daa6dd40e146759ef92c3d347170e76ecb9a4ea1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-17T19:02:45 + Monotone-Branch: ca.inverse.sogo + commit 77c2e71d7722573f8a914bc7722468d10f5e2fd0 Author: Wolfgang Sourdeau Date: Mon Oct 17 19:02:12 2011 +0000 @@ -20321,6 +26701,22 @@ Date: Mon Oct 17 17:14:06 2011 +0000 M SoObjects/SOGo/WORequest+SOGo.m +commit 89fed635577c9ba43b378bd01dd3eb64ab6c8d9b +Merge: c97bab4 94439ee +Author: Wolfgang Sourdeau +Date: Mon Oct 17 15:29:48 2011 +0000 + + merge of '075d74e27ae04f20b3c4704bd989f61c0e07ddf6' + and '8a9a97e74ab23c27d73459976c2caa29e59adf64' + + Monotone-Parent: 075d74e27ae04f20b3c4704bd989f61c0e07ddf6 + Monotone-Parent: 8a9a97e74ab23c27d73459976c2caa29e59adf64 + Monotone-Revision: ae854e507775b3fdae95a26349d47bfe9fc5272e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-17T15:29:48 + Monotone-Branch: ca.inverse.sogo + commit c97bab4457b2df5e893b9f6ead512e3b1f06ab77 Author: Wolfgang Sourdeau Date: Mon Oct 17 15:29:14 2011 +0000 @@ -20488,6 +26884,22 @@ Date: Fri Oct 14 19:25:17 2011 +0000 M SoObjects/SOGo/GNUmakefile +commit 0998663a9f665cc6cccdf1eefd71cb1a65742b99 +Merge: 6a0053d f391635 +Author: Wolfgang Sourdeau +Date: Fri Oct 14 19:18:42 2011 +0000 + + merge of '0519d3c5cb1ddf5f3f384adbaabc7195b97f949b' + and 'af3dfd2963ebbc1b9b4b29103900ac5125253ac0' + + Monotone-Parent: 0519d3c5cb1ddf5f3f384adbaabc7195b97f949b + Monotone-Parent: af3dfd2963ebbc1b9b4b29103900ac5125253ac0 + Monotone-Revision: 23754eb6015e4caa5d0ab194cddb492b9ed5fbe9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-14T19:18:42 + Monotone-Branch: ca.inverse.sogo + commit f3916357df4a09d676ca0bdf9ad59f20e88d8878 Author: Wolfgang Sourdeau Date: Fri Oct 14 19:18:20 2011 +0000 @@ -20501,6 +26913,22 @@ Date: Fri Oct 14 19:18:20 2011 +0000 M sogo.spec +commit 6a0053d721f6607af6f7ef1b678a93ec227a7637 +Merge: 330e9d4 a6b8d43 +Author: Francis Lachapelle +Date: Fri Oct 14 19:14:46 2011 +0000 + + merge of 'a450abc483f3b225cb25328ed5bf21f1cd7d177a' + and 'da1d45b607b5db68530b2ee303a1bcc9b6ef3057' + + Monotone-Parent: a450abc483f3b225cb25328ed5bf21f1cd7d177a + Monotone-Parent: da1d45b607b5db68530b2ee303a1bcc9b6ef3057 + Monotone-Revision: 0519d3c5cb1ddf5f3f384adbaabc7195b97f949b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-14T19:14:46 + Monotone-Branch: ca.inverse.sogo + commit 330e9d419c44caaef8b4768ed773e7e874503834 Author: Wolfgang Sourdeau Date: Fri Oct 14 19:13:58 2011 +0000 @@ -20532,6 +26960,22 @@ M UI/WebServerResources/MailerUI.js M UI/WebServerResources/SOGoDataTable.js M UI/WebServerResources/SOGoMailDataSource.js +commit 85d775d3a0ff3fd5edbf526a4cf056982694212c +Merge: 739cfa8 185f62d +Author: Wolfgang Sourdeau +Date: Fri Oct 14 19:08:58 2011 +0000 + + merge of '484dfbcd9e1364cb46bc486c8a0669b0d2729d37' + and 'd85ac88023025021e4352537636d2fc8a8d43667' + + Monotone-Parent: 484dfbcd9e1364cb46bc486c8a0669b0d2729d37 + Monotone-Parent: d85ac88023025021e4352537636d2fc8a8d43667 + Monotone-Revision: 9cddfa451166e89060a244252b01a2d1e4cc52be + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-14T19:08:58 + Monotone-Branch: ca.inverse.sogo + commit 739cfa8268db15da18c329d4aeb0191ce915734f Author: Wolfgang Sourdeau Date: Fri Oct 14 19:08:31 2011 +0000 @@ -20593,6 +27037,38 @@ Date: Thu Oct 13 10:53:16 2011 +0000 M ChangeLog M SoObjects/SOGo/NSString+Utilities.m +commit 2d45ad52c4ba3e6cda57c5d1fb670533d8ef9e09 +Merge: 9c17e7b 0125ed5 +Author: Wolfgang Sourdeau +Date: Thu Oct 13 01:05:20 2011 +0000 + + merge of '3e033b86ce4c3221ccb5e2e1dd845bd3a033ec31' + and '8efad85108b102663bde58065393dff21ca233c4' + + Monotone-Parent: 3e033b86ce4c3221ccb5e2e1dd845bd3a033ec31 + Monotone-Parent: 8efad85108b102663bde58065393dff21ca233c4 + Monotone-Revision: fa2e7098c9457bb1b9933f49556578b5326860d2 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-13T01:05:20 + Monotone-Branch: ca.inverse.sogo + +commit 0125ed53723653ba288338c5d0e7e519ba180d33 +Merge: 600c8dd ba74b80 +Author: Francis Lachapelle +Date: Thu Oct 13 01:29:13 2011 +0000 + + merge of 'd75ed56bb85ad0c1c37621595267a590aa9b60db' + and 'dbc2fb47336e631355604e1c4273613997a2bb90' + + Monotone-Parent: d75ed56bb85ad0c1c37621595267a590aa9b60db + Monotone-Parent: dbc2fb47336e631355604e1c4273613997a2bb90 + Monotone-Revision: 8efad85108b102663bde58065393dff21ca233c4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-13T01:29:13 + Monotone-Branch: ca.inverse.sogo + commit ba74b80963b5c0a67a31c012aabc03f487379404 Author: Francis Lachapelle Date: Thu Oct 13 01:27:57 2011 +0000 @@ -20698,6 +27174,22 @@ M OpenChange/MAPIStoreAppointmentWrapper.m M OpenChange/MAPIStoreMailMessage.h M OpenChange/MAPIStoreMailMessage.m +commit afa63205bc4b4300f7c33d241d8c9f5e598cf673 +Merge: 5bdb731 8c929bc +Author: Wolfgang Sourdeau +Date: Tue Oct 11 19:46:51 2011 +0000 + + merge of '857772ec1aaf974c6de49756782191a9e65a3ee0' + and 'bae3f2d15f56ace2300155adab60e9293a29ea32' + + Monotone-Parent: 857772ec1aaf974c6de49756782191a9e65a3ee0 + Monotone-Parent: bae3f2d15f56ace2300155adab60e9293a29ea32 + Monotone-Revision: e329ec905c74bf16f8adf33509a116ea62e1d65f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-11T19:46:51 + Monotone-Branch: ca.inverse.sogo + commit 8c929bc16bc45c58d63010a1b232c9dd818d4a75 Author: Wolfgang Sourdeau Date: Tue Oct 11 19:46:02 2011 +0000 @@ -20727,6 +27219,22 @@ Date: Tue Oct 11 19:35:41 2011 +0000 M UI/Scheduler/French.lproj/Localizable.strings +commit 5bdb73112cc9423019653c87ab609022ac5b5938 +Merge: a93831b 18d7070 +Author: Francis Lachapelle +Date: Tue Oct 11 17:50:57 2011 +0000 + + merge of '144cb4c06dec97c8fe5c36c3cb3df99cdbb2b899' + and '4aa646b0faf339f31cde63a356f16e3c5e98e28a' + + Monotone-Parent: 144cb4c06dec97c8fe5c36c3cb3df99cdbb2b899 + Monotone-Parent: 4aa646b0faf339f31cde63a356f16e3c5e98e28a + Monotone-Revision: 857772ec1aaf974c6de49756782191a9e65a3ee0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-11T17:50:57 + Monotone-Branch: ca.inverse.sogo + commit a93831bfba62773af6b6b5a6c10bc8b3746b6c8f Author: Francis Lachapelle Date: Tue Oct 11 17:41:27 2011 +0000 @@ -20799,6 +27307,22 @@ Date: Sun Oct 9 17:50:13 2011 +0000 M OpenChange/MAPIStoreMapping.m +commit 1ce26b8e1052ca756a180431fa9b18fa8998fb3c +Merge: 453b240 78cc8b0 +Author: Wolfgang Sourdeau +Date: Fri Oct 7 20:58:48 2011 +0000 + + merge of '0ba3fa1a82dc1f0c5096914a7415602564beb50e' + and 'c4988e0379d3f99f40a98620c2c808a000bc5c58' + + Monotone-Parent: 0ba3fa1a82dc1f0c5096914a7415602564beb50e + Monotone-Parent: c4988e0379d3f99f40a98620c2c808a000bc5c58 + Monotone-Revision: b7121103b5c83ec9a9fc4addad1f568b80aee426 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-07T20:58:48 + Monotone-Branch: ca.inverse.sogo + commit 453b24037764ab92815e374fa576eb3aa6f2fcff Author: Wolfgang Sourdeau Date: Fri Oct 7 20:58:08 2011 +0000 @@ -21034,6 +27558,22 @@ M Main/SOGo.m M Tests/Integration/GNUmakefile M Tests/Integration/teststrings.sh +commit b85b885608032fb03a50d7e9cc92e37b0dee8af3 +Merge: 53ddf67 90b99e5 +Author: Ludovic Marcotte +Date: Fri Oct 7 10:28:08 2011 +0000 + + merge of '163c52e46e8d16915f36bb4aad9a0aa42276dc36' + and 'c175274e0e82f9e287d4641095f40892fc1769c2' + + Monotone-Parent: 163c52e46e8d16915f36bb4aad9a0aa42276dc36 + Monotone-Parent: c175274e0e82f9e287d4641095f40892fc1769c2 + Monotone-Revision: ae0c0cd3dbc947562a3dbd28f513f46bcd28a5b4 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-10-07T10:28:08 + Monotone-Branch: ca.inverse.sogo + commit 90b99e50205984bc29c9d4e1049b1e1902caecac Author: Ludovic Marcotte Date: Fri Oct 7 10:27:59 2011 +0000 @@ -21112,6 +27652,22 @@ Date: Wed Oct 5 12:17:04 2011 +0000 M NEWS +commit fce065707a5a8d961da67cbe466baeb924716cba +Merge: 16d2f56 d51fcc9 +Author: Wolfgang Sourdeau +Date: Tue Oct 4 19:55:52 2011 +0000 + + merge of '4cbfcc8ac9c9c474165cdf1d49e3c456e68e8179' + and 'b87314f50be5175b5fd1b2c7feb0392d150c09d1' + + Monotone-Parent: 4cbfcc8ac9c9c474165cdf1d49e3c456e68e8179 + Monotone-Parent: b87314f50be5175b5fd1b2c7feb0392d150c09d1 + Monotone-Revision: bbfd022d80898c181e73d1d08a067e237d9499bc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-04T19:55:52 + Monotone-Branch: ca.inverse.sogo + commit 16d2f563f4df69688777d4f13dded764a785866c Author: Wolfgang Sourdeau Date: Tue Oct 4 19:55:39 2011 +0000 @@ -21214,6 +27770,22 @@ Date: Mon Oct 3 22:21:36 2011 +0000 M OpenChange/MAPIStoreMapping.m +commit 10cfef28e8f8c0b886880263c962367b9f1ae768 +Merge: ebccd39 cec79ff +Author: Wolfgang Sourdeau +Date: Mon Oct 3 20:56:09 2011 +0000 + + merge of '49d890bdc7e4ffafddb46d3d62b8aac0e5c19c0c' + and '52abc75aef67aaed926980af278ba8d1f30321d8' + + Monotone-Parent: 49d890bdc7e4ffafddb46d3d62b8aac0e5c19c0c + Monotone-Parent: 52abc75aef67aaed926980af278ba8d1f30321d8 + Monotone-Revision: 076ed69149c82caa88ef18783648e525e98af4b7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-10-03T20:56:09 + Monotone-Branch: ca.inverse.sogo + commit cec79ff09cb8650727b5321c54282a7002573875 Author: Wolfgang Sourdeau Date: Mon Oct 3 20:55:18 2011 +0000 @@ -21278,6 +27850,38 @@ Date: Mon Oct 3 20:45:51 2011 +0000 M Documentation/SOGo Installation Guide.odt +commit 9eaf454cbba3ae81e517ca45c0a4226d3a491771 +Merge: 715782a 18c8cb2 +Author: Ludovic Marcotte +Date: Mon Oct 3 19:24:04 2011 +0000 + + merge of 'b4ca100a345123aeccde0707a7194ff3f8dcf05e' + and 'd4ca3a4c3a9c4a3555eeb728fdf776d6f9615287' + + Monotone-Parent: b4ca100a345123aeccde0707a7194ff3f8dcf05e + Monotone-Parent: d4ca3a4c3a9c4a3555eeb728fdf776d6f9615287 + Monotone-Revision: bfdca0c98db0fb56893ecf716cddba6843e2bddb + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-10-03T19:24:04 + Monotone-Branch: ca.inverse.sogo + +commit 18c8cb25a81eddbf5afc60a8c9d5fffcb2da4ac5 +Merge: 0b5b8b0 10e3850 +Author: Francis Lachapelle +Date: Mon Oct 3 19:33:37 2011 +0000 + + merge of 'a116eb415302838655699ddf23cdf5a3930aef29' + and 'a7e7282f1911ceaff2a7f4f96320407cba1085cc' + + Monotone-Parent: a116eb415302838655699ddf23cdf5a3930aef29 + Monotone-Parent: a7e7282f1911ceaff2a7f4f96320407cba1085cc + Monotone-Revision: d4ca3a4c3a9c4a3555eeb728fdf776d6f9615287 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-10-03T19:33:37 + Monotone-Branch: ca.inverse.sogo + commit 10e3850d49e649d2e94be987f3ece725a6557f24 Author: Francis Lachapelle Date: Mon Oct 3 19:32:37 2011 +0000 @@ -21350,6 +27954,22 @@ Date: Sat Oct 1 11:23:13 2011 +0000 A Documentation/SOGo Native Microsoft Outlook Configuration.odt +commit e1b483297605121af2182c012c77c41acba3ee20 +Merge: 01e387b 8f49e0d +Author: Ludovic Marcotte +Date: Fri Sep 30 23:01:12 2011 +0000 + + merge of '9109f0600492701322f24fb53d86a39821e26dc4' + and 'b8291c975f3d5403e63bf731275468c6e29b4087' + + Monotone-Parent: 9109f0600492701322f24fb53d86a39821e26dc4 + Monotone-Parent: b8291c975f3d5403e63bf731275468c6e29b4087 + Monotone-Revision: aee5ac46202888eb15c22cb54f405e48ccf41dae + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-09-30T23:01:12 + Monotone-Branch: ca.inverse.sogo + commit 8f49e0d3506624e4f71d4cb4e7be3e14c77a0ee7 Author: Ludovic Marcotte Date: Fri Sep 30 22:59:48 2011 +0000 @@ -21473,6 +28093,22 @@ Date: Thu Sep 29 15:52:27 2011 +0000 M OpenChange/MAPIStoreMailFolder.m +commit c5096d72f1b0d13eb764be574000a6673bb636a6 +Merge: c24620b e4bd5ad +Author: Wolfgang Sourdeau +Date: Thu Sep 29 15:47:53 2011 +0000 + + merge of '83e14487a68dfb26dd4c9771be79be95a07d6fa4' + and 'c2e4ca001f8f7121d1f4f09f13ba336f2bd1cef7' + + Monotone-Parent: 83e14487a68dfb26dd4c9771be79be95a07d6fa4 + Monotone-Parent: c2e4ca001f8f7121d1f4f09f13ba336f2bd1cef7 + Monotone-Revision: bce92d5d3cf0a781944fc96a15b832a767285d0f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-09-29T15:47:53 + Monotone-Branch: ca.inverse.sogo + commit e4bd5ad7d1dc30705213ac14303d88cc85ca7510 Author: Wolfgang Sourdeau Date: Thu Sep 29 15:47:33 2011 +0000 @@ -21502,6 +28138,22 @@ Date: Thu Sep 29 00:17:51 2011 +0000 M UI/Templates/UIxPageFrame.wox A UI/WebServerResources/status.vacation-msg.png +commit 4c9b2bae15ae204ceaad6f8516145e40f3ca5867 +Merge: 04e08a7 4359f40 +Author: Francis Lachapelle +Date: Tue Sep 27 20:15:48 2011 +0000 + + merge of '7d0fa9f892f3a66494cfc72604ad9f9f2ad43b5b' + and 'b28dce204bf84148d4bd3df3df8b289cdd7a4168' + + Monotone-Parent: 7d0fa9f892f3a66494cfc72604ad9f9f2ad43b5b + Monotone-Parent: b28dce204bf84148d4bd3df3df8b289cdd7a4168 + Monotone-Revision: a1735c397c4161f4d534c223869ff7e824c946bb + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-09-27T20:15:48 + Monotone-Branch: ca.inverse.sogo + commit 4359f406cb4dab5483759d6ce228cbfd1a888aa5 Author: Francis Lachapelle Date: Tue Sep 27 20:15:06 2011 +0000 @@ -21568,6 +28220,22 @@ M ChangeLog M OpenChange/MAPIStoreFolder.h M OpenChange/MAPIStoreFolder.m +commit 7eb2149ad5d7ff57932600e7ff8dbb7ef8b45903 +Merge: 94c033c 3856537 +Author: Wolfgang Sourdeau +Date: Tue Sep 27 18:27:03 2011 +0000 + + merge of '517b0b095f30f6f2f92a4da5dfe0155872190daa' + and '5d7bbc47e52cef4525e08da156339e1558c1dd2d' + + Monotone-Parent: 517b0b095f30f6f2f92a4da5dfe0155872190daa + Monotone-Parent: 5d7bbc47e52cef4525e08da156339e1558c1dd2d + Monotone-Revision: 3cb2fca087640ef420f86750a3bd9caf7c365b3b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-09-27T18:27:03 + Monotone-Branch: ca.inverse.sogo + commit 38565376afab8c7fad4a923bcda8957a762b863a Author: Wolfgang Sourdeau Date: Tue Sep 27 18:26:40 2011 +0000 @@ -21599,6 +28267,22 @@ Date: Tue Sep 27 15:52:59 2011 +0000 M UI/PreferencesUI/English.lproj/Localizable.strings +commit c614dd3febd408ecca36eeaba1d1f895d84c9f3a +Merge: 76ffdc5 fd2f5df +Author: Francis Lachapelle +Date: Tue Sep 27 15:45:10 2011 +0000 + + merge of '83587b1afc04162d7191ff57c7f8a78b502a9be3' + and 'e68f0a3422367e930eb3d030ebd4a65ee79e3581' + + Monotone-Parent: 83587b1afc04162d7191ff57c7f8a78b502a9be3 + Monotone-Parent: e68f0a3422367e930eb3d030ebd4a65ee79e3581 + Monotone-Revision: 50e0397c329c41e41cf087484d14a3068de51597 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-09-27T15:45:10 + Monotone-Branch: ca.inverse.sogo + commit 76ffdc598c498f53e3cfca0315a08b135397f48d Author: Francis Lachapelle Date: Tue Sep 27 15:43:46 2011 +0000 @@ -21802,6 +28486,22 @@ Date: Sat Sep 24 00:10:26 2011 +0000 M ChangeLog M OpenChange/MAPIStoreMailFolder.m +commit cbc6d766886ef9c4b92bbbb997490d8e7c5bc8e5 +Merge: 40733f1 e5b0d68 +Author: Francis Lachapelle +Date: Fri Sep 23 20:04:32 2011 +0000 + + merge of '1e156d58cc527cdcdd61317d54c6ba7dc0b863c2' + and 'd830b49b93b3b05bd3b392063b915cc6954ee1a1' + + Monotone-Parent: 1e156d58cc527cdcdd61317d54c6ba7dc0b863c2 + Monotone-Parent: d830b49b93b3b05bd3b392063b915cc6954ee1a1 + Monotone-Revision: e287e19d922a91499f1429d7f16d9bd161d1260e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-09-23T20:04:32 + Monotone-Branch: ca.inverse.sogo + commit 40733f1f526e287f4009b8178c479d1689f5df54 Author: Francis Lachapelle Date: Fri Sep 23 20:04:17 2011 +0000 @@ -21816,6 +28516,22 @@ Date: Fri Sep 23 20:04:17 2011 +0000 M SoObjects/SOGo/SOGoUserDefaults.h M SoObjects/SOGo/SOGoUserDefaults.m +commit e5b0d6813cf1d7a667a4e45de3c75df45eec6fa8 +Merge: fcad5d1 0c2d6dd +Author: Wolfgang Sourdeau +Date: Fri Sep 23 19:59:37 2011 +0000 + + merge of 'a84224f7e18c7678f6ed4be61800899d8fb9286d' + and 'bc6a066b0ed99cc7226c2f6c089a4ed6987ee423' + + Monotone-Parent: a84224f7e18c7678f6ed4be61800899d8fb9286d + Monotone-Parent: bc6a066b0ed99cc7226c2f6c089a4ed6987ee423 + Monotone-Revision: d830b49b93b3b05bd3b392063b915cc6954ee1a1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-09-23T19:59:37 + Monotone-Branch: ca.inverse.sogo + commit 6e6d5913c635b535034e3d288ca1f6edf3141b0f Author: Francis Lachapelle Date: Fri Sep 23 19:40:13 2011 +0000 @@ -21945,6 +28661,22 @@ M OpenChange/MAPIStoreTasksMessage.m M OpenChange/NSObject+MAPIStore.h M OpenChange/SOGoMAPIFSMessage.m +commit 707ae22ad87a6a6c7aa40b7e399b0e400e6f7bbb +Merge: 3a357aa baea61a +Author: Wolfgang Sourdeau +Date: Fri Sep 23 14:03:09 2011 +0000 + + merge of '25091cd75733e2785b3cd2550afa96d2cb4af894' + and 'cd75a2b1cab18760280675763a7f116e18c1be54' + + Monotone-Parent: 25091cd75733e2785b3cd2550afa96d2cb4af894 + Monotone-Parent: cd75a2b1cab18760280675763a7f116e18c1be54 + Monotone-Revision: e1689f21ae9391a98de28b07ee195a3a85688a85 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-09-23T14:03:09 + Monotone-Branch: ca.inverse.sogo + commit baea61ae64d485b5cc199eef98c9b603e55d6622 Author: Ludovic Marcotte Date: Fri Sep 23 01:00:28 2011 +0000 @@ -22550,6 +29282,22 @@ Date: Sat Aug 13 01:52:55 2011 +0000 M OpenChange/MAPIStoreObject.m +commit 17933d1cf86c3cfd94a9f711d996ebb6b1d0c76c +Merge: 8d30fb1 33051f0 +Author: Wolfgang Sourdeau +Date: Sat Aug 13 01:51:57 2011 +0000 + + merge of 'ab4171905a7a07f18dc66a292c18cc539efaa4e0' + and 'bafe1b063c24f5ef34672c7a98260bbc66509abe' + + Monotone-Parent: ab4171905a7a07f18dc66a292c18cc539efaa4e0 + Monotone-Parent: bafe1b063c24f5ef34672c7a98260bbc66509abe + Monotone-Revision: 1146fb8dc71731c6d49fbb6dd87db9fa6ce4466f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-08-13T01:51:57 + Monotone-Branch: ca.inverse.sogo + commit 33051f01e38e801c5d70c1a82ca5acdd93e5eb0f Author: Wolfgang Sourdeau Date: Fri Aug 12 22:58:35 2011 +0000 @@ -22567,6 +29315,22 @@ M SoObjects/Mailer/SOGoMailFolder.m M SoObjects/Mailer/SOGoMailObject.h M SoObjects/Mailer/SOGoMailObject.m +commit 8d30fb1505b1b2c8ed354dac9ecfa8f10ace7997 +Merge: 61f9952 39efb34 +Author: Francis Lachapelle +Date: Fri Aug 12 20:40:50 2011 +0000 + + merge of '72951a15317b904c573f349f0cc5252a50749fd3' + and '7d5face94be8209296f29fb4baef4364387ee55a' + + Monotone-Parent: 72951a15317b904c573f349f0cc5252a50749fd3 + Monotone-Parent: 7d5face94be8209296f29fb4baef4364387ee55a + Monotone-Revision: ab4171905a7a07f18dc66a292c18cc539efaa4e0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-08-12T20:40:50 + Monotone-Branch: ca.inverse.sogo + commit 39efb347870bfda704d9ba0c6b8b0f6d818c7196 Author: Francis Lachapelle Date: Fri Aug 12 20:40:02 2011 +0000 @@ -23285,6 +30049,22 @@ M OpenChange/GNUmakefile A OpenChange/MAPIStorePermissionsTable.h A OpenChange/MAPIStorePermissionsTable.m +commit 3ad7e00531c8934c5391ec5ea50963f00e8c6c69 +Merge: b67af40 c12e7cd +Author: Wolfgang Sourdeau +Date: Tue Aug 2 18:57:20 2011 +0000 + + merge of '02babe4737ff32b8a48a8a24bbe0e321be9a0e8f' + and '98421a1eccc93a8048d8f3c640bc4cf0e6743764' + + Monotone-Parent: 02babe4737ff32b8a48a8a24bbe0e321be9a0e8f + Monotone-Parent: 98421a1eccc93a8048d8f3c640bc4cf0e6743764 + Monotone-Revision: 19b842fa105a28640ea4883c6641a51413844f17 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-08-02T18:57:20 + Monotone-Branch: ca.inverse.sogo + commit c12e7cdd20c96f2d211e196c2c5b63d6b8b1a361 Author: Wolfgang Sourdeau Date: Tue Aug 2 18:56:17 2011 +0000 @@ -23451,6 +30231,22 @@ Date: Fri Jul 29 14:16:53 2011 +0000 M OpenChange/plreader.m +commit 5d22bac0d800763bf18dcc5d2e38a6b7105018f3 +Merge: 1376d86 7a5f67b +Author: Wolfgang Sourdeau +Date: Fri Jul 29 13:56:19 2011 +0000 + + merge of 'addfe836292fcae874e765a05ef776bfe841be1d' + and 'd9c62c6e142174bc3d2adb12ee04492347c95ede' + + Monotone-Parent: addfe836292fcae874e765a05ef776bfe841be1d + Monotone-Parent: d9c62c6e142174bc3d2adb12ee04492347c95ede + Monotone-Revision: f49f7655bf5cf28a4146c61d6f0897052be0f21b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-29T13:56:19 + Monotone-Branch: ca.inverse.sogo + commit 1376d8654a927d094f79541542112947a5c598ca Author: Ludovic Marcotte Date: Fri Jul 29 13:26:14 2011 +0000 @@ -23720,6 +30516,22 @@ M ChangeLog M OpenChange/GNUmakefile A OpenChange/plreader.m +commit c0f6644589f8c04898aaccb87f29d8718c0c54a4 +Merge: aad817d 44c3662 +Author: Wolfgang Sourdeau +Date: Wed Jul 27 15:23:23 2011 +0000 + + merge of '829ccf73000a2d91a5daf67741479e395011b6a8' + and 'ed98effe549d74bf8029681e84b1654da70530c3' + + Monotone-Parent: 829ccf73000a2d91a5daf67741479e395011b6a8 + Monotone-Parent: ed98effe549d74bf8029681e84b1654da70530c3 + Monotone-Revision: e907e470c7aa26b32fa9c7a7ebd2b18a41a700a8 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-27T15:23:23 + Monotone-Branch: ca.inverse.sogo + commit 44c36621a88856b8263ab34c3b3cee19cc285e5c Author: Francis Lachapelle Date: Wed Jul 27 14:53:12 2011 +0000 @@ -23890,6 +30702,22 @@ Date: Mon Jul 25 16:28:02 2011 +0000 M SoObjects/SOGo/GNUmakefile +commit f7c22de1bd57d669a230d750d55769e027386a9f +Merge: 76edc51 c404a10 +Author: Francis Lachapelle +Date: Mon Jul 25 14:29:27 2011 +0000 + + merge of '1daa99a3349eed6187c150245d4360becf9a5119' + and 'fb2d19f2d09037cb11414b10bc8c3bb8beb37bd9' + + Monotone-Parent: 1daa99a3349eed6187c150245d4360becf9a5119 + Monotone-Parent: fb2d19f2d09037cb11414b10bc8c3bb8beb37bd9 + Monotone-Revision: ff19bb5b02dc7d005805574c2237a99788b1f06b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-25T14:29:27 + Monotone-Branch: ca.inverse.sogo + commit c404a10153dcf62ca8035ddf06f661d8fb398687 Author: Francis Lachapelle Date: Mon Jul 25 14:28:15 2011 +0000 @@ -24097,6 +30925,22 @@ M ChangeLog M SoObjects/SOGo/SOGoObject.h M SoObjects/SOGo/SOGoObject.m +commit b868aea9cce0b13e4179c73e50e0e60a2d8b96ef +Merge: dbc50c7 9158de3 +Author: Wolfgang Sourdeau +Date: Wed Jul 20 18:19:03 2011 +0000 + + merge of '290944a7a48619d2848c467ceac22359889e773c' + and '43226c6973143c1625e30132d5e52ff2c5bf260a' + + Monotone-Parent: 290944a7a48619d2848c467ceac22359889e773c + Monotone-Parent: 43226c6973143c1625e30132d5e52ff2c5bf260a + Monotone-Revision: e3227b9b9e8abff2f7a81dee01e5cf51b59ea921 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-20T18:19:03 + Monotone-Branch: ca.inverse.sogo + commit 9158de3654e0c9517d28ec2370eb8a0028222991 Author: Francis Lachapelle Date: Wed Jul 20 17:29:46 2011 +0000 @@ -24171,6 +31015,22 @@ Date: Tue Jul 19 21:29:59 2011 +0000 M ChangeLog +commit 57d931af47f11c38cfe101fb95079b12c6359076 +Merge: 5f6f472 be57658 +Author: Francis Lachapelle +Date: Tue Jul 19 20:12:57 2011 +0000 + + merge of 'd9a86eb13b216d79e4554381c163dbca408f0d39' + and 'fa63ae9b079303f5952bc14fa2849e6c78f005b2' + + Monotone-Parent: d9a86eb13b216d79e4554381c163dbca408f0d39 + Monotone-Parent: fa63ae9b079303f5952bc14fa2849e6c78f005b2 + Monotone-Revision: b4ff4dcc6bb4a5582d2cf8e4b1c70fe150c85870 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-19T20:12:57 + Monotone-Branch: ca.inverse.sogo + commit be5765849357d9c449b2d6f95713ac015eca9f2d Author: Francis Lachapelle Date: Tue Jul 19 20:09:23 2011 +0000 @@ -24347,6 +31207,22 @@ M SoObjects/SOGo/SOGoWebAuthenticator.m M UI/MainUI/SOGoRootPage.m M UI/MainUI/SOGoUserHomePage.m +commit 8aae19aeb8223f9cce7a1a8e3a131a2dec8efaf5 +Merge: 736b4a4 ebc2a66 +Author: Francis Lachapelle +Date: Fri Jul 15 18:05:52 2011 +0000 + + merge of '9c2ce4a1d58e648ee8b0bab68a7284e4b583962d' + and 'cd48d16d8aea72307e36e2994ff100b98e69d04a' + + Monotone-Parent: 9c2ce4a1d58e648ee8b0bab68a7284e4b583962d + Monotone-Parent: cd48d16d8aea72307e36e2994ff100b98e69d04a + Monotone-Revision: 42fa26da9b1def06a194726cab4199338a4bdf4c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-15T18:05:52 + Monotone-Branch: ca.inverse.sogo + commit 736b4a4f4cac8824bc0ee5396ed8abb50233725d Author: Wolfgang Sourdeau Date: Fri Jul 15 20:32:59 2011 +0000 @@ -24398,6 +31274,22 @@ M OpenChange/MAPIStoreMailMessage.h M OpenChange/MAPIStoreMailMessage.m M OpenChange/MAPIStoreMessage.m +commit 72f379b93195bd909e24c1074ce5ec775e9b431f +Merge: 1736de0 689db91 +Author: Wolfgang Sourdeau +Date: Fri Jul 15 19:31:27 2011 +0000 + + merge of '1e777b448f611699c505f7adf188b474c8be8766' + and 'c3a7c48c4aca7497c570e19e07cd5c09215932f0' + + Monotone-Parent: 1e777b448f611699c505f7adf188b474c8be8766 + Monotone-Parent: c3a7c48c4aca7497c570e19e07cd5c09215932f0 + Monotone-Revision: 0bb415c672cf6fa29a94c71cfade196c42eeb58a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-15T19:31:27 + Monotone-Branch: ca.inverse.sogo + commit 1736de0c4bf9f4cabec39eec8c95f509817f9627 Author: Wolfgang Sourdeau Date: Fri Jul 15 19:29:30 2011 +0000 @@ -24552,6 +31444,22 @@ Date: Thu Jul 14 21:35:11 2011 +0000 M ChangeLog M OpenChange/MAPIStoreTable.m +commit 49e302894d524cbd3dee94d77010df2c022eb57e +Merge: 8367ad3 4e9226c +Author: Wolfgang Sourdeau +Date: Thu Jul 14 21:34:19 2011 +0000 + + merge of '26f45bf17d39a252cb6b60da3f39bfb9965a2f83' + and 'fb5168d6a8a15251f195c6088e8bc566b7b29809' + + Monotone-Parent: 26f45bf17d39a252cb6b60da3f39bfb9965a2f83 + Monotone-Parent: fb5168d6a8a15251f195c6088e8bc566b7b29809 + Monotone-Revision: d46f4a0ff945f9aea6a53dcd6b70ed69289186dc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-14T21:34:19 + Monotone-Branch: ca.inverse.sogo + commit 4e9226ce9ddeee94d21f49cf67c48ed526e7aebd Author: Wolfgang Sourdeau Date: Thu Jul 14 21:34:01 2011 +0000 @@ -24649,6 +31557,38 @@ Date: Thu Jul 14 13:08:29 2011 +0000 M ChangeLog M SoObjects/SOGo/SOGoGCSFolder.m +commit 78f36045b9550d36cc2ccbc3b1d837be0ac43d74 +Merge: 02c133a 1db032d +Author: Wolfgang Sourdeau +Date: Thu Jul 14 13:18:16 2011 +0000 + + merge of '3d2df4a4cd0472c967808f3f52f6cde1831d2d1a' + and 'f952a928d27cf1be611b72ac88c0f51419679c1f' + + Monotone-Parent: 3d2df4a4cd0472c967808f3f52f6cde1831d2d1a + Monotone-Parent: f952a928d27cf1be611b72ac88c0f51419679c1f + Monotone-Revision: 3f20a85d13ccd9287c2d83d025e20a9dc73a3f02 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-14T13:18:16 + Monotone-Branch: ca.inverse.sogo + +commit 1db032d7e41d7e80b5144def0658f8240a973585 +Merge: fcac6d8 53d65fd +Author: Francis Lachapelle +Date: Thu Jul 14 00:24:48 2011 +0000 + + merge of '2c64e78c31d73184adcc98b6a31670109e2d07e0' + and '5b4c993653702d15ad66f63a1c94781ddd2e36aa' + + Monotone-Parent: 2c64e78c31d73184adcc98b6a31670109e2d07e0 + Monotone-Parent: 5b4c993653702d15ad66f63a1c94781ddd2e36aa + Monotone-Revision: f952a928d27cf1be611b72ac88c0f51419679c1f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-14T00:24:48 + Monotone-Branch: ca.inverse.sogo + commit fcac6d89e4db2c4068fa5de78bbf324eae52fe6e Author: Francis Lachapelle Date: Wed Jul 13 23:31:58 2011 +0000 @@ -24721,6 +31661,22 @@ M OpenChange/MAPIStoreObject.m M OpenChange/MAPIStoreSOGo.m M OpenChange/MAPIStoreTable.m +commit 78e8ffe78fdda69d9a51f39120aa120b48543ec5 +Merge: b07ffb9 0716c41 +Author: Wolfgang Sourdeau +Date: Wed Jul 13 21:38:19 2011 +0000 + + merge of '119376c6d87a7be6c3b6c2b3d6329f6b8d60b461' + and '37a89f2c11d5ea6e9541a6dae8f2ad9aeb88393a' + + Monotone-Parent: 119376c6d87a7be6c3b6c2b3d6329f6b8d60b461 + Monotone-Parent: 37a89f2c11d5ea6e9541a6dae8f2ad9aeb88393a + Monotone-Revision: 79dc6e23f29ab39ef98de2d45f1c37249b3c4152 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-13T21:38:19 + Monotone-Branch: ca.inverse.sogo + commit 0716c41fe7a27ebeb275c8c7de920ef71837d5b5 Author: Wolfgang Sourdeau Date: Wed Jul 13 21:38:14 2011 +0000 @@ -24766,6 +31722,22 @@ Date: Wed Jul 13 19:16:09 2011 +0000 M ChangeLog M UI/WebServerResources/UIxAttendeesEditor.js +commit 06cd1058bc530b7aa422f2e9f081935a55415db0 +Merge: 80157e5 450bee6 +Author: Francis Lachapelle +Date: Wed Jul 13 18:56:12 2011 +0000 + + merge of 'd4476114c133c77a0b6b0b596165243704a68fb6' + and 'e3a0cebd32124aa09d35255a3e302efd4805257e' + + Monotone-Parent: d4476114c133c77a0b6b0b596165243704a68fb6 + Monotone-Parent: e3a0cebd32124aa09d35255a3e302efd4805257e + Monotone-Revision: 5e1c3fa09515ef226b59db74a98b650a9a33af6a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-13T18:56:12 + Monotone-Branch: ca.inverse.sogo + commit 80157e54edef8a677ff0288fce9f0f3f26148786 Author: Francis Lachapelle Date: Wed Jul 13 18:55:44 2011 +0000 @@ -24784,6 +31756,22 @@ M SoObjects/Mailer/SOGoMailFolder.h M SoObjects/Mailer/SOGoMailFolder.m M UI/MailerUI/UIxMailFolderActions.m +commit 450bee630bf09f08f20c82dbac619144074560e7 +Merge: 70b1bcf 0a62093 +Author: Wolfgang Sourdeau +Date: Wed Jul 13 18:55:30 2011 +0000 + + merge of 'c0c2dbe64a9eb612995c7e7a7f9136a8f379a460' + and 'c52ae4fd9b519a5566870dacce59fc91211a2b58' + + Monotone-Parent: c0c2dbe64a9eb612995c7e7a7f9136a8f379a460 + Monotone-Parent: c52ae4fd9b519a5566870dacce59fc91211a2b58 + Monotone-Revision: e3a0cebd32124aa09d35255a3e302efd4805257e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-13T18:55:30 + Monotone-Branch: ca.inverse.sogo + commit 0a6209300c4b017ab98550d2a8a356cccb6a17bb Author: Wolfgang Sourdeau Date: Wed Jul 13 18:55:16 2011 +0000 @@ -24811,6 +31799,22 @@ Date: Wed Jul 13 18:24:32 2011 +0000 M SoObjects/Mailer/SOGoMailAccount.m +commit 70b1bcf1f7a0df6632d3486c01da0469e43101e7 +Merge: b72c888 3eb03e7 +Author: Francis Lachapelle +Date: Wed Jul 13 16:07:26 2011 +0000 + + merge of '70051a0aa508a30cbd35bb7376efce8a3d826fba' + and 'cf0bf1453ddf93b100f4c44465b8b4ede251cf8e' + + Monotone-Parent: 70051a0aa508a30cbd35bb7376efce8a3d826fba + Monotone-Parent: cf0bf1453ddf93b100f4c44465b8b4ede251cf8e + Monotone-Revision: c0c2dbe64a9eb612995c7e7a7f9136a8f379a460 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-13T16:07:26 + Monotone-Branch: ca.inverse.sogo + commit b72c8881453efc95b0e870d1304e57e1059f249d Author: Francis Lachapelle Date: Wed Jul 13 16:06:29 2011 +0000 @@ -24861,6 +31865,22 @@ M OpenChange/MAPIStoreContext.h M OpenChange/MAPIStoreContext.m M OpenChange/MAPIStoreSOGo.m +commit 1944ce4b5c9c5fc0c466503c5471a8d61b14f7d5 +Merge: 6bd3aa1 f47d22f +Author: Wolfgang Sourdeau +Date: Wed Jul 13 13:16:44 2011 +0000 + + merge of '60d25b994a09cdf59d84fc33832800e5bd16d86b' + and 'c8fd48b8c8d9b7448bdeed036dda351e575cb5df' + + Monotone-Parent: 60d25b994a09cdf59d84fc33832800e5bd16d86b + Monotone-Parent: c8fd48b8c8d9b7448bdeed036dda351e575cb5df + Monotone-Revision: b603e0a3e30f24330cb136471c6dc9798ffe1ba5 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-13T13:16:44 + Monotone-Branch: ca.inverse.sogo + commit f47d22f19ff6306306826a5ac4b89fb2c0ab7853 Author: Wolfgang Sourdeau Date: Tue Jul 12 21:59:04 2011 +0000 @@ -24954,6 +31974,38 @@ Date: Fri Jul 8 18:20:40 2011 +0000 M Documentation/SOGo Installation Guide.odt +commit 03a24e975c4522d3e8e9ce64c9e1fea161ab7b26 +Merge: ec9bf41 8a2abef +Author: Francis Lachapelle +Date: Fri Jul 8 18:20:20 2011 +0000 + + merge of '304e8f6c84c26183519edb2d9637464eb574b2a3' + and '8e645f6ce572b9b56929f17f32c93a52e98cef27' + + Monotone-Parent: 304e8f6c84c26183519edb2d9637464eb574b2a3 + Monotone-Parent: 8e645f6ce572b9b56929f17f32c93a52e98cef27 + Monotone-Revision: f7b3bc3a62d5041c2f58506bd72a980d36e0720a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-08T18:20:20 + Monotone-Branch: ca.inverse.sogo + +commit ec9bf4138dbace19768ca54d695f0437a0329194 +Merge: 5623714 3d3a5e3 +Author: Francis Lachapelle +Date: Fri Jul 8 17:38:59 2011 +0000 + + merge of '7c22447764e780a8dae1012384128eed67ba6a5c' + and 'c2868ffdea9d34b226e1f85e0a8de47117a91bb5' + + Monotone-Parent: 7c22447764e780a8dae1012384128eed67ba6a5c + Monotone-Parent: c2868ffdea9d34b226e1f85e0a8de47117a91bb5 + Monotone-Revision: 304e8f6c84c26183519edb2d9637464eb574b2a3 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-08T17:38:59 + Monotone-Branch: ca.inverse.sogo + commit 3d3a5e37baf00475c877fa05d6c8de4e8e051fa5 Author: Francis Lachapelle Date: Fri Jul 8 17:38:27 2011 +0000 @@ -25003,6 +32055,22 @@ M UI/Scheduler/UIxCalendarSelector.m M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/UIxCalendarProperties.js +commit 6e0dc80c1f5671513af4845ec87568541c5d34f4 +Merge: e1daba3 897d95a +Author: Francis Lachapelle +Date: Fri Jul 8 15:42:20 2011 +0000 + + merge of '19d23c85306b1d118c275902d56124e34314598d' + and '325d8e22268cbd75d66e3f82c06021870134a88b' + + Monotone-Parent: 19d23c85306b1d118c275902d56124e34314598d + Monotone-Parent: 325d8e22268cbd75d66e3f82c06021870134a88b + Monotone-Revision: 4ada003303186187c511ea7faea08604da6b3db4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-08T15:42:20 + Monotone-Branch: ca.inverse.sogo + commit e1daba320a6de787d9e4df7e25c7163fbb21f9d4 Author: Wolfgang Sourdeau Date: Tue Jul 12 04:23:43 2011 +0000 @@ -25019,6 +32087,38 @@ M OpenChange/MAPIStoreSOGo.m M OpenChange/MAPIStoreTable.h M OpenChange/MAPIStoreTable.m +commit 7a3300829f710206e5b6ec9b66a25042ecb7aef9 +Merge: a2f242a b6bd0c4 +Author: Wolfgang Sourdeau +Date: Tue Jul 12 04:21:22 2011 +0000 + + merge of '7624d5a942129f2c8c6c2c4fd80d29b937bf470d' + and '8c19f19f3be5a4b6fb34ceeaab91ee58b54610d1' + + Monotone-Parent: 7624d5a942129f2c8c6c2c4fd80d29b937bf470d + Monotone-Parent: 8c19f19f3be5a4b6fb34ceeaab91ee58b54610d1 + Monotone-Revision: 07c1acd90de17a7e8f0064aff341a4244b2f090b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-12T04:21:22 + Monotone-Branch: ca.inverse.sogo + +commit a2f242aab0a73368d6866f9892b41d9e8fd4dd4b +Merge: a40357f c2c7125 +Author: Wolfgang Sourdeau +Date: Mon Jul 11 21:41:17 2011 +0000 + + merge of 'c0509d9d92c69255be6d27969b4f578739e78c7f' + and 'df9680caaa44b795268f4691b92890bc37f8ee3f' + + Monotone-Parent: c0509d9d92c69255be6d27969b4f578739e78c7f + Monotone-Parent: df9680caaa44b795268f4691b92890bc37f8ee3f + Monotone-Revision: 7624d5a942129f2c8c6c2c4fd80d29b937bf470d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-11T21:41:17 + Monotone-Branch: ca.inverse.sogo + commit c2c71256429d7892e696a9689932705b50c03d70 Author: Wolfgang Sourdeau Date: Mon Jul 11 21:40:47 2011 +0000 @@ -25464,6 +32564,38 @@ Date: Tue Jul 5 16:26:43 2011 +0000 M ChangeLog M UI/WebServerResources/SchedulerUI.js +commit a2fd647e6b866afb99018a99410aa2d98f4d9046 +Merge: 4cb801e 47c2e28 +Author: Francis Lachapelle +Date: Tue Jul 5 15:02:35 2011 +0000 + + merge of '481f036bf9f97f5236dcd28ebf7f4f8603922ae9' + and 'ce7093281da83495afea3f495c1f92445cb9898e' + + Monotone-Parent: 481f036bf9f97f5236dcd28ebf7f4f8603922ae9 + Monotone-Parent: ce7093281da83495afea3f495c1f92445cb9898e + Monotone-Revision: e40b55179af993121232d5ca1e744fb7405888e8 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-07-05T15:02:35 + Monotone-Branch: ca.inverse.sogo + +commit 47c2e28640e36e31c6f013ccce37f3c28b29980f +Merge: b87a7ce c0d0b65 +Author: Ludovic Marcotte +Date: Tue Jul 5 20:25:13 2011 +0000 + + merge of '3f570612955fe5748f947cb46b0d25c731f1bffb' + and 'a3f1c656d74d4c83ed4a4c27370063c474942f29' + + Monotone-Parent: 3f570612955fe5748f947cb46b0d25c731f1bffb + Monotone-Parent: a3f1c656d74d4c83ed4a4c27370063c474942f29 + Monotone-Revision: ce7093281da83495afea3f495c1f92445cb9898e + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-07-05T20:25:13 + Monotone-Branch: ca.inverse.sogo + commit b87a7ceeacf6cfc078632b272fbacc5285589e37 Author: Ludovic Marcotte Date: Tue Jul 5 20:10:45 2011 +0000 @@ -25639,6 +32771,22 @@ M UI/Templates/SOGoACLRussianRemovalAdvisory.wox M UI/Templates/SOGoFolderRussianAdditionAdvisory.wox M UI/Templates/SOGoFolderRussianRemovalAdvisory.wox +commit c0d0b65a9f4e7c689d2f731dbb5c78afef306470 +Merge: 05e20a6 df61576 +Author: Wolfgang Sourdeau +Date: Tue Jul 5 00:27:41 2011 +0000 + + merge of '6a276a3a3ea0a9b3f1f8f69464b4b6058b639b18' + and 'd7fa74829c523fd87dd6cb456ed8fb4b12564db0' + + Monotone-Parent: 6a276a3a3ea0a9b3f1f8f69464b4b6058b639b18 + Monotone-Parent: d7fa74829c523fd87dd6cb456ed8fb4b12564db0 + Monotone-Revision: a3f1c656d74d4c83ed4a4c27370063c474942f29 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-07-05T00:27:41 + Monotone-Branch: ca.inverse.sogo + commit 7dabb5bd712bbcaca208fceb4dff8db2dc99f857 Author: Ludovic Marcotte Date: Sat Jul 2 13:22:34 2011 +0000 @@ -25731,6 +32879,22 @@ Date: Wed Jun 29 17:44:03 2011 +0000 M ChangeLog +commit 613dc575dfefdedae1e9ee20a6110a8f5acc212e +Merge: 7e720da 94e9356 +Author: Ludovic Marcotte +Date: Wed Jun 29 17:43:38 2011 +0000 + + merge of 'd51bb1b592f986d2e34036c3dad0c70f43f0150a' + and 'da71a89c98fc467cc01710a03c0654176bc8b0fe' + + Monotone-Parent: d51bb1b592f986d2e34036c3dad0c70f43f0150a + Monotone-Parent: da71a89c98fc467cc01710a03c0654176bc8b0fe + Monotone-Revision: 19d6588c4dfb7220f7b5d02e619c02259029cabb + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-06-29T17:43:38 + Monotone-Branch: ca.inverse.sogo + commit 7e720da571276ef37c1db938549e8c9a95a4cb15 Author: Ludovic Marcotte Date: Wed Jun 29 17:43:10 2011 +0000 @@ -25758,6 +32922,22 @@ M Tools/SOGoTool.h M Tools/SOGoTool.m A Tools/SOGoToolUserPreferences.m +commit 94e93561d1e9cff016f0464efcbd1e6437f00458 +Merge: f44212f 4a1e597 +Author: Jean Raby +Date: Mon Jun 27 22:44:21 2011 +0000 + + merge of '178cf4e5311729ac333305676b5ad2aa35a7ca71' + and 'da943d19b66326d6a44506dad61363238c96ca37' + + Monotone-Parent: 178cf4e5311729ac333305676b5ad2aa35a7ca71 + Monotone-Parent: da943d19b66326d6a44506dad61363238c96ca37 + Monotone-Revision: da71a89c98fc467cc01710a03c0654176bc8b0fe + + Monotone-Author: jraby@inverse.ca + Monotone-Date: 2011-06-27T22:44:21 + Monotone-Branch: ca.inverse.sogo + commit 4a1e59744dd00e35bae6c32b44a3708113b3bdfe Author: Jean Raby Date: Mon Jun 27 22:43:48 2011 +0000 @@ -25808,6 +32988,22 @@ M UI/MainUI/SOGoUserHomePage.m M UI/Templates/MainUI/SOGoRootPage.wox M UI/WebServerResources/SOGoRootPage.js +commit abbffe774057fa944a5d0e4a50a030e7ff4a25e1 +Merge: 4d288c9 e0f6982 +Author: Wolfgang Sourdeau +Date: Thu Jun 23 20:04:46 2011 +0000 + + merge of '62a7456859ae701daeb595d318eaba439c816312' + and '94b9cd9ca57eca41ee588c8d41da668682bdb1d0' + + Monotone-Parent: 62a7456859ae701daeb595d318eaba439c816312 + Monotone-Parent: 94b9cd9ca57eca41ee588c8d41da668682bdb1d0 + Monotone-Revision: c0fdc871e5cf2faadbed16ce1c4275647d0928b4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-06-23T20:04:46 + Monotone-Branch: ca.inverse.sogo + commit e0f6982de2e5ed406f499ac305fc565dcf2eac6f Author: Ludovic Marcotte Date: Thu Jun 23 19:09:01 2011 +0000 @@ -26105,6 +33301,22 @@ Date: Fri Jun 17 20:57:17 2011 +0000 M ChangeLog M SOPE/NGCards/iCalEvent.m +commit 8d93ffce6df59596c93b464ca75e0902b9f0e871 +Merge: 70dfe9a 310c6af +Author: Ludovic Marcotte +Date: Fri Jun 17 13:19:18 2011 +0000 + + merge of '8ac94a78bb2ff47a9c8c93921883f5d1ed948bae' + and '95fd526cbec8bccb226bbd63d3442c7d12061aa3' + + Monotone-Parent: 8ac94a78bb2ff47a9c8c93921883f5d1ed948bae + Monotone-Parent: 95fd526cbec8bccb226bbd63d3442c7d12061aa3 + Monotone-Revision: a1ae082f345f010ed0903ee2ac6873682313ca49 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-06-17T13:19:18 + Monotone-Branch: ca.inverse.sogo + commit 70dfe9a7826818202435b88693a1fb9633d27ea8 Author: Wolfgang Sourdeau Date: Thu Jun 16 18:47:37 2011 +0000 @@ -26256,6 +33468,22 @@ M ChangeLog A OpenChange/MAPIStoreSpoolerContext.h A OpenChange/MAPIStoreSpoolerContext.m +commit 7a4c4df9a75fafaebdfc1d82f216835dc72e17c2 +Merge: 7dd0f45 59f03d6 +Author: Francis Lachapelle +Date: Tue Jun 14 13:15:51 2011 +0000 + + merge of 'b0c7b4b626567d13058b5a3e35a0d9854a4459eb' + and 'c7e5e47c096416ee9cd8e6c7c86cab9483739027' + + Monotone-Parent: b0c7b4b626567d13058b5a3e35a0d9854a4459eb + Monotone-Parent: c7e5e47c096416ee9cd8e6c7c86cab9483739027 + Monotone-Revision: 063d3ecd7926ad37de863baa4d97b7dc9fac9283 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-06-14T13:15:51 + Monotone-Branch: ca.inverse.sogo + commit 7dd0f45f31497bc7f32c8259a8eed7a8dd8e1863 Author: Wolfgang Sourdeau Date: Wed Jun 15 14:04:51 2011 +0000 @@ -26387,6 +33615,22 @@ Date: Wed Jun 8 20:30:21 2011 +0000 M ChangeLog M UI/WebServerResources/MailerUI.js +commit 7329498b8be9832e6757afd115acc40f8323b6a1 +Merge: 2974a91 71f9228 +Author: Francis Lachapelle +Date: Tue Jun 7 14:03:43 2011 +0000 + + merge of '06779f0bbfe40e7611b69790cf2eff4809382438' + and 'a92e5913badf5a71e06b1253bb3137e83d7ad34e' + + Monotone-Parent: 06779f0bbfe40e7611b69790cf2eff4809382438 + Monotone-Parent: a92e5913badf5a71e06b1253bb3137e83d7ad34e + Monotone-Revision: 64282771e1fb25846e93ccef41b7198b11c569f6 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-06-07T14:03:43 + Monotone-Branch: ca.inverse.sogo + commit 2974a91c5ed296948f881a78f065af2af2f002fc Author: Wolfgang Sourdeau Date: Tue Jun 7 00:17:46 2011 +0000 @@ -26596,6 +33840,22 @@ M ChangeLog M OpenChange/SOGoMAPIFSMessage.h M OpenChange/SOGoMAPIFSMessage.m +commit 41076b397fbf860505c188311c6178ff45d526ba +Merge: 4cd03b3 a5614e9 +Author: Wolfgang Sourdeau +Date: Sat Jun 4 00:03:42 2011 +0000 + + merge of '47c78c5b5ba20e869ca5d21c7e0575d6f8a0ea6b' + and '70abddfe36eb868aa185ad5ad7f41e1c8fe7ee9c' + + Monotone-Parent: 47c78c5b5ba20e869ca5d21c7e0575d6f8a0ea6b + Monotone-Parent: 70abddfe36eb868aa185ad5ad7f41e1c8fe7ee9c + Monotone-Revision: fb3ae1be0d4c0ad6fd7491bea70eefa829243ad4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-06-04T00:03:42 + Monotone-Branch: ca.inverse.sogo + commit a5614e93f55ea115be9ce22ffd17d7031fce34f3 Author: Wolfgang Sourdeau Date: Fri Jun 3 23:59:02 2011 +0000 @@ -27073,6 +34333,22 @@ M SOPE/GDLContentStore/ChangeLog M SOPE/GDLContentStore/GCSFolder.h M SOPE/GDLContentStore/GCSFolder.m +commit 5ccb4ffa2fae7a5b6f1cc16f136717472439f5b4 +Merge: 8dfda28 68cb4e4 +Author: Wolfgang Sourdeau +Date: Mon May 30 21:16:09 2011 +0000 + + merge of 'c65e5de16bdce7bebdde2adc5fd2504e2066e9f2' + and 'cdffa33720324e664e37834e059eaa9964d13092' + + Monotone-Parent: c65e5de16bdce7bebdde2adc5fd2504e2066e9f2 + Monotone-Parent: cdffa33720324e664e37834e059eaa9964d13092 + Monotone-Revision: e347244635dd06d86b291dac5a5f75e1f9d61eb9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-05-30T21:16:09 + Monotone-Branch: ca.inverse.sogo + commit 8dfda2873f790061e9ce346c82a2edb8ecded496 Author: Wolfgang Sourdeau Date: Mon May 30 21:12:56 2011 +0000 @@ -27864,6 +35140,22 @@ Date: Fri May 6 14:34:10 2011 +0000 M ChangeLog M UI/WebServerResources/UIxPreferences.js +commit a1c6ba05413070c8a3273ed555275b47f4b08d4e +Merge: f78bdb7 ad82477 +Author: Ludovic Marcotte +Date: Thu May 5 18:35:37 2011 +0000 + + merge of '4a2acb99fffd2f82c148ae17571304c2d05b9fba' + and '5760290afb4664dbd9f35d35b065435e8de46131' + + Monotone-Parent: 4a2acb99fffd2f82c148ae17571304c2d05b9fba + Monotone-Parent: 5760290afb4664dbd9f35d35b065435e8de46131 + Monotone-Revision: 56f2ec58d7c4d13a4fd5d2b2ef3d23ebab1cbd4c + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-05-05T18:35:37 + Monotone-Branch: ca.inverse.sogo + commit f78bdb7150aa9cb6fb9880c89cb7bb23cb05fea8 Author: Ludovic Marcotte Date: Thu May 5 18:34:13 2011 +0000 @@ -27964,6 +35256,22 @@ Date: Tue May 3 13:40:10 2011 +0000 M NEWS +commit 7d7bd789471acd72509229f279fb27e78963bf45 +Merge: d1af8b7 f434740 +Author: Ludovic Marcotte +Date: Tue May 3 13:39:48 2011 +0000 + + merge of '53dfb1b04415248644ed626184df1362cd4ee2f1' + and 'e0d3e7be794ca11b0110ce99b943aa8a46a9bb90' + + Monotone-Parent: 53dfb1b04415248644ed626184df1362cd4ee2f1 + Monotone-Parent: e0d3e7be794ca11b0110ce99b943aa8a46a9bb90 + Monotone-Revision: 1464c6c39cc56b3546f7388e70945dfe0e03b3af + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-05-03T13:39:48 + Monotone-Branch: ca.inverse.sogo + commit d1af8b7801a19ccfad2bf0c0625c22435673af0b Author: Jean Raby Date: Tue May 3 12:37:34 2011 +0000 @@ -28057,6 +35365,22 @@ Date: Thu Apr 28 21:59:56 2011 +0000 M UI/WebServerResources/UIxComponentEditor.js +commit be9c57cfd0803c5940aec9cde83af4ab75e7b6ba +Merge: 3683222 39b11e0 +Author: Francis Lachapelle +Date: Thu Apr 28 20:11:38 2011 +0000 + + merge of '6aeeb3251c5dd31e0dac8d1c8470510175e9f5b8' + and '78cbeb2cfe85058b7c9dee2b29c5079d29e518cf' + + Monotone-Parent: 6aeeb3251c5dd31e0dac8d1c8470510175e9f5b8 + Monotone-Parent: 78cbeb2cfe85058b7c9dee2b29c5079d29e518cf + Monotone-Revision: 9b21095125798a3afffd2df7a2d64d32a2e652d5 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-04-28T20:11:38 + Monotone-Branch: ca.inverse.sogo + commit 39b11e06c94c114ba0761398393f4f889138ac3a Author: Francis Lachapelle Date: Thu Apr 28 19:20:18 2011 +0000 @@ -28131,6 +35455,22 @@ Date: Wed Apr 27 14:59:54 2011 +0000 M Documentation/SOGo Installation Guide.odt +commit 0da18c4bf226e49ec7a79f5092990e21c15cc3d3 +Merge: 08654c5 d10d53a +Author: Francis Lachapelle +Date: Tue Apr 26 17:51:36 2011 +0000 + + merge of '48fff7af102a6b39298ffbb7c4da0976ee074625' + and '5bcb309e0f6b76e9e7affc6ec688d4cbd7b5bef4' + + Monotone-Parent: 48fff7af102a6b39298ffbb7c4da0976ee074625 + Monotone-Parent: 5bcb309e0f6b76e9e7affc6ec688d4cbd7b5bef4 + Monotone-Revision: 9b0e70cef01c0afdbc1684211507c86871122671 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-04-26T17:51:36 + Monotone-Branch: ca.inverse.sogo + commit 08654c529942469d4ac5748f95fa7f56e6ea3721 Author: Francis Lachapelle Date: Tue Apr 26 17:51:26 2011 +0000 @@ -28146,6 +35486,22 @@ Date: Tue Apr 26 17:51:26 2011 +0000 M UI/Scheduler/Catalan.lproj/Localizable.strings +commit c9a09cd59ea1cc7801936cbf0e2d2709b72ee38d +Merge: 54a172f 39cdd84 +Author: Francis Lachapelle +Date: Tue Apr 26 15:04:11 2011 +0000 + + merge of '2f66db18c248ef4670f83c5c56b70ab703fede49' + and '8fb65e4ddd95ab6be36dc4834118f0f4c9e565bc' + + Monotone-Parent: 2f66db18c248ef4670f83c5c56b70ab703fede49 + Monotone-Parent: 8fb65e4ddd95ab6be36dc4834118f0f4c9e565bc + Monotone-Revision: 7913b29a66901336702f8f33f2d6c0c1342dd655 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-04-26T15:04:11 + Monotone-Branch: ca.inverse.sogo + commit d10d53ab5fd45891ef380cb6768b2bf9e8efeb16 Author: Ludovic Marcotte Date: Tue Apr 26 13:48:58 2011 +0000 @@ -28291,6 +35647,22 @@ M UI/Scheduler/Hungarian.lproj/Localizable.strings M UI/Scheduler/Spanish.lproj/Localizable.strings M UI/Scheduler/Ukrainian.lproj/Localizable.strings +commit d8efdc3436f7a4a1941a9d615b49473d567a88a3 +Merge: cc1c765 bdc88a6 +Author: Francis Lachapelle +Date: Thu Apr 21 19:27:19 2011 +0000 + + merge of '1e0a79aada7e74e97b4db2b274c9fdbfef57d745' + and 'fc6feb618c03b6dfa0bfcd2661ee4657b47b0759' + + Monotone-Parent: 1e0a79aada7e74e97b4db2b274c9fdbfef57d745 + Monotone-Parent: fc6feb618c03b6dfa0bfcd2661ee4657b47b0759 + Monotone-Revision: 3da6b32037cdcb0fdb7d0c857d09a40ae7c4238e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-04-21T19:27:19 + Monotone-Branch: ca.inverse.sogo + commit cc1c765cd9e5f7a64003f8f202ed3538dacb29eb Author: Francis Lachapelle Date: Thu Apr 21 19:26:52 2011 +0000 @@ -28506,6 +35878,22 @@ M OpenChange/MAPIStoreSOGo.m M OpenChange/MAPIStoreTypes.h M OpenChange/MAPIStoreTypes.m +commit 6e03acd9a8dc7ce7e89eb2e338f14413f058ee8b +Merge: 3cbf76e 5e466cf +Author: Wolfgang Sourdeau +Date: Tue Apr 19 22:06:05 2011 +0000 + + merge of '779e2b1c502021e5eb405fa6e452d4a40ce77b6e' + and 'c4b00c603f23bbc97a3d07724c6b2a4e9361c098' + + Monotone-Parent: 779e2b1c502021e5eb405fa6e452d4a40ce77b6e + Monotone-Parent: c4b00c603f23bbc97a3d07724c6b2a4e9361c098 + Monotone-Revision: b062a471e751aff2d35891675a50d0fff8918047 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-04-19T22:06:05 + Monotone-Branch: ca.inverse.sogo + commit 3cbf76eda65dcf2fbb7208641cdaa541e569f14c Author: Wolfgang Sourdeau Date: Tue Apr 19 21:57:52 2011 +0000 @@ -28584,6 +35972,22 @@ Date: Tue Apr 19 20:39:12 2011 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit c139fe27c4f2afe3b859222b975a62b83cf36cc9 +Merge: d3a9c2a 628af06 +Author: Francis Lachapelle +Date: Tue Apr 19 19:06:53 2011 +0000 + + merge of '2c09693bb8c946283a7305ff62458c9930fc8a9c' + and 'c1c73961c8d9bbf5383d28788200bf3cbbac4e55' + + Monotone-Parent: 2c09693bb8c946283a7305ff62458c9930fc8a9c + Monotone-Parent: c1c73961c8d9bbf5383d28788200bf3cbbac4e55 + Monotone-Revision: 6f81ff5c61f2abaad8d6b69b657abb61e52df9b9 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-04-19T19:06:53 + Monotone-Branch: ca.inverse.sogo + commit d3a9c2af9bc737c9d625b206058b3aa7af5812fd Author: Francis Lachapelle Date: Tue Apr 19 19:06:35 2011 +0000 @@ -28855,6 +36259,22 @@ M OpenChange/GNUmakefile A OpenChange/GNUmakefile.preamble A OpenChange/gen-property-selectors.py +commit fae2c96ac7eba9cc81fe8ef2023d2af8d2ccfd46 +Merge: 62fa111 f17bcbd +Author: Wolfgang Sourdeau +Date: Wed Apr 13 19:42:20 2011 +0000 + + merge of '78cb42a882628f677b3ba5d765444a8e6ce3f071' + and 'a185416cfb05a18befc24458bae35ac50a38eb8c' + + Monotone-Parent: 78cb42a882628f677b3ba5d765444a8e6ce3f071 + Monotone-Parent: a185416cfb05a18befc24458bae35ac50a38eb8c + Monotone-Revision: 673fe4d07a0220bbfe30989c1205e2bd001cabb3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-04-13T19:42:20 + Monotone-Branch: ca.inverse.sogo + commit f17bcbd3fb989ca8277ac36ef45bf52c09c7b61f Author: Wolfgang Sourdeau Date: Wed Apr 13 19:41:58 2011 +0000 @@ -29119,6 +36539,22 @@ Date: Wed Apr 6 15:15:16 2011 +0000 M SoObjects/Mailer/SOGoMailAccount.m +commit 058b83d2b7f0cae0dc0185a670fce2ad9ab2a744 +Merge: a075704 e5c00ca +Author: Wolfgang Sourdeau +Date: Wed Apr 6 15:10:03 2011 +0000 + + merge of '3e2cf200dd5487a3cf4e6d1e92e7134a41e15bd9' + and '90d6b4dbf04d7d63dbfd04cff1465d6913a2ed65' + + Monotone-Parent: 3e2cf200dd5487a3cf4e6d1e92e7134a41e15bd9 + Monotone-Parent: 90d6b4dbf04d7d63dbfd04cff1465d6913a2ed65 + Monotone-Revision: 8f7373eab8917f6c1bd2dab8181cf7a324b54957 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-04-06T15:10:03 + Monotone-Branch: ca.inverse.sogo + commit e5c00caecf2e5e1d9f00b7938adcbc75a72c0937 Author: Wolfgang Sourdeau Date: Wed Apr 6 15:09:41 2011 +0000 @@ -29148,6 +36584,22 @@ Date: Wed Apr 6 09:49:44 2011 +0000 M NEWS +commit ed204705fc46e82220919eecf4c951f92984a494 +Merge: ba4af07 98ecf03 +Author: Wolfgang Sourdeau +Date: Tue Apr 5 23:38:44 2011 +0000 + + merge of '3290fec7b9b44e16eb1c31789fed6f346c0b230e' + and 'c083cec271ea20d6d742941d5e5c8fb824d6416f' + + Monotone-Parent: 3290fec7b9b44e16eb1c31789fed6f346c0b230e + Monotone-Parent: c083cec271ea20d6d742941d5e5c8fb824d6416f + Monotone-Revision: 284a8347693e195968c72b6605fbc076085c97d7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-04-05T23:38:44 + Monotone-Branch: ca.inverse.sogo + commit ba4af07bfc41c20aa7f28da2e8c0d6a97a9c0bf4 Author: Wolfgang Sourdeau Date: Tue Apr 5 23:38:22 2011 +0000 @@ -29454,6 +36906,22 @@ Date: Tue Apr 5 00:43:57 2011 +0000 M ChangeLog M UI/Scheduler/UIxCalListingActions.m +commit 02e551d324898948ce77afc7c6e67097fde0bf75 +Merge: c9afeb9 5ebe3cd +Author: Francis Lachapelle +Date: Mon Apr 4 14:11:45 2011 +0000 + + merge of '4dead0c3c1d9edc0c48e5bfb39f0ec7a89f28007' + and '72688cfe86ab1f4b8c8d1f0a9fab23384d7abaab' + + Monotone-Parent: 4dead0c3c1d9edc0c48e5bfb39f0ec7a89f28007 + Monotone-Parent: 72688cfe86ab1f4b8c8d1f0a9fab23384d7abaab + Monotone-Revision: f84a8ee34fde286386429490ca9126042402c390 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-04-04T14:11:45 + Monotone-Branch: ca.inverse.sogo + commit 5ebe3cdd09530667897bca18796814990762d694 Author: Ludovic Marcotte Date: Mon Apr 4 13:01:20 2011 +0000 @@ -29544,6 +37012,22 @@ Date: Fri Apr 1 19:44:28 2011 +0000 M ChangeLog +commit 3d6309eda4920c571952b47c17838d6409c5392c +Merge: 4e13c0b dadedfa +Author: Wolfgang Sourdeau +Date: Fri Apr 1 19:43:44 2011 +0000 + + merge of 'c37895534ea03712cf65f5760bc535177a041d99' + and 'c9f767434992867f4e642881a1161a8a606c338f' + + Monotone-Parent: c37895534ea03712cf65f5760bc535177a041d99 + Monotone-Parent: c9f767434992867f4e642881a1161a8a606c338f + Monotone-Revision: 50ca38f0849cc20be6979e82924895e7b1c2e27f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-04-01T19:43:44 + Monotone-Branch: ca.inverse.sogo + commit 4e13c0b73cc0120f276e21a31e052ae47f198d21 Author: Wolfgang Sourdeau Date: Fri Apr 1 19:43:11 2011 +0000 @@ -29827,6 +37311,22 @@ Date: Thu Mar 31 21:56:25 2011 +0000 M OpenChange/MAPIStoreContext.m +commit 8aaf4d631c30ded0ca4f1c0892280b4c38fd8a8e +Merge: b170ea7 5b11bbc +Author: Wolfgang Sourdeau +Date: Thu Mar 31 21:55:02 2011 +0000 + + merge of '277192cc101d97ca24773acdb0d3ac5ec0e0a182' + and 'c8f2954fafcf6e28225083320c49c97918ce2a9d' + + Monotone-Parent: 277192cc101d97ca24773acdb0d3ac5ec0e0a182 + Monotone-Parent: c8f2954fafcf6e28225083320c49c97918ce2a9d + Monotone-Revision: 92df195fbe1c4391ea6ee2bda8d4c6df56a3b430 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-03-31T21:55:02 + Monotone-Branch: ca.inverse.sogo + commit b170ea7ebafcf3d4d504e503039feb5273c60681 Author: Wolfgang Sourdeau Date: Thu Mar 31 21:54:25 2011 +0000 @@ -29971,6 +37471,22 @@ Date: Wed Mar 30 15:30:42 2011 +0000 M NEWS +commit 49d81dd25a40b2f9da8d923984717786df9f2a6f +Merge: f630dd1 a5c1ff4 +Author: Francis Lachapelle +Date: Wed Mar 30 15:28:40 2011 +0000 + + merge of '85f004835cf5ba09158bc317c859435dd12fe5bf' + and '9729b5be2f0c489355063a4880107ed09e4479ce' + + Monotone-Parent: 85f004835cf5ba09158bc317c859435dd12fe5bf + Monotone-Parent: 9729b5be2f0c489355063a4880107ed09e4479ce + Monotone-Revision: da4be75bb5b1f8a914c77c86d505e6f7bf587223 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-03-30T15:28:40 + Monotone-Branch: ca.inverse.sogo + commit f630dd1c83c52d8ce85cc622ef72b3bef6e60012 Author: Francis Lachapelle Date: Wed Mar 30 15:21:27 2011 +0000 @@ -30002,6 +37518,22 @@ Date: Wed Mar 30 15:21:23 2011 +0000 M NEWS +commit c0560681dded2434bb20b125b94e4ff772cc0f84 +Merge: e8026e6 d384c3b +Author: Wolfgang Sourdeau +Date: Wed Mar 30 15:02:56 2011 +0000 + + merge of '2f3c94605759601f796021ed2469cb5eb7910364' + and '9b486432ba55fa5e9a8bf8f7172fe57752abf7e1' + + Monotone-Parent: 2f3c94605759601f796021ed2469cb5eb7910364 + Monotone-Parent: 9b486432ba55fa5e9a8bf8f7172fe57752abf7e1 + Monotone-Revision: b3af4618e267496536ae158c684a391e497913f0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-03-30T15:02:56 + Monotone-Branch: ca.inverse.sogo + commit e8026e67c826cd17c2ae94308419c47c1dccdc15 Author: Wolfgang Sourdeau Date: Wed Mar 30 15:01:55 2011 +0000 @@ -30266,6 +37798,22 @@ M SoObjects/SOGo/SOGoFolder.m M SoObjects/SOGo/SOGoGCSFolder.h M SoObjects/SOGo/SOGoGCSFolder.m +commit 8aebcff95bfd194edb924940f707b9c393557402 +Merge: d17c2ed 67d32df +Author: Wolfgang Sourdeau +Date: Thu Mar 24 15:28:28 2011 +0000 + + merge of '4da10cc5d7b04371c2d5f407c3a25e5ae2bce8df' + and 'dfcee5ab2e9d3d65c64801fc45b75ab2a873cfce' + + Monotone-Parent: 4da10cc5d7b04371c2d5f407c3a25e5ae2bce8df + Monotone-Parent: dfcee5ab2e9d3d65c64801fc45b75ab2a873cfce + Monotone-Revision: 5f0b5fde09b45b6e60e9302afb433346dcc0c2b8 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-03-24T15:28:28 + Monotone-Branch: ca.inverse.sogo + commit d17c2ed024940099bc8588f11ad45a780330b992 Author: Wolfgang Sourdeau Date: Thu Mar 24 15:27:53 2011 +0000 @@ -30299,6 +37847,22 @@ Date: Thu Mar 24 14:43:52 2011 +0000 M SOPE/NGCards/iCalTimeZone.m M UI/PreferencesUI/UIxPreferences.m +commit 73e41f02dd46fcafa2bd35eeca84c278a21f7b5b +Merge: aa4e432 110c265 +Author: Francis Lachapelle +Date: Thu Mar 24 14:13:53 2011 +0000 + + merge of '21262e234ec2e4a3a624015145a439b940b5da40' + and '380b86e5c0d4f7e3c452e904f2a11e814e95ee59' + + Monotone-Parent: 21262e234ec2e4a3a624015145a439b940b5da40 + Monotone-Parent: 380b86e5c0d4f7e3c452e904f2a11e814e95ee59 + Monotone-Revision: ee0810b737d9d978b856ca04e9102d7985d6bf82 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-03-24T14:13:53 + Monotone-Branch: ca.inverse.sogo + commit 110c26578fedf746fcdec40387deebca0d9f83f5 Author: Francis Lachapelle Date: Thu Mar 24 14:11:48 2011 +0000 @@ -30395,6 +37959,22 @@ M SOPE/NGCards/iCalTimeZone.h M SOPE/NGCards/iCalTimeZone.m M UI/PreferencesUI/UIxPreferences.m +commit d7d8c7a7f5c693e3e4c02556c0d4021a95283cb1 +Merge: f0b9038 4e7e040 +Author: Francis Lachapelle +Date: Wed Mar 23 11:59:21 2011 +0000 + + merge of '2c72ee27838cb086c9f9538bdfd088d48c551532' + and 'b225fa0fff99cfbcbe27145aabf8fdfde0810371' + + Monotone-Parent: 2c72ee27838cb086c9f9538bdfd088d48c551532 + Monotone-Parent: b225fa0fff99cfbcbe27145aabf8fdfde0810371 + Monotone-Revision: 75bbc0ad243d66dd412883811d759ca8dabf6776 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-03-23T11:59:21 + Monotone-Branch: ca.inverse.sogo + commit 4e7e0403b737b0cd793fa5aaeb72dbb697125f5d Author: Francis Lachapelle Date: Wed Mar 23 11:28:36 2011 +0000 @@ -30411,6 +37991,22 @@ Date: Wed Mar 23 11:28:36 2011 +0000 M SOPE/NGCards/ChangeLog M SOPE/NGCards/iCalRepeatableEntityObject.m +commit f0b9038b752a066d8212f3c210039013368dd2ae +Merge: 8c26a74 4c10790 +Author: Wolfgang Sourdeau +Date: Tue Mar 22 21:33:48 2011 +0000 + + merge of 'b4cd488f57719689e0d2bed481d82df8e68fcf46' + and 'd4aaec9a2984bf8eb954d457c1dde92899b63a7a' + + Monotone-Parent: b4cd488f57719689e0d2bed481d82df8e68fcf46 + Monotone-Parent: d4aaec9a2984bf8eb954d457c1dde92899b63a7a + Monotone-Revision: 2c72ee27838cb086c9f9538bdfd088d48c551532 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-03-22T21:33:48 + Monotone-Branch: ca.inverse.sogo + commit 8c26a74bf5afcc80178ecb149f2d8936d9d008d7 Author: Wolfgang Sourdeau Date: Tue Mar 22 21:28:16 2011 +0000 @@ -31002,6 +38598,22 @@ M ChangeLog M UI/MailerUI/UIxMailListActions.m M UI/MailerUI/product.plist +commit 3e2d20947c27d8b33cbbfa0c0abf06670fbd808e +Merge: 8c7d80b 48e8b7b +Author: Wolfgang Sourdeau +Date: Tue Mar 15 17:12:05 2011 +0000 + + merge of '7dba10bc15c3a16348c5fd263d5aeea5ee17d063' + and 'a0b3d112eca99119d0e99fa3a948f74e17a73249' + + Monotone-Parent: 7dba10bc15c3a16348c5fd263d5aeea5ee17d063 + Monotone-Parent: a0b3d112eca99119d0e99fa3a948f74e17a73249 + Monotone-Revision: 0a48d70dd58905fd233548415a50a48cf1114607 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-03-15T17:12:05 + Monotone-Branch: ca.inverse.sogo + commit 48e8b7bfab740fa654b0528d3f849bb49d86746d Author: Wolfgang Sourdeau Date: Tue Mar 15 17:03:24 2011 +0000 @@ -31018,6 +38630,22 @@ M SOPE/NGCards/NSString+NGCards.m M SOPE/NGCards/versitCardsSaxDriver/ChangeLog M SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m +commit 8c7d80bc57e2de41093d3c57e4057e6c9b52892d +Merge: d1e4cd9 3dcb595 +Author: Francis Lachapelle +Date: Fri Mar 11 20:06:52 2011 +0000 + + merge of '39ce1fba9746592044921a256d39e922dc2153d8' + and 'e3951f85165fbcdda1e4339ca3625cd4f4fbcf9f' + + Monotone-Parent: 39ce1fba9746592044921a256d39e922dc2153d8 + Monotone-Parent: e3951f85165fbcdda1e4339ca3625cd4f4fbcf9f + Monotone-Revision: 7dba10bc15c3a16348c5fd263d5aeea5ee17d063 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-03-11T20:06:52 + Monotone-Branch: ca.inverse.sogo + commit 3dcb595c5adbdb227f905df732974fea82658c86 Author: Francis Lachapelle Date: Fri Mar 11 20:06:38 2011 +0000 @@ -31986,6 +39614,22 @@ Date: Tue Feb 22 20:29:04 2011 +0000 M ChangeLog M UI/Scheduler/UIxCalListingActions.m +commit a015307d4e69ecec1c9e6de8ce2e3e8d21df13c0 +Merge: 4ec6ab9 6f7e03b +Author: Francis Lachapelle +Date: Thu Feb 17 22:37:16 2011 +0000 + + merge of '392bdd6ba9c324042c23ae3d8e26d2d328da895f' + and '41bb79702e5e49315aa6313331d91aaf5357ff5f' + + Monotone-Parent: 392bdd6ba9c324042c23ae3d8e26d2d328da895f + Monotone-Parent: 41bb79702e5e49315aa6313331d91aaf5357ff5f + Monotone-Revision: 4e80269c9a4c19167cb40423b5d143cad86c7adf + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-02-17T22:37:16 + Monotone-Branch: ca.inverse.sogo + commit 6f7e03bbd31d58a92e23609a2155d56bb7a7f24b Author: Francis Lachapelle Date: Thu Feb 17 22:12:04 2011 +0000 @@ -32057,6 +39701,22 @@ M Tools/sogo-ealarms-notify.m M Tools/sogo-slapd-sockd.m M Tools/sogo-tool.m +commit 9113ad10c561545c63c7c3eb3570628aa9fe29b3 +Merge: 6a65eb3 4933913 +Author: Ludovic Marcotte +Date: Thu Feb 17 20:05:14 2011 +0000 + + merge of '1a11794c7fbd8ad9ba3eff5fdc2d1716a84efb62' + and '50142b417b19ad36d3c63bd36b61105185f0efc0' + + Monotone-Parent: 1a11794c7fbd8ad9ba3eff5fdc2d1716a84efb62 + Monotone-Parent: 50142b417b19ad36d3c63bd36b61105185f0efc0 + Monotone-Revision: 5b2bc8f17ae0dbc785abcc143ebf3cd49d100698 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-02-17T20:05:14 + Monotone-Branch: ca.inverse.sogo + commit 4933913b4f70b8e64582b471dd6420bd6a594e6c Author: Francis Lachapelle Date: Wed Feb 16 14:34:54 2011 +0000 @@ -32102,6 +39762,38 @@ Date: Tue Feb 15 19:00:40 2011 +0000 M ChangeLog M SoObjects/Appointments/SOGoCalendarComponent.m +commit 2d3b7d8bd07e646331d50e9a0e55b08da834e300 +Merge: 95527fd c248845 +Author: Ludovic Marcotte +Date: Tue Feb 15 18:42:47 2011 +0000 + + merge of '965e5b9c7ec2a2d90948e6cd8a6cb2b4dd7b6159' + and 'c9ec5e37f4a0b75a5c85ecbbd8d238cc64a99cd3' + + Monotone-Parent: 965e5b9c7ec2a2d90948e6cd8a6cb2b4dd7b6159 + Monotone-Parent: c9ec5e37f4a0b75a5c85ecbbd8d238cc64a99cd3 + Monotone-Revision: 2c4d3e7457a36602400b6dd3bfb34b34fa47e606 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2011-02-15T18:42:47 + Monotone-Branch: ca.inverse.sogo + +commit 95527fda039843d8b74b43ce341a2f7a498281d3 +Merge: 9ce08f0 86f3455 +Author: Wolfgang Sourdeau +Date: Mon Feb 14 23:44:59 2011 +0000 + + merge of '2ec967e2199c437328dde8da267393b6e0d4722b' + and '42c7ffe1a106a44025c36523e969a629541821f7' + + Monotone-Parent: 2ec967e2199c437328dde8da267393b6e0d4722b + Monotone-Parent: 42c7ffe1a106a44025c36523e969a629541821f7 + Monotone-Revision: 965e5b9c7ec2a2d90948e6cd8a6cb2b4dd7b6159 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-02-14T23:44:59 + Monotone-Branch: ca.inverse.sogo + commit 86f34550709b2f0b1f6f81f4b8fc17b35299823b Author: Wolfgang Sourdeau Date: Mon Feb 14 23:44:47 2011 +0000 @@ -32461,6 +40153,22 @@ Date: Thu Feb 10 17:48:54 2011 +0000 M ChangeLog M OpenChange/MAPIStoreMessageTable.m +commit 93883be6b27198c52c304e7a53e12e8558cad7a2 +Merge: a74ce11 01809f8 +Author: Wolfgang Sourdeau +Date: Thu Feb 10 17:47:57 2011 +0000 + + merge of '23f1f1841b0ca1de79b952a793ed0513208ab6a9' + and 'e17ff3ca502603ccbe42d56d57ebb7296305b48c' + + Monotone-Parent: 23f1f1841b0ca1de79b952a793ed0513208ab6a9 + Monotone-Parent: e17ff3ca502603ccbe42d56d57ebb7296305b48c + Monotone-Revision: 0a822e8612a60bc6426276297a9e2061a1ec46ca + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-02-10T17:47:57 + Monotone-Branch: ca.inverse.sogo + commit a74ce11a7f29c34d6ac40d2c7078071d8abf3d19 Author: Wolfgang Sourdeau Date: Thu Feb 10 17:46:47 2011 +0000 @@ -32476,6 +40184,22 @@ M ChangeLog M OpenChange/NSArray+MAPIStore.h M OpenChange/NSArray+MAPIStore.m +commit 01809f8f83cc089b07b8ded96f735c57bb5f9612 +Merge: 796b0d1 61ea724 +Author: Wolfgang Sourdeau +Date: Wed Feb 9 23:13:27 2011 +0000 + + merge of '5b8c9a975efb96fc96a08343f310f9663d602405' + and '9c93be42dce13d70eb5f0bc31e7ff8fff3aa82c3' + + Monotone-Parent: 5b8c9a975efb96fc96a08343f310f9663d602405 + Monotone-Parent: 9c93be42dce13d70eb5f0bc31e7ff8fff3aa82c3 + Monotone-Revision: e17ff3ca502603ccbe42d56d57ebb7296305b48c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-02-09T23:13:27 + Monotone-Branch: ca.inverse.sogo + commit 61ea724f60ba3ebdb90ccba117d7980332956ad6 Author: Wolfgang Sourdeau Date: Wed Feb 9 23:11:28 2011 +0000 @@ -32943,6 +40667,22 @@ M OpenChange/MAPIStoreContext.h M OpenChange/MAPIStoreContext.m M OpenChange/MAPIStoreSOGo.m +commit 36a03a0e5c5523cbc93ea419a7c99c304f1d7b8b +Merge: 31d710c 952404d +Author: Wolfgang Sourdeau +Date: Thu Feb 3 22:09:45 2011 +0000 + + merge of '02eeec72548ff817666ea01fd17816eeaf1aa802' + and 'ade57d95f9e3d9e8015757ea30d104d416c32d67' + + Monotone-Parent: 02eeec72548ff817666ea01fd17816eeaf1aa802 + Monotone-Parent: ade57d95f9e3d9e8015757ea30d104d416c32d67 + Monotone-Revision: 48706c943fa3ceb72288194c22bfec223fb4a890 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2011-02-03T22:09:45 + Monotone-Branch: ca.inverse.sogo + commit 952404d05fa432a8442f63c5543a2d8749f53988 Author: Wolfgang Sourdeau Date: Thu Feb 3 22:09:41 2011 +0000 @@ -32977,6 +40717,22 @@ M Documentation/SOGo Mozilla Thunderbird Configuration.odt M Documentation/inverse.jpg M UI/WebServerResources/inverse.png +commit 244fab36d67039da631c8fd693d33d51dbbaf14d +Merge: 7bbbffd b667780 +Author: Francis Lachapelle +Date: Thu Feb 3 18:51:16 2011 +0000 + + merge of '887c25db6d397495f0b51cedfe52e01f2315a1db' + and 'a830e73fbed57c6ef30ede64ea5bfa6d85af8f74' + + Monotone-Parent: 887c25db6d397495f0b51cedfe52e01f2315a1db + Monotone-Parent: a830e73fbed57c6ef30ede64ea5bfa6d85af8f74 + Monotone-Revision: 6d0fa6e2fd8ea58ea9fdb11b3d3140f9f8c58538 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-02-03T18:51:16 + Monotone-Branch: ca.inverse.sogo + commit 7bbbffd566a4cabec290646d0fa2f08f3a827bd9 Author: Francis Lachapelle Date: Thu Feb 3 18:49:48 2011 +0000 @@ -33363,6 +41119,22 @@ M SOPE/NGCards/iCalRepeatableEntityObject.m M SoObjects/Appointments/SOGoAppointmentFolder.m M SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m +commit db851140d480467c6534851a254fdc592496548f +Merge: 2c8744d f43d85b +Author: Francis Lachapelle +Date: Fri Jan 14 15:35:46 2011 +0000 + + merge of '8ae1b0b4d89d23b2996f0b95677ca5599649f47b' + and 'bc91dad52acb790e0e4511b1b3ac70a21efd53fb' + + Monotone-Parent: 8ae1b0b4d89d23b2996f0b95677ca5599649f47b + Monotone-Parent: bc91dad52acb790e0e4511b1b3ac70a21efd53fb + Monotone-Revision: b6726f7b87c51426fc4fa2e3ed33d20cb47a89e0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-01-14T15:35:46 + Monotone-Branch: ca.inverse.sogo + commit 2c8744dcb09798f547c43ae9c23cdef1dcdb11d5 Author: Francis Lachapelle Date: Fri Jan 14 15:33:20 2011 +0000 @@ -33454,6 +41226,22 @@ M SoObjects/Appointments/iCalEvent+SOGo.m M SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m M UI/Scheduler/UIxCalListingActions.m +commit b6bc06b163c43fa8830964d0f7668b27bfe1e337 +Merge: e2114f2 7ec5d97 +Author: Francis Lachapelle +Date: Thu Jan 13 16:21:40 2011 +0000 + + merge of 'ac24628ddb44dde266a92404e39060e7941fa959' + and 'c284de68225198e750f24bf15d220c2e6a7c20e2' + + Monotone-Parent: ac24628ddb44dde266a92404e39060e7941fa959 + Monotone-Parent: c284de68225198e750f24bf15d220c2e6a7c20e2 + Monotone-Revision: 8f58a8aa696d8fbbb82f1cd571800676a04b96af + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-01-13T16:21:40 + Monotone-Branch: ca.inverse.sogo + commit e2114f22b11df708fdf8d0ba901dbfe47d079609 Author: Francis Lachapelle Date: Thu Jan 13 16:21:32 2011 +0000 @@ -33781,6 +41569,22 @@ Date: Thu Jan 6 03:18:38 2011 +0000 M ChangeLog M OpenChange/SOGoContactGCSEntry+MAPIStore.m +commit f46466164cdcb5b9383ed74bc37eedd744fbeff9 +Merge: ddc8577 be67998 +Author: Francis Lachapelle +Date: Wed Jan 5 22:51:57 2011 +0000 + + merge of 'a3ff389774d4c793b5970d4691cb8738d9f83e70' + and 'f661875c0ea83ef886f78e3b498bc05b1d105e9a' + + Monotone-Parent: a3ff389774d4c793b5970d4691cb8738d9f83e70 + Monotone-Parent: f661875c0ea83ef886f78e3b498bc05b1d105e9a + Monotone-Revision: 6bf607a80d572f2c918d9796375bba09943229cc + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-01-05T22:51:57 + Monotone-Branch: ca.inverse.sogo + commit ddc8577b1daa7d428c36a51b666603be2c08de9f Author: Francis Lachapelle Date: Wed Jan 5 22:11:35 2011 +0000 @@ -33815,6 +41619,22 @@ M Documentation/SOGo Installation Guide.odt M SoObjects/SOGo/SQLSource.h M SoObjects/SOGo/SQLSource.m +commit 342010bd72583541374f4d4222bee931bb8d41ac +Merge: 8428eb2 5a1e41d +Author: Francis Lachapelle +Date: Wed Jan 5 19:05:32 2011 +0000 + + merge of '87cdbdef6d83dbc434c03ced31452112ebb2df51' + and 'b92151d1bc5fc823aae0b28dda5a96bed55e476a' + + Monotone-Parent: 87cdbdef6d83dbc434c03ced31452112ebb2df51 + Monotone-Parent: b92151d1bc5fc823aae0b28dda5a96bed55e476a + Monotone-Revision: d7aebce05726f8e7de4e1e755b2143939a487c9e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2011-01-05T19:05:32 + Monotone-Branch: ca.inverse.sogo + commit 8428eb274778d76b0b3ea90072b8cd10bf70ed18 Author: Francis Lachapelle Date: Wed Jan 5 19:04:15 2011 +0000 @@ -34250,6 +42070,22 @@ Date: Thu Dec 30 13:32:23 2010 +0000 M ChangeLog M OpenChange/EOBitmaskQualifier.m +commit 709a8bb78476fac97575660afd829a6095854a5f +Merge: 6906875 e1ce6fd +Author: Wolfgang Sourdeau +Date: Wed Dec 29 21:50:06 2010 +0000 + + merge of '44dd1ae4ceec7361950180a2bf98d14de828b840' + and '496fe62f85a4859664eb4cd520fdd45278bb849a' + + Monotone-Parent: 44dd1ae4ceec7361950180a2bf98d14de828b840 + Monotone-Parent: 496fe62f85a4859664eb4cd520fdd45278bb849a + Monotone-Revision: fb790a4b86faa504859d822223314cd9a2c2d831 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-12-29T21:50:06 + Monotone-Branch: ca.inverse.sogo + commit 6906875cb6f8fcb5364cf70fa4b27081c3528c56 Author: Ludovic Marcotte Date: Wed Dec 29 16:20:01 2010 +0000 @@ -34978,6 +42814,22 @@ Date: Wed Dec 8 19:57:05 2010 +0000 M ChangeLog M UI/WebServerResources/MailerUI.js +commit 6f82f87b42aeb30c0409c16a630095dc585bb1b2 +Merge: ea8e257 ec6556c +Author: Francis Lachapelle +Date: Fri Dec 3 22:34:21 2010 +0000 + + merge of '6cff836762bb35cb6c26ae5eb215e6ff131d480d' + and 'edd8c9a9983a41fcee93052c706158aedf35f7c3' + + Monotone-Parent: 6cff836762bb35cb6c26ae5eb215e6ff131d480d + Monotone-Parent: edd8c9a9983a41fcee93052c706158aedf35f7c3 + Monotone-Revision: 2b28f6d0a82dd762775a558cb05973125df10b61 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-12-03T22:34:21 + Monotone-Branch: ca.inverse.sogo + commit ea8e2574a6d3727feee778e7c987a4219f6cf386 Author: Wolfgang Sourdeau Date: Fri Dec 3 22:31:56 2010 +0000 @@ -35103,6 +42955,22 @@ Date: Thu Dec 2 21:25:37 2010 +0000 M ChangeLog M Main/SOGo+DAV.m +commit 882392c57cba2208de53422ec04ee1e7a7b8f182 +Merge: 00863f5 fc509d2 +Author: Wolfgang Sourdeau +Date: Thu Dec 2 14:32:22 2010 +0000 + + merge of '683abf3e25aeca0b6ae95c6502fc05a5f1b2f537' + and '82578425c34d9552a919394bbeecd799f773ca38' + + Monotone-Parent: 683abf3e25aeca0b6ae95c6502fc05a5f1b2f537 + Monotone-Parent: 82578425c34d9552a919394bbeecd799f773ca38 + Monotone-Revision: 30bbdf4da27d8db206b6667bf81195db2d889439 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-12-02T14:32:22 + Monotone-Branch: ca.inverse.sogo + commit fc509d29d5189db9f207f98c804cea615b321e81 Author: Wolfgang Sourdeau Date: Thu Dec 2 14:31:24 2010 +0000 @@ -35268,6 +43136,22 @@ M OpenChange/MAPIStoreContext.m M OpenChange/MAPIStoreMailContext.m M OpenChange/MAPIStoreTasksContext.m +commit d1fa84ff94285c250725d23686a5eed434d881c6 +Merge: 95a1b29 804e3a3 +Author: Wolfgang Sourdeau +Date: Mon Nov 29 20:02:35 2010 +0000 + + merge of '193627476b7f3a685b8b6cfd32f56231e28a5b94' + and '49b01807f1c5d14232f8021564406a02f9736a62' + + Monotone-Parent: 193627476b7f3a685b8b6cfd32f56231e28a5b94 + Monotone-Parent: 49b01807f1c5d14232f8021564406a02f9736a62 + Monotone-Revision: 9634e883abb4f5cf42e1b4d9c3d3e1b1a61f3e7f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-11-29T20:02:35 + Monotone-Branch: ca.inverse.sogo + commit 95a1b2977ca4144b09621662ffe5437e5a209fc8 Author: Wolfgang Sourdeau Date: Mon Nov 29 20:02:21 2010 +0000 @@ -35328,6 +43212,22 @@ M ChangeLog M OpenChange/MAPIStoreTypes.h M OpenChange/MAPIStoreTypes.m +commit 06d633715201c220feff02488cdf1f68287d8ad3 +Merge: 8c924af 66a351a +Author: Wolfgang Sourdeau +Date: Thu Nov 25 21:00:53 2010 +0000 + + merge of '2344911344b24c7c53ef3da63936891ede85d323' + and 'da16a0c128e894d870f111d269532e1f39922ac1' + + Monotone-Parent: 2344911344b24c7c53ef3da63936891ede85d323 + Monotone-Parent: da16a0c128e894d870f111d269532e1f39922ac1 + Monotone-Revision: d6c5da440431c45a715dfdd531f61cc02798d9cd + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-11-25T21:00:53 + Monotone-Branch: ca.inverse.sogo + commit 8c924af93b3a8c614a2ccaa8a4c0b726abac9d1e Author: Ludovic Marcotte Date: Thu Nov 25 18:35:20 2010 +0000 @@ -35369,6 +43269,22 @@ Date: Thu Nov 25 15:22:33 2010 +0000 M UI/MailerUI/UIxMailEditor.m +commit 1bd04e09898b2e9d3cbfc22efabca9badc73fe65 +Merge: a90d7be 921ac1a +Author: Ludovic Marcotte +Date: Wed Nov 24 19:15:17 2010 +0000 + + merge of '2f632eb28149d9eef08c30d3057eb9d93b8d34c5' + and 'b2196339f77de9ebd51fbed1e0cbf45850b06d7e' + + Monotone-Parent: 2f632eb28149d9eef08c30d3057eb9d93b8d34c5 + Monotone-Parent: b2196339f77de9ebd51fbed1e0cbf45850b06d7e + Monotone-Revision: 6b2ab08cb3954daacb8c9007f41296b61035de29 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-11-24T19:15:17 + Monotone-Branch: ca.inverse.sogo + commit 921ac1a64eef20cdba91016effa3d96f2ce412a2 Author: Wolfgang Sourdeau Date: Wed Nov 24 19:32:31 2010 +0000 @@ -36089,6 +44005,22 @@ M SoObjects/Mailer/SOGoMailObject.m M SoObjects/SOGo/SOGoContentObject.h M SoObjects/SOGo/SOGoContentObject.m +commit 9e8df7d0692751624b7c1cddac6b6ef27e83089a +Merge: 7dfa0e1 e4e6b57 +Author: Wolfgang Sourdeau +Date: Wed Nov 17 17:54:28 2010 +0000 + + merge of '20f2f393e2f3e95fccc08c07ae5f4c09a9fea602' + and 'be61301b6b2611ae9740f9559b7ea889c4cb9d77' + + Monotone-Parent: 20f2f393e2f3e95fccc08c07ae5f4c09a9fea602 + Monotone-Parent: be61301b6b2611ae9740f9559b7ea889c4cb9d77 + Monotone-Revision: 1be014aa5bfe1a03fbebbd16c6bcdfcf7d7ecf9c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-11-17T17:54:28 + Monotone-Branch: ca.inverse.sogo + commit 7dfa0e136516cfadaf58989e24aafe8f52592855 Author: Ludovic Marcotte Date: Wed Nov 17 16:02:57 2010 +0000 @@ -36136,6 +44068,22 @@ Date: Wed Nov 17 15:22:15 2010 +0000 M ChangeLog M Tests/Integration/test-davacl.py +commit ed58cee3eb116b547880d3974c2eb9ca086f3761 +Merge: 9dc4181 7296229 +Author: Wolfgang Sourdeau +Date: Wed Nov 17 14:13:10 2010 +0000 + + merge of '21a3b0d773aa68f83c72cafda0126575e18d3a1f' + and 'c564b845275a8d0260844c72d0a273e3a7bdf69b' + + Monotone-Parent: 21a3b0d773aa68f83c72cafda0126575e18d3a1f + Monotone-Parent: c564b845275a8d0260844c72d0a273e3a7bdf69b + Monotone-Revision: 2a5644700c095d7f9f967370b2341e2850d50787 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-11-17T14:13:10 + Monotone-Branch: ca.inverse.sogo + commit 9dc418110827bb7801a0b892a27f3a33450aa903 Author: Wolfgang Sourdeau Date: Wed Nov 17 14:12:54 2010 +0000 @@ -36198,6 +44146,22 @@ Date: Tue Nov 16 18:44:17 2010 +0000 M SoObjects/SOGo/SOGoCache.m +commit 8eed09baf6696f95dc5cfa63766ee62f293e6ae4 +Merge: 3af7b29 30f5a28 +Author: Francis Lachapelle +Date: Mon Nov 15 22:41:21 2010 +0000 + + merge of '1a7fb070202750af8cc8edfa2a6ffba467b2b25b' + and 'a8d7706d1697aa0016456102e8d0198a8f7ef74d' + + Monotone-Parent: 1a7fb070202750af8cc8edfa2a6ffba467b2b25b + Monotone-Parent: a8d7706d1697aa0016456102e8d0198a8f7ef74d + Monotone-Revision: df60fa1b39b724d3f0ecdfb7868bc7d84cf4b614 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-11-15T22:41:21 + Monotone-Branch: ca.inverse.sogo + commit 3af7b29fd0114b03aa3e9abc78e43530472fbdea Author: Francis Lachapelle Date: Mon Nov 15 22:28:27 2010 +0000 @@ -36227,6 +44191,22 @@ Date: Mon Nov 15 22:24:48 2010 +0000 M UI/WebServerResources/ContactsUI.js +commit 30f5a285e8de2ca8a7c933ab6df96139d313404c +Merge: b079987 aa52ee6 +Author: Wolfgang Sourdeau +Date: Mon Nov 15 19:51:13 2010 +0000 + + merge of '819ae78a7b35f2cf4b307d16a3b0da9a2d5b767c' + and 'a79ba19dc901642223410e1cd56c639ec05a6098' + + Monotone-Parent: 819ae78a7b35f2cf4b307d16a3b0da9a2d5b767c + Monotone-Parent: a79ba19dc901642223410e1cd56c639ec05a6098 + Monotone-Revision: a8d7706d1697aa0016456102e8d0198a8f7ef74d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-11-15T19:51:13 + Monotone-Branch: ca.inverse.sogo + commit aa52ee6370e582b000bfc62ed175a6ddcc83e755 Author: Wolfgang Sourdeau Date: Mon Nov 15 19:50:35 2010 +0000 @@ -36695,6 +44675,22 @@ A UI/Templates/SOGoACLCzechRemovalAdvisory.wox A UI/Templates/SOGoFolderCzechAdditionAdvisory.wox A UI/Templates/SOGoFolderCzechRemovalAdvisory.wox +commit bc06c7d51f605b2394ec870e1e2c4ad8077a4331 +Merge: ab90df0 b28a1be +Author: Wolfgang Sourdeau +Date: Mon Nov 8 19:12:46 2010 +0000 + + merge of '5616899c7c44519d7ea52d68cc931f9f056b9584' + and '6c9151f261ad9f73f6614808f73d4ca224c2cb8e' + + Monotone-Parent: 5616899c7c44519d7ea52d68cc931f9f056b9584 + Monotone-Parent: 6c9151f261ad9f73f6614808f73d4ca224c2cb8e + Monotone-Revision: 06d643c3c015e84728100fb5624bf4bac033748f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-11-08T19:12:46 + Monotone-Branch: ca.inverse.sogo + commit b28a1bee6e9f9d3a020078a90194766e2a584074 Author: Francis Lachapelle Date: Mon Nov 8 18:47:11 2010 +0000 @@ -36777,6 +44773,22 @@ Date: Mon Nov 8 16:28:50 2010 +0000 M ChangeLog M UI/WebServerResources/SOGoDragHandles.js +commit d720675edfa1ce2e2bffc40e3edc23b4abe8c722 +Merge: 0ea74f9 b96a9de +Author: Francis Lachapelle +Date: Mon Nov 8 16:21:25 2010 +0000 + + merge of '1df0fdb407abf8f535893384237b5ab2c788ca50' + and 'e988df7e3c59b0528a5aac84c8963a900af5bd8b' + + Monotone-Parent: 1df0fdb407abf8f535893384237b5ab2c788ca50 + Monotone-Parent: e988df7e3c59b0528a5aac84c8963a900af5bd8b + Monotone-Revision: 0c176852c57ca5f012fd36464ced594b6ef6c9fb + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-11-08T16:21:25 + Monotone-Branch: ca.inverse.sogo + commit 0ea74f9536f8b440bea2a29b71bade6d58803d33 Author: Francis Lachapelle Date: Mon Nov 8 16:21:18 2010 +0000 @@ -36976,6 +44988,22 @@ M UI/WebServerResources/MailerUI.js M UI/WebServerResources/SOGoDataTable.js M UI/WebServerResources/SOGoMailDataSource.js +commit 761462e26ce772fc18b894d052907f142cd70e7e +Merge: b6231dc 231b839 +Author: Francis Lachapelle +Date: Wed Nov 3 20:47:52 2010 +0000 + + merge of 'c410032070bc4cd3697a1e0b498960cb5afae02f' + and 'dde4cb6401010f8fb6e70639215b4bf693f18f1d' + + Monotone-Parent: c410032070bc4cd3697a1e0b498960cb5afae02f + Monotone-Parent: dde4cb6401010f8fb6e70639215b4bf693f18f1d + Monotone-Revision: eeede995522aac10418121af680e6cf94cb7bb4a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-11-03T20:47:52 + Monotone-Branch: ca.inverse.sogo + commit b6231dca9221ba2184f63dfcbdd292208617f5b9 Author: Francis Lachapelle Date: Wed Nov 3 20:23:49 2010 +0000 @@ -37058,6 +45086,22 @@ Date: Wed Nov 3 14:25:18 2010 +0000 M SoObjects/SOGo/GNUmakefile.preamble +commit 63ec8ebc12162cb1d146bacd88cb62c0b895cfa1 +Merge: f91e42e 2efe074 +Author: Wolfgang Sourdeau +Date: Wed Nov 3 13:24:31 2010 +0000 + + merge of '45cd2efd0294a222d0cee6d22da7a39ebdc6c8fa' + and 'a9b4a2aae19f072168fdfc23b91ebc443e0d55c4' + + Monotone-Parent: 45cd2efd0294a222d0cee6d22da7a39ebdc6c8fa + Monotone-Parent: a9b4a2aae19f072168fdfc23b91ebc443e0d55c4 + Monotone-Revision: d66ed2c7cc398b54500e14cb09c879bbd7915f0a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-11-03T13:24:31 + Monotone-Branch: ca.inverse.sogo + commit f91e42e08f5473c2e3742c23860f68379dcca038 Author: Wolfgang Sourdeau Date: Wed Nov 3 13:23:33 2010 +0000 @@ -37294,6 +45338,22 @@ M SoObjects/Appointments/Swedish.lproj/Localizable.strings M SoObjects/Appointments/Ukrainian.lproj/Localizable.strings M SoObjects/Appointments/Welsh.lproj/Localizable.strings +commit baa58d9d369151c903b37d8c28079d29c8ade40f +Merge: 2b79a77 ff2b8ff +Author: Wolfgang Sourdeau +Date: Mon Nov 1 19:39:29 2010 +0000 + + merge of '217d2de82145e1b73b967f969ccb9467d0680dcb' + and '5457dab94bc7224402eec992425d14381e88c381' + + Monotone-Parent: 217d2de82145e1b73b967f969ccb9467d0680dcb + Monotone-Parent: 5457dab94bc7224402eec992425d14381e88c381 + Monotone-Revision: 320e26fe80afea789e2f0c3c4d58fa7d657999c6 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-11-01T19:39:29 + Monotone-Branch: ca.inverse.sogo + commit 2b79a77c365e67c457a3c741ad6e08e1fc0ca2d7 Author: Wolfgang Sourdeau Date: Mon Nov 1 19:32:19 2010 +0000 @@ -37458,6 +45518,22 @@ Date: Thu Oct 28 15:56:51 2010 +0000 M NEWS +commit 82f5a9e0e623a7eeb42878c814994c85f48451d7 +Merge: e2ce30b 6cd140c +Author: Wolfgang Sourdeau +Date: Thu Oct 28 15:52:11 2010 +0000 + + merge of 'ccb49b853f2059fd3133a0ab1c7e4f79f4b87c23' + and 'fb42e2a1670666605ac484d419b64d92c83f004d' + + Monotone-Parent: ccb49b853f2059fd3133a0ab1c7e4f79f4b87c23 + Monotone-Parent: fb42e2a1670666605ac484d419b64d92c83f004d + Monotone-Revision: 2c76ac8192cf2138f05a94de5eff80eec5e71f7b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-10-28T15:52:11 + Monotone-Branch: ca.inverse.sogo + commit 6cd140cc5db1d4db7fd10284ea1f46a7a2c2ef59 Author: Wolfgang Sourdeau Date: Thu Oct 28 15:47:29 2010 +0000 @@ -37591,6 +45667,22 @@ Date: Wed Oct 27 15:16:20 2010 +0000 M ChangeLog M UI/WebServerResources/UIxContactEditor.js +commit a5f289207a80d395eb60bd56ce36b06d324676ac +Merge: 856ec61 0b784a7 +Author: Wolfgang Sourdeau +Date: Wed Oct 27 14:20:22 2010 +0000 + + merge of '05e312bc2aff1f30bb0ce98944cb16c89ee15b86' + and 'f45b91e2758389e5bc0a94b6e80d20778a589e74' + + Monotone-Parent: 05e312bc2aff1f30bb0ce98944cb16c89ee15b86 + Monotone-Parent: f45b91e2758389e5bc0a94b6e80d20778a589e74 + Monotone-Revision: 0ae9c70b160be4f5810d82d165885e7c2612bae3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-10-27T14:20:22 + Monotone-Branch: ca.inverse.sogo + commit 856ec615f43aba6ec9bb46c84f9300038658bfad Author: Wolfgang Sourdeau Date: Wed Oct 27 14:20:09 2010 +0000 @@ -37606,6 +45698,22 @@ M SoObjects/Contacts/SOGoContactFolders.m M SoObjects/SOGo/SOGoUserFolder.m M Tests/Integration/test-contact-categories.py +commit 0b784a7b6a3deb1599a211117b55affe6f9f790c +Merge: 9be74a5 9356db4 +Author: Francis Lachapelle +Date: Tue Oct 26 22:58:00 2010 +0000 + + merge of '08ff4ed5c2f1ac739d34cf7fe2a75f3b3ac2d7dd' + and '32f5339432dc3dd283822d8810c9cdaae84ac533' + + Monotone-Parent: 08ff4ed5c2f1ac739d34cf7fe2a75f3b3ac2d7dd + Monotone-Parent: 32f5339432dc3dd283822d8810c9cdaae84ac533 + Monotone-Revision: f45b91e2758389e5bc0a94b6e80d20778a589e74 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-10-26T22:58:00 + Monotone-Branch: ca.inverse.sogo + commit 9356db4e2fb9fe2a0bb9fa4433f3d169cdcb23ef Author: Francis Lachapelle Date: Tue Oct 26 22:26:03 2010 +0000 @@ -38609,6 +46717,22 @@ M SOPE/NGCards/TimeZones/Pacific/Tongatapu.ics M SOPE/NGCards/TimeZones/Pacific/Wake.ics M SOPE/NGCards/TimeZones/Pacific/Wallis.ics +commit c7d90c31b2aa338ecd7a96861f5067bdbfec1bf9 +Merge: a352c05 0a4c54b +Author: Wolfgang Sourdeau +Date: Mon Oct 18 18:30:43 2010 +0000 + + merge of '00c385f170e269a8305d89f7f557f6ee66aa5904' + and 'b87371b5b686da6d0d84e233c3ffbd8f8f9fbe1f' + + Monotone-Parent: 00c385f170e269a8305d89f7f557f6ee66aa5904 + Monotone-Parent: b87371b5b686da6d0d84e233c3ffbd8f8f9fbe1f + Monotone-Revision: 7e03e68f3bd26f03d5835176e1850405de4fe8b5 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-10-18T18:30:43 + Monotone-Branch: ca.inverse.sogo + commit 0a4c54b063d77fc013ecce81ad45a365702a50e0 Author: Wolfgang Sourdeau Date: Mon Oct 18 18:30:37 2010 +0000 @@ -38761,6 +46885,22 @@ Date: Fri Oct 15 00:12:55 2010 +0000 M ChangeLog +commit 55f7758862f7440eb29d7e19c35014e4b1f6a083 +Merge: 7685b34 68bf422 +Author: Wolfgang Sourdeau +Date: Thu Oct 14 21:38:10 2010 +0000 + + merge of '1c9f1cddb35ec2af1a800051b41880aec42781be' + and '94f2ed96085c3727eb5efe03791eae4789e00e1d' + + Monotone-Parent: 1c9f1cddb35ec2af1a800051b41880aec42781be + Monotone-Parent: 94f2ed96085c3727eb5efe03791eae4789e00e1d + Monotone-Revision: 9ba08911c1519d6dba02984afd8eb090a8ce8d82 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-10-14T21:38:10 + Monotone-Branch: ca.inverse.sogo + commit 7685b34daf15450136078ea5b5e4d53ab10f67d4 Author: Wolfgang Sourdeau Date: Thu Oct 14 21:37:39 2010 +0000 @@ -39137,6 +47277,22 @@ Date: Wed Oct 13 17:42:51 2010 +0000 M UI/WebServerResources/SchedulerUI.js +commit 40b93aeac7c46f8c9404698c645a7e8af54a16a7 +Merge: 0c1c5eb 10e1449 +Author: Francis Lachapelle +Date: Wed Oct 13 16:03:50 2010 +0000 + + merge of '47d9386ed0d68b0a3585c58826ca285b428390ff' + and '88d71e038ef8bd52597f0b1089a5a8d99762d53e' + + Monotone-Parent: 47d9386ed0d68b0a3585c58826ca285b428390ff + Monotone-Parent: 88d71e038ef8bd52597f0b1089a5a8d99762d53e + Monotone-Revision: 7bab59ca603186d58c00356778082d5123367741 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-10-13T16:03:50 + Monotone-Branch: ca.inverse.sogo + commit 10e1449c0b480244e4ebcc5810ea58a9d2789e51 Author: Francis Lachapelle Date: Wed Oct 13 16:03:43 2010 +0000 @@ -39209,6 +47365,22 @@ M OpenChange/MAPIStoreContext.m M OpenChange/MAPIStoreMapping.h M OpenChange/MAPIStoreMapping.m +commit 9660aeb84e8f067a3fab646ed22cce9ff637b770 +Merge: 3e43e65 e3e0b7e +Author: Wolfgang Sourdeau +Date: Wed Oct 13 15:10:39 2010 +0000 + + merge of '70913882b0f1e07c463bccfd01a69394f02a9ced' + and '9f4bb6a90906abd5189ebce4675007eb8f89e4a9' + + Monotone-Parent: 70913882b0f1e07c463bccfd01a69394f02a9ced + Monotone-Parent: 9f4bb6a90906abd5189ebce4675007eb8f89e4a9 + Monotone-Revision: 59d160b60daebebf7589645c180056eb1cc90294 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-10-13T15:10:39 + Monotone-Branch: ca.inverse.sogo + commit e3e0b7e9e597aa9ac299fdfa474e35ab7a489a2b Author: Francis Lachapelle Date: Wed Oct 13 15:08:41 2010 +0000 @@ -39223,6 +47395,22 @@ Date: Wed Oct 13 15:08:41 2010 +0000 M UI/Scheduler/UIxCalListingActions.m M UI/WebServerResources/SchedulerUI.js +commit 3e43e65193c50a678b27f3d72d91228d4f9e2aa6 +Merge: 3aebfaf bb18132 +Author: Wolfgang Sourdeau +Date: Wed Oct 13 15:07:16 2010 +0000 + + merge of '4b50d4162b83d7792f468eea0c722d4b4d5a6fe4' + and 'ed9155f6c31847d4a5dcf861ed08dfb9bb7b112a' + + Monotone-Parent: 4b50d4162b83d7792f468eea0c722d4b4d5a6fe4 + Monotone-Parent: ed9155f6c31847d4a5dcf861ed08dfb9bb7b112a + Monotone-Revision: 70913882b0f1e07c463bccfd01a69394f02a9ced + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-10-13T15:07:16 + Monotone-Branch: ca.inverse.sogo + commit 3aebfaf27bfa3234d061e674155c61713faa9dac Author: Wolfgang Sourdeau Date: Wed Oct 13 15:07:03 2010 +0000 @@ -39357,6 +47545,22 @@ Date: Tue Oct 12 21:36:03 2010 +0000 M OpenChange/MAPIStoreContactsContext.m +commit e2505e2daa63f2b9116a70575409633ea836a28a +Merge: dfc4f1f 862fc80 +Author: Wolfgang Sourdeau +Date: Tue Oct 12 21:35:57 2010 +0000 + + merge of '58dd5b5062c42f191897941cb537d17bb4d22cad' + and 'd8572a250b974dcb3ee2eff7964b86e79ecf315f' + + Monotone-Parent: 58dd5b5062c42f191897941cb537d17bb4d22cad + Monotone-Parent: d8572a250b974dcb3ee2eff7964b86e79ecf315f + Monotone-Revision: 31f2502a7daa35d52fc302ad66e1d2510709ec85 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-10-12T21:35:57 + Monotone-Branch: ca.inverse.sogo + commit 862fc80572d7c7c1f1e0815d6a9f292d54d6b1f1 Author: Wolfgang Sourdeau Date: Tue Oct 12 21:35:33 2010 +0000 @@ -39370,6 +47574,22 @@ Date: Tue Oct 12 21:35:33 2010 +0000 M OpenChange/GNUmakefile +commit dfc4f1ffd4eeddcdb6ce8dea9f9bd4b219b7c48d +Merge: 692d11c ecb13f0 +Author: Ludovic Marcotte +Date: Tue Oct 12 18:15:23 2010 +0000 + + merge of '42e1092ef000ba4bd49f0414c545b934da9aa8e9' + and 'd0ea8a4d4acfb64cb5dacad035cb4849d4932d6d' + + Monotone-Parent: 42e1092ef000ba4bd49f0414c545b934da9aa8e9 + Monotone-Parent: d0ea8a4d4acfb64cb5dacad035cb4849d4932d6d + Monotone-Revision: 58dd5b5062c42f191897941cb537d17bb4d22cad + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-10-12T18:15:23 + Monotone-Branch: ca.inverse.sogo + commit ecb13f02c67af4d041f71d4966b38990369b5126 Author: Ludovic Marcotte Date: Tue Oct 12 18:13:43 2010 +0000 @@ -39560,6 +47780,22 @@ Date: Fri Oct 8 21:29:25 2010 +0000 M ChangeLog M UI/Scheduler/UIxCalDateSelector.m +commit 950e55a7f72adbbfe8141c602179092777788d53 +Merge: 9145f0b f7a904b +Author: Francis Lachapelle +Date: Fri Oct 8 20:58:00 2010 +0000 + + merge of '27e383633f4976ef792123d347e4195e8fecd185' + and 'f02a11f1e1e720bc3a1a26a301b2b216d5335eb9' + + Monotone-Parent: 27e383633f4976ef792123d347e4195e8fecd185 + Monotone-Parent: f02a11f1e1e720bc3a1a26a301b2b216d5335eb9 + Monotone-Revision: 0bf2d169ac561f57a7e921d8f03772e095e7f54a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-10-08T20:58:00 + Monotone-Branch: ca.inverse.sogo + commit f7a904b977948c619c4839b314ccfd0536ef331c Author: Francis Lachapelle Date: Fri Oct 8 20:57:24 2010 +0000 @@ -39578,6 +47814,22 @@ M UI/WebServerResources/ContactsUI.js M UI/WebServerResources/MailerUI.js M UI/WebServerResources/SchedulerUI.js +commit 9145f0be467cd0451a7d5458dfccd2019eecb1bc +Merge: d28c57e 118a588 +Author: Wolfgang Sourdeau +Date: Fri Oct 8 20:31:47 2010 +0000 + + merge of '7283e847d5338d046cd6d5bd9ea7475d0248528f' + and '7be471a6a7e6a2c4d99f470e9617461175519459' + + Monotone-Parent: 7283e847d5338d046cd6d5bd9ea7475d0248528f + Monotone-Parent: 7be471a6a7e6a2c4d99f470e9617461175519459 + Monotone-Revision: 27e383633f4976ef792123d347e4195e8fecd185 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-10-08T20:31:47 + Monotone-Branch: ca.inverse.sogo + commit d28c57e9b5142c150c601624c688fcd555359abe Author: Wolfgang Sourdeau Date: Fri Oct 8 20:31:37 2010 +0000 @@ -39648,6 +47900,22 @@ A UI/Templates/SOGoACLCatalanRemovalAdvisory.wox A UI/Templates/SOGoFolderCatalanAdditionAdvisory.wox A UI/Templates/SOGoFolderCatalanRemovalAdvisory.wox +commit 118a5887eaf27ba1c9e4251593664dc28cea3e1b +Merge: 7de1386 ba63f4d +Author: Francis Lachapelle +Date: Fri Oct 8 20:26:33 2010 +0000 + + merge of '314cdc639d9d8e37c3b7d63829a17bbd875a093e' + and '8edef594b9dbe81854edb93b0440fb81ef74970f' + + Monotone-Parent: 314cdc639d9d8e37c3b7d63829a17bbd875a093e + Monotone-Parent: 8edef594b9dbe81854edb93b0440fb81ef74970f + Monotone-Revision: 7be471a6a7e6a2c4d99f470e9617461175519459 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-10-08T20:26:33 + Monotone-Branch: ca.inverse.sogo + commit ba63f4deab241c8e311007d4ab1e680e0959aa4f Author: Francis Lachapelle Date: Fri Oct 8 20:25:54 2010 +0000 @@ -39704,6 +47972,22 @@ Date: Fri Oct 8 19:56:17 2010 +0000 M SoObjects/Appointments/Italian.lproj/Localizable.strings +commit 6c4091756cab5845d1fd2f61bc5b4b4fd5fce652 +Merge: aad1a0f a2b3ec5 +Author: Wolfgang Sourdeau +Date: Fri Oct 8 19:54:59 2010 +0000 + + merge of '5676ae3c13c58684d5b39a82a4ce2aeafdfc7040' + and 'c1871a78b402c35ce922ac5da7c7d2256dc9bb0c' + + Monotone-Parent: 5676ae3c13c58684d5b39a82a4ce2aeafdfc7040 + Monotone-Parent: c1871a78b402c35ce922ac5da7c7d2256dc9bb0c + Monotone-Revision: c43d9919f8f332369324d9caae4a46a303f32fa6 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-10-08T19:54:59 + Monotone-Branch: ca.inverse.sogo + commit a2b3ec567a3bd63cb12a2174476907417e45f5c5 Author: Wolfgang Sourdeau Date: Fri Oct 8 19:53:04 2010 +0000 @@ -40209,6 +48493,22 @@ Date: Wed Sep 29 18:29:01 2010 +0000 M sogo.spec +commit 6b6a441e1ab1897bafca10ca54137981cacf0d99 +Merge: 48879f2 99cd717 +Author: Wolfgang Sourdeau +Date: Wed Sep 29 13:28:47 2010 +0000 + + merge of '50e65cc6ce54ea052b3aeba048f1a2f447154953' + and '5ded584da8e206ac5d953762545e4d49aa5010d7' + + Monotone-Parent: 50e65cc6ce54ea052b3aeba048f1a2f447154953 + Monotone-Parent: 5ded584da8e206ac5d953762545e4d49aa5010d7 + Monotone-Revision: 79274fbc0dcc605237ea83312be3e900b8e97903 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-09-29T13:28:47 + Monotone-Branch: ca.inverse.sogo + commit 99cd717e8a7fc77c1457743283f0d15e341a93bb Author: Wolfgang Sourdeau Date: Wed Sep 29 13:21:59 2010 +0000 @@ -40239,6 +48539,22 @@ Date: Tue Sep 28 23:02:33 2010 +0000 M Documentation/SOGo Installation Guide.odt +commit 14221a130c6959b5532e58784e38878a88d1feef +Merge: 380e9df c873752 +Author: Wolfgang Sourdeau +Date: Tue Sep 28 17:54:14 2010 +0000 + + merge of '1e037a870db694332f09d5b9487b81d3c76ade7a' + and '7285cdd10c4ae24e612e984c6b14a96e15e060a1' + + Monotone-Parent: 1e037a870db694332f09d5b9487b81d3c76ade7a + Monotone-Parent: 7285cdd10c4ae24e612e984c6b14a96e15e060a1 + Monotone-Revision: f98cf98b9e244d049aff84921d88c0db705241f1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-09-28T17:54:14 + Monotone-Branch: ca.inverse.sogo + commit 380e9df7c24c75ee29474eceadca80f714674f2b Author: Wolfgang Sourdeau Date: Tue Sep 28 17:54:05 2010 +0000 @@ -40252,6 +48568,22 @@ Date: Tue Sep 28 17:54:05 2010 +0000 M sogo.spec +commit c87375265872f9c673ec3de57f86740bba5836ae +Merge: fe112e2 5721227 +Author: Francis Lachapelle +Date: Tue Sep 28 16:09:00 2010 +0000 + + merge of '57cb13b050b46962a5b75e6eb9b8c15eddd51ef1' + and '99ea9ff62c0f957853593872fbc025892f52f11b' + + Monotone-Parent: 57cb13b050b46962a5b75e6eb9b8c15eddd51ef1 + Monotone-Parent: 99ea9ff62c0f957853593872fbc025892f52f11b + Monotone-Revision: 7285cdd10c4ae24e612e984c6b14a96e15e060a1 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-09-28T16:09:00 + Monotone-Branch: ca.inverse.sogo + commit 572122703f1bd3b1169b31c0153d456d45ad88c6 Author: Francis Lachapelle Date: Tue Sep 28 16:07:58 2010 +0000 @@ -40285,6 +48617,22 @@ Date: Tue Sep 28 15:29:05 2010 +0000 M ChangeLog M SoObjects/SOGo/SOGoUser.m +commit cbc04a57e9f45b84aaca6e690ee9d3b818e78223 +Merge: b0374af addca0f +Author: Wolfgang Sourdeau +Date: Tue Sep 28 15:07:35 2010 +0000 + + merge of '9e946c46691afd745f601eae3b1973a26f7494e4' + and 'be2d77f6c4881e75bb24c06d7eec7e0a2869a643' + + Monotone-Parent: 9e946c46691afd745f601eae3b1973a26f7494e4 + Monotone-Parent: be2d77f6c4881e75bb24c06d7eec7e0a2869a643 + Monotone-Revision: ed0087920f7016ffe9d167eede15e8f77e91413f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-09-28T15:07:35 + Monotone-Branch: ca.inverse.sogo + commit b0374af51d956a86fa2288ebf1075e87e8d97489 Author: Wolfgang Sourdeau Date: Tue Sep 28 15:07:27 2010 +0000 @@ -40563,6 +48911,70 @@ Date: Wed Sep 22 13:32:48 2010 +0000 M Documentation/SOGo Mobile Devices Configuration.odt +commit 659676572b50951319f1b27a13f8a7af723e2db9 +Merge: 0157cd6 02d5e95 +Author: Francis Lachapelle +Date: Tue Sep 21 22:38:17 2010 +0000 + + merge of '150562a6cebe155a4cb327810609cda6bf2fb935' + and 'bf9cc230b574a121a65dec376056ef21db5478d1' + + Monotone-Parent: 150562a6cebe155a4cb327810609cda6bf2fb935 + Monotone-Parent: bf9cc230b574a121a65dec376056ef21db5478d1 + Monotone-Revision: aa694c23977599cbef19c8530654ec14bd0d7a86 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-09-21T22:38:17 + Monotone-Branch: ca.inverse.sogo + +commit 0157cd67a4b4fbe17ede5475d72ede05116ebb87 +Merge: 8add1b0 b48c752 +Author: Ludovic Marcotte +Date: Wed Sep 22 11:25:43 2010 +0000 + + merge of '7e92f68d047f833383107a515ec0f4ffbcbb0ba5' + and 'd14d73ffda1c750075f94c27ab66f90844a83291' + + Monotone-Parent: 7e92f68d047f833383107a515ec0f4ffbcbb0ba5 + Monotone-Parent: d14d73ffda1c750075f94c27ab66f90844a83291 + Monotone-Revision: 150562a6cebe155a4cb327810609cda6bf2fb935 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-09-22T11:25:43 + Monotone-Branch: ca.inverse.sogo + +commit 02d5e95f36d35ee815cad59b9c2dfbfacdd5686c +Merge: 226ee81 b48c752 +Author: Francis Lachapelle +Date: Tue Sep 21 22:21:02 2010 +0000 + + merge of 'a8a0cf231c1df012737d3e075f5dc8885cca4540' + and 'd14d73ffda1c750075f94c27ab66f90844a83291' + + Monotone-Parent: a8a0cf231c1df012737d3e075f5dc8885cca4540 + Monotone-Parent: d14d73ffda1c750075f94c27ab66f90844a83291 + Monotone-Revision: bf9cc230b574a121a65dec376056ef21db5478d1 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-09-21T22:21:02 + Monotone-Branch: ca.inverse.sogo + +commit b48c75273fa9e892c2a3cf244a866e2efa0c1456 +Merge: f47d5a8 c8f70ec +Author: Ludovic Marcotte +Date: Tue Sep 21 18:51:52 2010 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_2' (head 27928b2f068db3c3e82db3c62f4fc38854011aa9) + to branch 'ca.inverse.sogo' (head 830fc624da8f3c1746ad2b7249cc18a3d0e3365a) + + Monotone-Parent: 27928b2f068db3c3e82db3c62f4fc38854011aa9 + Monotone-Parent: 830fc624da8f3c1746ad2b7249cc18a3d0e3365a + Monotone-Revision: d14d73ffda1c750075f94c27ab66f90844a83291 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-09-21T18:51:52 + Monotone-Branch: ca.inverse.sogo + commit f47d5a8b94cdbd350c5d14a7c4880a5ba8ec22f2 Author: Ludovic Marcotte Date: Tue Sep 21 18:50:27 2010 +0000 @@ -40577,6 +48989,38 @@ Date: Tue Sep 21 18:50:27 2010 +0000 M Scripts/updates.php +commit 226ee81d10baadd3235a69caf9b727bc1093c077 +Merge: 8add1b0 c8f70ec +Author: Francis Lachapelle +Date: Tue Sep 21 18:28:00 2010 +0000 + + merge of '7e92f68d047f833383107a515ec0f4ffbcbb0ba5' + and '830fc624da8f3c1746ad2b7249cc18a3d0e3365a' + + Monotone-Parent: 7e92f68d047f833383107a515ec0f4ffbcbb0ba5 + Monotone-Parent: 830fc624da8f3c1746ad2b7249cc18a3d0e3365a + Monotone-Revision: a8a0cf231c1df012737d3e075f5dc8885cca4540 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-09-21T18:28:00 + Monotone-Branch: ca.inverse.sogo + +commit c8f70ecf979d0af7129c50a8814266026e86766b +Merge: 25b848e 9424204 +Author: Ludovic Marcotte +Date: Tue Sep 21 17:49:33 2010 +0000 + + merge of '0003bd90fb1070c884af826f67b63c41fca97554' + and 'c4797e1e6cd8eac66a45d44b94200b38f4bf7749' + + Monotone-Parent: 0003bd90fb1070c884af826f67b63c41fca97554 + Monotone-Parent: c4797e1e6cd8eac66a45d44b94200b38f4bf7749 + Monotone-Revision: 830fc624da8f3c1746ad2b7249cc18a3d0e3365a + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-09-21T17:49:33 + Monotone-Branch: ca.inverse.sogo + commit 25b848e5a92454de4c999b4f9856fc74ce516f9e Author: Ludovic Marcotte Date: Tue Sep 21 17:49:26 2010 +0000 @@ -40592,6 +49036,22 @@ Date: Tue Sep 21 17:49:26 2010 +0000 M Scripts/updates.php +commit 942420475e476441d31864dde4d0561117e9cff5 +Merge: 5b700ff a16bca3 +Author: Ludovic Marcotte +Date: Tue Sep 21 17:47:46 2010 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_2' (head eaf913d29d99bd1d8089bfc9bfb79fddef19a8be) + to branch 'ca.inverse.sogo' (head 595f922ff0d07669c998389a631ab6ba36fe8fe7) + + Monotone-Parent: 595f922ff0d07669c998389a631ab6ba36fe8fe7 + Monotone-Parent: eaf913d29d99bd1d8089bfc9bfb79fddef19a8be + Monotone-Revision: c4797e1e6cd8eac66a45d44b94200b38f4bf7749 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-09-21T17:47:46 + Monotone-Branch: ca.inverse.sogo + commit 5b700ff445056853c44498168067a15129dafea0 Author: Ludovic Marcotte Date: Tue Sep 21 17:47:15 2010 +0000 @@ -40754,6 +49214,22 @@ M UI/MailerUI/UIxMailFolderActions.m M UI/WebServerResources/MailerUI.js M UI/WebServerResources/generic.js +commit 7c12cf72f6ec913f458b2eef6307638db59d90d6 +Merge: cee94fe 5ffe015 +Author: Francis Lachapelle +Date: Mon Sep 20 14:29:04 2010 +0000 + + merge of '1acff2251868501e5baba3465e49475362ce1e4b' + and '68057140404e926c49422f77445d1b382fc182e5' + + Monotone-Parent: 1acff2251868501e5baba3465e49475362ce1e4b + Monotone-Parent: 68057140404e926c49422f77445d1b382fc182e5 + Monotone-Revision: 434c3721a8dac924cce0531eebee09d9b27457ea + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-09-20T14:29:04 + Monotone-Branch: ca.inverse.sogo + commit 5ffe0153183e8ed843ed87856e2e21ee9ef9ee26 Author: Francis Lachapelle Date: Mon Sep 20 14:11:05 2010 +0000 @@ -40882,6 +49358,22 @@ Date: Fri Sep 17 18:26:28 2010 +0000 M Main/Version M UI/MainUI/Version +commit ea3cf9e51e99cb81ec9d604f443c242f8b478709 +Merge: 681e8bb 1c29ec7 +Author: Ludovic Marcotte +Date: Thu Sep 16 16:53:45 2010 +0000 + + merge of 'cf224472d6ba902892440c969a9a308dcbe60b86' + and 'd925078e57868fc910aed3a8f4d3ae25d8eaffd3' + + Monotone-Parent: cf224472d6ba902892440c969a9a308dcbe60b86 + Monotone-Parent: d925078e57868fc910aed3a8f4d3ae25d8eaffd3 + Monotone-Revision: 93f8b5c83438d0624dcc65f2a200d4431df36530 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-09-16T16:53:45 + Monotone-Branch: ca.inverse.sogo + commit 681e8bb3e9040d666fd4bb110be42fc46a887b6e Author: Ludovic Marcotte Date: Thu Sep 16 16:53:09 2010 +0000 @@ -40897,6 +49389,22 @@ Date: Thu Sep 16 16:53:09 2010 +0000 M Documentation/SOGo Installation Guide.odt +commit 1c29ec736ea0006e807ee7ccabc92a684f374b1e +Merge: da4b852 50f6f7a +Author: Wolfgang Sourdeau +Date: Thu Sep 16 13:18:09 2010 +0000 + + merge of '2beb673f2d4abc8e4ea6eb827ec51bd6371423b6' + and '3aef78f323b46f1ff836bf4757a34f80ffd3d160' + + Monotone-Parent: 2beb673f2d4abc8e4ea6eb827ec51bd6371423b6 + Monotone-Parent: 3aef78f323b46f1ff836bf4757a34f80ffd3d160 + Monotone-Revision: d925078e57868fc910aed3a8f4d3ae25d8eaffd3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-09-16T13:18:09 + Monotone-Branch: ca.inverse.sogo + commit da4b852773cbb866a45114d3b1ee0488007d0dcb Author: Ludovic Marcotte Date: Thu Sep 16 12:42:47 2010 +0000 @@ -40956,6 +49464,22 @@ Date: Tue Sep 14 21:37:10 2010 +0000 M ChangeLog +commit fa99b2bfeda84e13918ad890298121376f7de396 +Merge: 4f028a0 b90a3f7 +Author: Ludovic Marcotte +Date: Tue Sep 14 21:36:44 2010 +0000 + + merge of '2e385121b8070035aeacb75be839ee7daaec77ab' + and '756755f35a7b0415c98a7a403ba3c57bc62a635a' + + Monotone-Parent: 2e385121b8070035aeacb75be839ee7daaec77ab + Monotone-Parent: 756755f35a7b0415c98a7a403ba3c57bc62a635a + Monotone-Revision: 8a33d1f9394c9fbaada3fcd1f51d3ba2fb6de40e + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-09-14T21:36:44 + Monotone-Branch: ca.inverse.sogo + commit 4f028a0613ef860d996deb00249debabbc97d608 Author: Ludovic Marcotte Date: Tue Sep 14 18:42:35 2010 +0000 @@ -41272,6 +49796,22 @@ Date: Thu Sep 9 16:04:27 2010 +0000 M debian/rules +commit eac5a07e169d5fd49de18b14bf38dda56b478ef8 +Merge: 2ec0d4d 6981ac8 +Author: Wolfgang Sourdeau +Date: Thu Sep 9 15:51:28 2010 +0000 + + merge of '625efb02980e7be9f62a6da3298d79adb34b78bd' + and '9ab8bbc4744bc53399410cafa678f8b27923e5fb' + + Monotone-Parent: 625efb02980e7be9f62a6da3298d79adb34b78bd + Monotone-Parent: 9ab8bbc4744bc53399410cafa678f8b27923e5fb + Monotone-Revision: a3e6c76628a0d2f514619fb4c55d3768c57c848b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-09-09T15:51:28 + Monotone-Branch: ca.inverse.sogo + commit 2ec0d4d273b38d5f49c28ee01f9e68c3c327b574 Author: Wolfgang Sourdeau Date: Thu Sep 9 15:51:13 2010 +0000 @@ -41365,6 +49905,22 @@ Date: Fri Sep 3 15:51:22 2010 +0000 M Tools/SOGoToolBackup.m +commit 77e019bd0543fc88a39fe5944172134e37a9197d +Merge: 8328374 a798b6b +Author: Wolfgang Sourdeau +Date: Fri Sep 3 15:49:51 2010 +0000 + + merge of '3041774927e7490f413c502580f789b26a0e693d' + and 'adf196d027f81b081e5999a384d4c9faaea58f27' + + Monotone-Parent: 3041774927e7490f413c502580f789b26a0e693d + Monotone-Parent: adf196d027f81b081e5999a384d4c9faaea58f27 + Monotone-Revision: 0194b10e82c289d4b0daf68bd644381fc3f912c7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-09-03T15:49:51 + Monotone-Branch: ca.inverse.sogo + commit 8328374042e19599f2e3647ad2294f2706dc7062 Author: Ludovic Marcotte Date: Fri Sep 3 12:21:48 2010 +0000 @@ -41381,6 +49937,22 @@ Date: Fri Sep 3 12:21:48 2010 +0000 M SoObjects/Mailer/SOGoMailAccount.m M SoObjects/SOGo/SOGoUser.m +commit 716d156847115624fce3e26ae853469974897335 +Merge: 3d27a57 f8eb68e +Author: Francis Lachapelle +Date: Fri Sep 3 13:20:50 2010 +0000 + + merge of '7b6c0dbf0ad6e6acc3aff1ca99e36772eba250dc' + and '831f41d261df5430147e999c1ce2b945b81086b7' + + Monotone-Parent: 7b6c0dbf0ad6e6acc3aff1ca99e36772eba250dc + Monotone-Parent: 831f41d261df5430147e999c1ce2b945b81086b7 + Monotone-Revision: 09f0f8877795f3a345aa7c98083aa8c1a62ad06f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-09-03T13:20:50 + Monotone-Branch: ca.inverse.sogo + commit 3d27a57d72a59a5876ddccd227959bcd402e4ee3 Author: Ludovic Marcotte Date: Fri Sep 3 10:49:59 2010 +0000 @@ -41467,6 +50039,22 @@ Date: Thu Sep 2 20:49:19 2010 +0000 M NEWS +commit ebdf9419fe9c211e0e25bf00cd375c2aa61b83e0 +Merge: 428b086 eb506c6 +Author: Francis Lachapelle +Date: Thu Sep 2 19:17:20 2010 +0000 + + merge of '1f2eaa372e3ae66a929fc22a568735d95ec1f67f' + and '1f953cea64fc6c840758f4cc35550f91b6aa07af' + + Monotone-Parent: 1f2eaa372e3ae66a929fc22a568735d95ec1f67f + Monotone-Parent: 1f953cea64fc6c840758f4cc35550f91b6aa07af + Monotone-Revision: e3f12e7b1f3dbd033f9a9644cb66aff2e1661704 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-09-02T19:17:20 + Monotone-Branch: ca.inverse.sogo + commit 428b086ff8e6e4bcfe93addb9d5666c336c5b6d6 Author: Francis Lachapelle Date: Thu Sep 2 19:11:20 2010 +0000 @@ -41530,6 +50118,22 @@ Date: Thu Sep 2 16:39:31 2010 +0000 M ChangeLog M UI/MailerUI/UIxMailView.m +commit 641b87d35ecb4cb12e9c80da0da1ad8718393c67 +Merge: 3d9ac73 a7b0d55 +Author: Wolfgang Sourdeau +Date: Thu Sep 2 16:38:07 2010 +0000 + + merge of 'b9a09b9bf8fc46e61ede310c9787e2c7118175cd' + and 'ba544c4d9dc8a0764eb65feb6e8655bacf2701c5' + + Monotone-Parent: b9a09b9bf8fc46e61ede310c9787e2c7118175cd + Monotone-Parent: ba544c4d9dc8a0764eb65feb6e8655bacf2701c5 + Monotone-Revision: 85562e3494ccd15c1f10a3a0bbdfeb11ff54430d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-09-02T16:38:07 + Monotone-Branch: ca.inverse.sogo + commit a7b0d55b0c62525f1d629bf8c6c353060d7c705e Author: Francis Lachapelle Date: Thu Sep 2 16:16:26 2010 +0000 @@ -41924,6 +50528,22 @@ Date: Mon Aug 30 18:33:42 2010 +0000 M ChangeLog M NEWS +commit 9d25d6e42b52d84508b50e0dd65af9087f8e4129 +Merge: efc1cfb ec40f45 +Author: Wolfgang Sourdeau +Date: Fri Aug 27 20:40:03 2010 +0000 + + merge of '2633331d11d2066cf3528aa65b464bb03169f1c9' + and '773d2f54b9bda91cde8db9efc3ee7828e95535de' + + Monotone-Parent: 2633331d11d2066cf3528aa65b464bb03169f1c9 + Monotone-Parent: 773d2f54b9bda91cde8db9efc3ee7828e95535de + Monotone-Revision: 1198851379c12913a7d2c42cae14f137188fdbb2 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-27T20:40:03 + Monotone-Branch: ca.inverse.sogo + commit ec40f455c4f8e5225d194845617eb0f592fc0972 Author: Wolfgang Sourdeau Date: Fri Aug 27 20:39:50 2010 +0000 @@ -42121,6 +50741,22 @@ Date: Fri Aug 27 15:14:03 2010 +0000 M ChangeLog M UI/WebServerResources/UIxPreferences.js +commit 35b64a432477737247bd1b35db1cc41238192bdc +Merge: ff00afd 8e09042 +Author: Wolfgang Sourdeau +Date: Fri Aug 27 15:11:56 2010 +0000 + + merge of '6731baba845a29cc3395d6e6d558a49a66e757ac' + and 'fc39c185d5027b0bfdd0955c8b1696252a79b85b' + + Monotone-Parent: 6731baba845a29cc3395d6e6d558a49a66e757ac + Monotone-Parent: fc39c185d5027b0bfdd0955c8b1696252a79b85b + Monotone-Revision: babfea6e4a86c3a35dca2f890f5274a718b07250 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-27T15:11:56 + Monotone-Branch: ca.inverse.sogo + commit ff00afd9163b18d337930f4c120f72ea40eb6c34 Author: Wolfgang Sourdeau Date: Fri Aug 27 14:56:57 2010 +0000 @@ -42136,6 +50772,38 @@ M ChangeLog M UI/WebServerResources/UIxFilterEditor.js M UI/WebServerResources/UIxPreferences.js +commit 8e090425972ebaf6ea8f70c4e04658750dde3cba +Merge: c380057 ff7fb74 +Author: Ludovic Marcotte +Date: Fri Aug 27 00:58:58 2010 +0000 + + merge of '748bc1fd6d5c867c7b2b4da7574602b322a35fa5' + and 'b878ebe9e2ac1b346fe42d489eb816955a3b1727' + + Monotone-Parent: 748bc1fd6d5c867c7b2b4da7574602b322a35fa5 + Monotone-Parent: b878ebe9e2ac1b346fe42d489eb816955a3b1727 + Monotone-Revision: fc39c185d5027b0bfdd0955c8b1696252a79b85b + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-08-27T00:58:58 + Monotone-Branch: ca.inverse.sogo + +commit ff7fb74d60a6793687209d0cde6dd5806005765e +Merge: 1c5be3f d9aea1b +Author: Ludovic Marcotte +Date: Fri Aug 27 00:51:54 2010 +0000 + + merge of '7a136da813c9771632c72c06589d2cb6383ef052' + and 'b9e39b84892a7087aa8b4a045496b566eca839ec' + + Monotone-Parent: 7a136da813c9771632c72c06589d2cb6383ef052 + Monotone-Parent: b9e39b84892a7087aa8b4a045496b566eca839ec + Monotone-Revision: b878ebe9e2ac1b346fe42d489eb816955a3b1727 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-08-27T00:51:54 + Monotone-Branch: ca.inverse.sogo + commit d9aea1bba03d281e2ca4b9fc3ca08b649e486fb5 Author: Ludovic Marcotte Date: Fri Aug 27 00:51:46 2010 +0000 @@ -42324,6 +50992,22 @@ Date: Thu Aug 26 14:09:23 2010 +0000 M UI/WebServerResources/generic.css +commit 4c07adfc503f434db590bf961f372791ef86b17b +Merge: 29e79ac 4f8f86e +Author: Francis Lachapelle +Date: Thu Aug 26 14:06:32 2010 +0000 + + merge of '7552a94eb1b6254545099a5beeef2e57fd0e0da3' + and 'cbe8e2b0be511edea6bd5d62d20fad24d0a1f260' + + Monotone-Parent: 7552a94eb1b6254545099a5beeef2e57fd0e0da3 + Monotone-Parent: cbe8e2b0be511edea6bd5d62d20fad24d0a1f260 + Monotone-Revision: 885a8aa2d3e7ce7d4493c5d244d42811994b1fb8 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-08-26T14:06:32 + Monotone-Branch: ca.inverse.sogo + commit 29e79ac428ac86324ff2d52a1991c43a6effa065 Author: Ludovic Marcotte Date: Wed Aug 25 21:50:15 2010 +0000 @@ -42455,6 +51139,22 @@ Date: Tue Aug 24 18:48:56 2010 +0000 M ChangeLog M SoObjects/Contacts/SOGoContactGCSList.m +commit a7ff20e05cd4a5a7e1eac4f8aa1af0fe43d56bbc +Merge: 7c2eb53 b5fb0b8 +Author: Wolfgang Sourdeau +Date: Tue Aug 24 18:48:17 2010 +0000 + + merge of '478756ffec5abdd24d602d86bbb8fdf091d543bd' + and 'cbeb049178fb31d19a533abf22a87b401926032f' + + Monotone-Parent: 478756ffec5abdd24d602d86bbb8fdf091d543bd + Monotone-Parent: cbeb049178fb31d19a533abf22a87b401926032f + Monotone-Revision: 76909628785d7db94f5a70ec9d81f0d310851522 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-24T18:48:17 + Monotone-Branch: ca.inverse.sogo + commit b5fb0b8ff560f0c562fe34fe0f052e0dca224ac3 Author: Francis Lachapelle Date: Tue Aug 24 13:41:21 2010 +0000 @@ -42680,6 +51380,22 @@ M ChangeLog A SoObjects/Appointments/SOGoEMailAlarmsManager.h A SoObjects/Appointments/SOGoEMailAlarmsManager.m +commit 107658532149b19e44cce8aa0de19db45a5b3b40 +Merge: e947440 89d282d +Author: Wolfgang Sourdeau +Date: Fri Aug 20 01:36:29 2010 +0000 + + merge of 'c08e4921f6ce7d20b4c9532750d271ac4a7a3e5a' + and 'd1a4f0ec595bfdd85dcd021dca6e4957ac192140' + + Monotone-Parent: c08e4921f6ce7d20b4c9532750d271ac4a7a3e5a + Monotone-Parent: d1a4f0ec595bfdd85dcd021dca6e4957ac192140 + Monotone-Revision: dedf484aec95d33480d529af12e81cb45edb7dd0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-20T01:36:29 + Monotone-Branch: ca.inverse.sogo + commit 89d282d220d9b2187dbf1641df94efa42d839657 Author: Wolfgang Sourdeau Date: Fri Aug 20 01:36:08 2010 +0000 @@ -42713,6 +51429,22 @@ M UI/WebServerResources/MailerUI.js M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/generic.js +commit 8698cb57c0f98836c2c3b803e25c4a25706c05e2 +Merge: dd628a5 554d467 +Author: Ludovic Marcotte +Date: Thu Aug 19 19:31:41 2010 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_1' (head d7190b0d224574c8656aa4031d63070f85201971) + to branch 'ca.inverse.sogo' (head 8604969aca9f512a5bfb3a1d79b03b7e261c4c4d) + + Monotone-Parent: 8604969aca9f512a5bfb3a1d79b03b7e261c4c4d + Monotone-Parent: d7190b0d224574c8656aa4031d63070f85201971 + Monotone-Revision: 61d77b3172c7a72376f9b867ab6d96136e763698 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-08-19T19:31:41 + Monotone-Branch: ca.inverse.sogo + commit 554d46709890de082a191df2286d55ba45418a07 Author: Ludovic Marcotte Date: Thu Aug 19 19:31:24 2010 +0000 @@ -42727,6 +51459,22 @@ Date: Thu Aug 19 19:31:24 2010 +0000 M UI/WebServerResources/MailerUI.js +commit d96c9f09ba5574784ae2c83b8e538c015a65df14 +Merge: 589ffd6 67720a0 +Author: Wolfgang Sourdeau +Date: Thu Aug 19 19:22:27 2010 +0000 + + merge of '0b02f6196103152cfd231e8681b65ad2464d90e6' + and '4b75d0f2673a649962c631fea2213e8dbf33a7b1' + + Monotone-Parent: 0b02f6196103152cfd231e8681b65ad2464d90e6 + Monotone-Parent: 4b75d0f2673a649962c631fea2213e8dbf33a7b1 + Monotone-Revision: 848b310c090a03db48d0571c275639c9b9b49c9f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-19T19:22:27 + Monotone-Branch: ca.inverse.sogo + commit 67720a01a0a92f38531b3b26b8202d4517bb9761 Author: Wolfgang Sourdeau Date: Thu Aug 19 19:22:08 2010 +0000 @@ -42813,6 +51561,22 @@ Date: Thu Aug 19 18:32:10 2010 +0000 M UI/WebServerResources/MailerUI.js +commit 589ffd60abba0396bfbda5ed42e09c7ed56f4e7d +Merge: 048c15c 4229a0b +Author: Francis Lachapelle +Date: Thu Aug 19 18:17:14 2010 +0000 + + merge of '069a26b1da4cd9cb430bcfa41dc9eb96e0cc8778' + and '09fb0a44c87c46e45808e833ff9299edcb07ac03' + + Monotone-Parent: 069a26b1da4cd9cb430bcfa41dc9eb96e0cc8778 + Monotone-Parent: 09fb0a44c87c46e45808e833ff9299edcb07ac03 + Monotone-Revision: 0b02f6196103152cfd231e8681b65ad2464d90e6 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-08-19T18:17:14 + Monotone-Branch: ca.inverse.sogo + commit 4229a0b55d7d7c29101fb723386b918ca2523ebc Author: Francis Lachapelle Date: Thu Aug 19 18:16:47 2010 +0000 @@ -42826,6 +51590,22 @@ Date: Thu Aug 19 18:16:47 2010 +0000 M UI/WebServerResources/MailerUI.js +commit 048c15cf3851c6f2a57689bdf4fc4877284c88f2 +Merge: 0862665 354fcbe +Author: Wolfgang Sourdeau +Date: Thu Aug 19 17:46:13 2010 +0000 + + merge of '7766ae8ec61d9568e049bfa9fb16f7452250a88a' + and 'fa4c79494b368a1d150b33a70179a532c2f71dcd' + + Monotone-Parent: 7766ae8ec61d9568e049bfa9fb16f7452250a88a + Monotone-Parent: fa4c79494b368a1d150b33a70179a532c2f71dcd + Monotone-Revision: 069a26b1da4cd9cb430bcfa41dc9eb96e0cc8778 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-19T17:46:13 + Monotone-Branch: ca.inverse.sogo + commit 354fcbecaf6d4d9ddf2dbab65adcbcb48f3af275 Author: Wolfgang Sourdeau Date: Thu Aug 19 17:46:01 2010 +0000 @@ -42852,6 +51632,21 @@ M UI/Scheduler/Swedish.lproj/Localizable.strings M UI/Scheduler/Ukrainian.lproj/Localizable.strings M UI/Scheduler/Welsh.lproj/Localizable.strings +commit 1cb1bb77e9307ae46e8b64ce0d4782c27b53b30b +Merge: 5a949e9 892c9cf +Author: Francis Lachapelle +Date: Thu Aug 19 17:45:38 2010 +0000 + + merge of '4b47b695463a14cf2c3acf6fe59fa9d778fce6c5' + and '5023b99b30755688cc4fc864ca034ae7966b1af9' + + Monotone-Parent: 4b47b695463a14cf2c3acf6fe59fa9d778fce6c5 + Monotone-Parent: 5023b99b30755688cc4fc864ca034ae7966b1af9 + Monotone-Revision: 72af4681aa9d575ba898d28f6ce6d07d6d5dafd5 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-08-19T17:45:38 + commit 5a949e9b4abce4fe9192c706dc4f9f40c32c1ffa Author: Francis Lachapelle Date: Thu Aug 19 17:45:29 2010 +0000 @@ -43051,6 +51846,22 @@ M UI/MainUI/Version M UI/WebServerResources/SOGoResizableTable.js M UI/WebServerResources/UIxPreferences.js +commit 86415633a31f63efbf6f7cc1d8f6423abd856306 +Merge: 097ef1d 27e8ebb +Author: Ludovic Marcotte +Date: Thu Aug 19 11:51:59 2010 +0000 + + merge of '130ac0c1247ae89a854346c0b781aad3257b2690' + and 'c1639ae492d9fb3315ef9630d824d8b441ff879e' + + Monotone-Parent: 130ac0c1247ae89a854346c0b781aad3257b2690 + Monotone-Parent: c1639ae492d9fb3315ef9630d824d8b441ff879e + Monotone-Revision: f1cd0d304e65e52a50441f7062e35bd9f5716f98 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-08-19T11:51:59 + Monotone-Branch: ca.inverse.sogo + commit 27e8ebb0dad182014eb6e16358e8365b8a232e7e Author: Francis Lachapelle Date: Wed Aug 18 20:48:38 2010 +0000 @@ -43079,6 +51890,22 @@ Date: Wed Aug 18 20:20:33 2010 +0000 M UI/WebServerResources/generic.css +commit 56a2b07c0317ac76fd83f0354b04498f833f3e77 +Merge: 2d1da50 50dd3ad +Author: Wolfgang Sourdeau +Date: Wed Aug 18 20:19:22 2010 +0000 + + merge of '3cd11326bdc49c91494e0a2e9cf1465efe47c52e' + and 'bb3c592590664390a1256fac17d92ed09a9484d3' + + Monotone-Parent: 3cd11326bdc49c91494e0a2e9cf1465efe47c52e + Monotone-Parent: bb3c592590664390a1256fac17d92ed09a9484d3 + Monotone-Revision: 5f3a2eb80d68bf394630219bbb989256d30629cc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-18T20:19:22 + Monotone-Branch: ca.inverse.sogo + commit 2d1da50d37c515820262f92d1c5feebe0e4a138e Author: Francis Lachapelle Date: Wed Aug 18 17:24:55 2010 +0000 @@ -43141,6 +51968,22 @@ Date: Wed Aug 18 15:38:13 2010 +0000 M SoObjects/Mailer/Version M UI/MainUI/Version +commit 0950df8354168bdb6a557083a3aee68477edfd81 +Merge: c78e451 a054856 +Author: Wolfgang Sourdeau +Date: Wed Aug 18 13:50:55 2010 +0000 + + merge of 'acb80bff5c509e32241ffa6715083280a5bb9158' + and 'b718c48057e1fd4a0cc8a43b5d71809846232ca6' + + Monotone-Parent: acb80bff5c509e32241ffa6715083280a5bb9158 + Monotone-Parent: b718c48057e1fd4a0cc8a43b5d71809846232ca6 + Monotone-Revision: f19a49f2c5d69679992d50a3ebb685975f47b75e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-18T13:50:55 + Monotone-Branch: ca.inverse.sogo + commit 7269c22841aefa7e89bdda31d8cda76474f8130e Author: Francis Lachapelle Date: Tue Aug 17 20:25:16 2010 +0000 @@ -43154,6 +51997,22 @@ Date: Tue Aug 17 20:25:16 2010 +0000 M UI/MainUI/SOGoUserHomePage.m +commit c78e4511791aa82673e87e625f082e8126bbe721 +Merge: 3945cc6 f2e91c0 +Author: Ludovic Marcotte +Date: Tue Aug 17 14:30:25 2010 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_1' (head b007aa339001e9c21adeaad9c72c7fdfc845e9b7) + to branch 'ca.inverse.sogo' (head 38aeede6f54d0b954356cd2d385ba01bbdd8aecd) + + Monotone-Parent: 38aeede6f54d0b954356cd2d385ba01bbdd8aecd + Monotone-Parent: b007aa339001e9c21adeaad9c72c7fdfc845e9b7 + Monotone-Revision: acb80bff5c509e32241ffa6715083280a5bb9158 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-08-17T14:30:25 + Monotone-Branch: ca.inverse.sogo + commit f2e91c084c9cb3f60e94b0601f946b1ae087b9ff Author: Ludovic Marcotte Date: Tue Aug 17 14:30:09 2010 +0000 @@ -43168,6 +52027,22 @@ Date: Tue Aug 17 14:30:09 2010 +0000 M SoObjects/Appointments/SOGoAppointmentObject.m +commit 3945cc64380cb12c77422ef0ac6cf82dd3e8dbad +Merge: 9596b26 25fe7bb +Author: Ludovic Marcotte +Date: Tue Aug 17 14:10:30 2010 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_1' (head 996598fce70f35fe733debbc06cb1ae8c677afe1) + to branch 'ca.inverse.sogo' (head e16807404ac6ea20632ee7e0e21ae2db34830540) + + Monotone-Parent: 996598fce70f35fe733debbc06cb1ae8c677afe1 + Monotone-Parent: e16807404ac6ea20632ee7e0e21ae2db34830540 + Monotone-Revision: 38aeede6f54d0b954356cd2d385ba01bbdd8aecd + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-08-17T14:10:30 + Monotone-Branch: ca.inverse.sogo + commit 9596b26d0314e4b46b4858eeafb85842af6b37f3 Author: Ludovic Marcotte Date: Tue Aug 17 14:10:01 2010 +0000 @@ -43330,6 +52205,22 @@ Date: Thu Aug 12 18:29:13 2010 +0000 M SoObjects/SOGo/SQLSource.h M SoObjects/SOGo/SQLSource.m +commit 39626e8569980791ffd6a288ec06ba57487c2e4e +Merge: f8e882a 89d3d4b +Author: Ludovic Marcotte +Date: Thu Aug 12 18:23:23 2010 +0000 + + propagate from branch 'ca.inverse.sogo.1_3_1' (head f6a0b62965278336b461dac36045bfae5fc07f0a) + to branch 'ca.inverse.sogo' (head aa0663eb86f38080e2ab2d20b64f30547adbfa81) + + Monotone-Parent: aa0663eb86f38080e2ab2d20b64f30547adbfa81 + Monotone-Parent: f6a0b62965278336b461dac36045bfae5fc07f0a + Monotone-Revision: 0176ffcc344892f0535563789b246aea9810ee5e + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-08-12T18:23:23 + Monotone-Branch: ca.inverse.sogo + commit f8e882ae368ca856833a4fe2aa3c06a03023c092 Author: Ludovic Marcotte Date: Thu Aug 12 18:21:21 2010 +0000 @@ -43467,6 +52358,22 @@ Date: Thu Aug 12 14:14:11 2010 +0000 M SoObjects/SOGo/DOMNode+SOGo.h +commit 9371987226666ff8f82fa5be8f4fbcf0a326c536 +Merge: 1773670 f19bba7 +Author: Wolfgang Sourdeau +Date: Thu Aug 12 14:06:56 2010 +0000 + + merge of '87eb8bb69f68316e6f95f8206ea9f665209d2b0f' + and 'e78fc689c78de581aaf34ccdcebebddeb142c5b3' + + Monotone-Parent: 87eb8bb69f68316e6f95f8206ea9f665209d2b0f + Monotone-Parent: e78fc689c78de581aaf34ccdcebebddeb142c5b3 + Monotone-Revision: 60c12b841698957b704b47490a125477543c7dc3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-12T14:06:56 + Monotone-Branch: ca.inverse.sogo + commit f19bba72922a975ed57502ec457c594ce22ea258 Author: Wolfgang Sourdeau Date: Thu Aug 12 14:02:21 2010 +0000 @@ -43650,6 +52557,22 @@ M SoObjects/Appointments/iCalEventChanges+SOGo.m M SoObjects/SOGo/SOGoContentObject.m M SoObjects/SOGo/SOGoObject.h +commit 0c4d4b099ebd589d8f50c6541abcc1e884c9bc21 +Merge: 68fbd90 43ef41e +Author: Wolfgang Sourdeau +Date: Wed Aug 11 13:33:02 2010 +0000 + + merge of '2a121cef9785165904cbe9effa330ad47ba45099' + and '9f129d083b11ce7ac964a083c351d2a15f16fbdb' + + Monotone-Parent: 2a121cef9785165904cbe9effa330ad47ba45099 + Monotone-Parent: 9f129d083b11ce7ac964a083c351d2a15f16fbdb + Monotone-Revision: ef0808300fb0a2f855c131c8d4958cef75bb1a1c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-11T13:33:02 + Monotone-Branch: ca.inverse.sogo + commit 43ef41eeb70b65cd15b22230c6eeb542ac40e664 Author: Wolfgang Sourdeau Date: Wed Aug 11 13:31:59 2010 +0000 @@ -43664,6 +52587,22 @@ Date: Wed Aug 11 13:31:59 2010 +0000 M ChangeLog M UI/Common/UIxPageFrame.m +commit 68fbd900d31b9a507b784b3d812bfd21d5b51638 +Merge: d2b67cb 71c2f1f +Author: Francis Lachapelle +Date: Tue Aug 10 14:15:50 2010 +0000 + + merge of '79070131b527d8b1a88014a212b6f2fafc9a1490' + and 'd794ef4e02f1e288bc12d1379cbaba6e67be4e25' + + Monotone-Parent: 79070131b527d8b1a88014a212b6f2fafc9a1490 + Monotone-Parent: d794ef4e02f1e288bc12d1379cbaba6e67be4e25 + Monotone-Revision: 2a121cef9785165904cbe9effa330ad47ba45099 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-08-10T14:15:50 + Monotone-Branch: ca.inverse.sogo + commit 71c2f1f4a842f7fe20dc9512228bb61b44393fd6 Author: Francis Lachapelle Date: Tue Aug 10 13:47:11 2010 +0000 @@ -44068,6 +53007,22 @@ M SoObjects/Mailer/SOGoMailForward.m M SoObjects/SOGo/SOGoUser.m M UI/MailerUI/UIxMailAccountActions.m +commit 44a7a9b099a2a86da80a8ffc3329390170196618 +Merge: 4a1c8d3 1aedf2b +Author: Wolfgang Sourdeau +Date: Fri Aug 6 14:24:02 2010 +0000 + + merge of 'aa5015ff0079b6856954284a0b566fd85c428a93' + and 'd894e5477e189d935a994c87418e92db405deacb' + + Monotone-Parent: aa5015ff0079b6856954284a0b566fd85c428a93 + Monotone-Parent: d894e5477e189d935a994c87418e92db405deacb + Monotone-Revision: ec44ffcb951f3db4e0041a44e56a9f0d5df4ef3b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-06T14:24:02 + Monotone-Branch: ca.inverse.sogo + commit 4a1c8d3753e0cec2cd9743a3666975111e8817b8 Author: Francis Lachapelle Date: Fri Aug 6 13:10:09 2010 +0000 @@ -44083,6 +53038,22 @@ Date: Fri Aug 6 13:10:09 2010 +0000 M Documentation/SOGo Installation Guide.odt +commit 1aedf2b67d19e05d5d499980d338d846d3147d78 +Merge: 99727fd 8702855 +Author: Wolfgang Sourdeau +Date: Fri Aug 6 13:08:29 2010 +0000 + + merge of '3ed5547660c034b85d2587a802d66c09ecb62b0c' + and '65a935a868913d9a39d46a15dec1fdb508cbf72f' + + Monotone-Parent: 3ed5547660c034b85d2587a802d66c09ecb62b0c + Monotone-Parent: 65a935a868913d9a39d46a15dec1fdb508cbf72f + Monotone-Revision: d894e5477e189d935a994c87418e92db405deacb + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-06T13:08:29 + Monotone-Branch: ca.inverse.sogo + commit 87028555202c546a745da0f6234beb616eb1c21f Author: Wolfgang Sourdeau Date: Fri Aug 6 12:45:02 2010 +0000 @@ -44145,6 +53116,22 @@ Date: Thu Aug 5 21:23:48 2010 +0000 M ChangeLog M UI/WebServerResources/SOGoResizableTable.js +commit 1cec1589228d7d164a6d838178b98f229fe45bd8 +Merge: e7ab667 c1a74a3 +Author: Wolfgang Sourdeau +Date: Thu Aug 5 20:41:14 2010 +0000 + + merge of '4ebbfbccc5eec87857b36901546058740ff96f2b' + and '8bd35931f4458c8afad7fa3cb3f169897d94d25b' + + Monotone-Parent: 4ebbfbccc5eec87857b36901546058740ff96f2b + Monotone-Parent: 8bd35931f4458c8afad7fa3cb3f169897d94d25b + Monotone-Revision: e7d394203e99a74856b665487e4681aa70114480 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-05T20:41:14 + Monotone-Branch: ca.inverse.sogo + commit c1a74a3ae70ce8ce2c708b7adfe5d8371e7ce674 Author: Wolfgang Sourdeau Date: Thu Aug 5 17:43:43 2010 +0000 @@ -44175,6 +53162,22 @@ Date: Thu Aug 5 17:42:24 2010 +0000 M UI/WebServerResources/MailerUIdTree.js +commit e7ab6675733486686606375036bb13deb4760c30 +Merge: b89f56a 76312d1 +Author: Francis Lachapelle +Date: Thu Aug 5 15:58:20 2010 +0000 + + merge of '96aed5aa92f481740bda8d0b5c68aa4b21c762f0' + and 'd05f8aecb657893bff2082d8a6401c885709a426' + + Monotone-Parent: 96aed5aa92f481740bda8d0b5c68aa4b21c762f0 + Monotone-Parent: d05f8aecb657893bff2082d8a6401c885709a426 + Monotone-Revision: 4ebbfbccc5eec87857b36901546058740ff96f2b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-08-05T15:58:20 + Monotone-Branch: ca.inverse.sogo + commit 76312d1a9badb40d1b18982fa21f43125c0587d5 Author: Francis Lachapelle Date: Thu Aug 5 15:57:09 2010 +0000 @@ -44193,6 +53196,22 @@ M UI/WebServerResources/generic.css M UI/WebServerResources/generic.js M UI/WebServerResources/iefixes.css +commit b89f56a6e01509fce1035ec97efdc1f8f33928b1 +Merge: 662f6d5 d1912a4 +Author: Wolfgang Sourdeau +Date: Wed Aug 4 20:38:22 2010 +0000 + + merge of '7e80d62d21237dc99d74c702f53f591b1fd10acc' + and '903126052b2bc7a486d1885b2118aad411d1b2f2' + + Monotone-Parent: 7e80d62d21237dc99d74c702f53f591b1fd10acc + Monotone-Parent: 903126052b2bc7a486d1885b2118aad411d1b2f2 + Monotone-Revision: 96aed5aa92f481740bda8d0b5c68aa4b21c762f0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-08-04T20:38:22 + Monotone-Branch: ca.inverse.sogo + commit 662f6d509a7710fd8a81148e2b04311cb4c8207d Author: Francis Lachapelle Date: Wed Aug 4 17:59:43 2010 +0000 @@ -44554,6 +53573,22 @@ Date: Mon Aug 2 20:29:38 2010 +0000 M ChangeLog M SoObjects/SOGo/NSNumber+Utilities.m +commit 004b5300d58a1739549e1895e952721243dffd03 +Merge: beaf3e9 9b0e5ae +Author: Ludovic Marcotte +Date: Mon Aug 2 14:55:15 2010 +0000 + + merge of '858a9ca804ecabd66c735a54fe09bd4e5b7ec5b2' + and 'a8e20b13effb8b62bfe9471ec95ca5dd7eb9dd3d' + + Monotone-Parent: 858a9ca804ecabd66c735a54fe09bd4e5b7ec5b2 + Monotone-Parent: a8e20b13effb8b62bfe9471ec95ca5dd7eb9dd3d + Monotone-Revision: 8330dfa1ad05eb096cee895845442bf564cf19bd + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-08-02T14:55:15 + Monotone-Branch: ca.inverse.sogo + commit beaf3e9b7d49341ec3852299130f48880124e429 Author: Francis Lachapelle Date: Fri Jul 30 20:10:00 2010 +0000 @@ -44717,6 +53752,38 @@ M UI/MailPartViewers/Ukrainian.lproj/Localizable.strings M UI/MailPartViewers/Welsh.lproj/Localizable.strings M UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox +commit 9c5e953aa827d491e5af8540f745acc6027be944 +Merge: 08b60dd 31f3268 +Author: Francis Lachapelle +Date: Mon Jul 26 13:20:23 2010 +0000 + + merge of '0ce8c0fe1af6188f22754102040d63f124d3761b' + and '98ba3d5ee1d111284dfb68999ac43af19ef48122' + + Monotone-Parent: 0ce8c0fe1af6188f22754102040d63f124d3761b + Monotone-Parent: 98ba3d5ee1d111284dfb68999ac43af19ef48122 + Monotone-Revision: bdac9c079f5f6f8a742d138d4a5f9d41043ae013 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-07-26T13:20:23 + Monotone-Branch: ca.inverse.sogo + +commit 31f3268985962b13169f13514f7cec539a0d56cb +Merge: eccf14e 6f9045f +Author: Wolfgang Sourdeau +Date: Thu Jul 22 17:54:48 2010 +0000 + + merge of '1475912d0e20ad5f1180b0921306270039272161' + and '5af7a1393148e6e3508fd84f023b7a907fc67c25' + + Monotone-Parent: 1475912d0e20ad5f1180b0921306270039272161 + Monotone-Parent: 5af7a1393148e6e3508fd84f023b7a907fc67c25 + Monotone-Revision: 98ba3d5ee1d111284dfb68999ac43af19ef48122 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-07-22T17:54:48 + Monotone-Branch: ca.inverse.sogo + commit eccf14efd0c2e8cddcc78eeec9f656efa476357c Author: Ludovic Marcotte Date: Thu Jul 22 15:13:09 2010 +0000 @@ -44739,6 +53806,22 @@ A Migration/Horde/config.py.in A Migration/Horde/signature.py A Migration/Horde/turba.py +commit 6f9045fd2d63816a020b2f64ed86223970b2f405 +Merge: 4307be0 b5a8dfa +Author: Wolfgang Sourdeau +Date: Wed Jul 21 16:00:54 2010 +0000 + + merge of '027083e4ddfcc14898e7dd8b6e08c73058f18778' + and '775c77bf29362b522a5e4bc462f291c0cd1f4aaa' + + Monotone-Parent: 027083e4ddfcc14898e7dd8b6e08c73058f18778 + Monotone-Parent: 775c77bf29362b522a5e4bc462f291c0cd1f4aaa + Monotone-Revision: 5af7a1393148e6e3508fd84f023b7a907fc67c25 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-07-21T16:00:54 + Monotone-Branch: ca.inverse.sogo + commit b5a8dfae627faf0192354f6e24f25fa35c444e2e Author: Wolfgang Sourdeau Date: Wed Jul 21 16:00:51 2010 +0000 @@ -44822,6 +53905,22 @@ M UI/MailPartViewers/French.lproj/Localizable.strings M UI/Scheduler/French.lproj/Localizable.strings M UI/WebServerResources/ContactsUI.js +commit 65ec32bfb7c3daf6decaba66ba5075703a2c325f +Merge: 1585f25 c942ad9 +Author: Ludovic Marcotte +Date: Tue Jul 20 17:39:10 2010 +0000 + + merge of '6c3973de5dad3f2478a806c7eb196f3a1a7d66a8' + and '8c3f435e214cb69b7980be52ef28c9a08c8f6385' + + Monotone-Parent: 6c3973de5dad3f2478a806c7eb196f3a1a7d66a8 + Monotone-Parent: 8c3f435e214cb69b7980be52ef28c9a08c8f6385 + Monotone-Revision: 82a45236051a8825c5786369ead73de38b7f5183 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-07-20T17:39:10 + Monotone-Branch: ca.inverse.sogo + commit 1585f25c2b950d8d99116f4b9ab92836b2924aec Author: Wolfgang Sourdeau Date: Tue Jul 20 18:50:12 2010 +0000 @@ -44961,6 +54060,22 @@ M SOPE/NGCards/NGVCard.m A SOPE/NGCards/NGVCardPhoto.h A SOPE/NGCards/NGVCardPhoto.m +commit 4500f4ad2d1a1dea89c677897202e030ebf4ddbc +Merge: a4e3042 db34f79 +Author: Wolfgang Sourdeau +Date: Fri Jul 16 17:30:09 2010 +0000 + + merge of 'a2eae89ac32b5eb74e9d2879fd2b60d50e3e7071' + and 'b10b8128ebc4881915a970495f64caebed8fa4e9' + + Monotone-Parent: a2eae89ac32b5eb74e9d2879fd2b60d50e3e7071 + Monotone-Parent: b10b8128ebc4881915a970495f64caebed8fa4e9 + Monotone-Revision: b9ef4467c8539893214db9196096daa10370d0a6 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-07-16T17:30:09 + Monotone-Branch: ca.inverse.sogo + commit a4e3042fe09dbf617a319d49c044017f94591bac Author: Wolfgang Sourdeau Date: Fri Jul 16 17:22:42 2010 +0000 @@ -45052,6 +54167,22 @@ Date: Fri Jul 16 14:19:34 2010 +0000 M SOPE/NGCards/NSArray+NGCards.m +commit bd8d65dc529b4000ee0e29c712c55bff6a40a736 +Merge: 48d13cc dd963bb +Author: Ludovic Marcotte +Date: Fri Jul 16 11:50:23 2010 +0000 + + merge of '63d885278525c121ba22e743c666e34900d9cf2b' + and '764dc2a57b1679736fee67beb1479636c8a1b54b' + + Monotone-Parent: 63d885278525c121ba22e743c666e34900d9cf2b + Monotone-Parent: 764dc2a57b1679736fee67beb1479636c8a1b54b + Monotone-Revision: d68ff2564716354de100688f82825ac0b5a5f2e9 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-07-16T11:50:23 + Monotone-Branch: ca.inverse.sogo + commit dd963bb03c7df4fbce013560667295a1b7e3a143 Author: Ludovic Marcotte Date: Fri Jul 16 11:47:22 2010 +0000 @@ -45067,6 +54198,22 @@ Date: Fri Jul 16 11:47:22 2010 +0000 M sogo.spec +commit 48d13cc12baff89d399e2b9ab344e8b0f1a3818e +Merge: 0d222c2 b764a6e +Author: Ludovic Marcotte +Date: Fri Jul 16 11:34:10 2010 +0000 + + merge of '9ea99adedaf5e690e25346e8ed3b4051c589bddc' + and 'e750571b424fd6eb63b5c1e2704f0f04635a6e51' + + Monotone-Parent: 9ea99adedaf5e690e25346e8ed3b4051c589bddc + Monotone-Parent: e750571b424fd6eb63b5c1e2704f0f04635a6e51 + Monotone-Revision: 63d885278525c121ba22e743c666e34900d9cf2b + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-07-16T11:34:10 + Monotone-Branch: ca.inverse.sogo + commit 0d222c27740d260a2d977cb213e37e812bff1095 Author: Wolfgang Sourdeau Date: Fri Jul 16 02:22:52 2010 +0000 @@ -45094,6 +54241,22 @@ Date: Fri Jul 16 02:21:01 2010 +0000 M ChangeLog M UI/Scheduler/UIxCalListingActions.m +commit 08b60dd47a438d0f354c304f4333a3df994f120a +Merge: 12ab791 b764a6e +Author: Francis Lachapelle +Date: Thu Jul 15 18:30:07 2010 +0000 + + merge of '1239295b979f0ffa4eaaaac3d20eda7873f1606d' + and 'e750571b424fd6eb63b5c1e2704f0f04635a6e51' + + Monotone-Parent: 1239295b979f0ffa4eaaaac3d20eda7873f1606d + Monotone-Parent: e750571b424fd6eb63b5c1e2704f0f04635a6e51 + Monotone-Revision: 0ce8c0fe1af6188f22754102040d63f124d3761b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-07-15T18:30:07 + Monotone-Branch: ca.inverse.sogo + commit bafbffcf6db0030faf4bad24919b269cc91c4e47 Author: Wolfgang Sourdeau Date: Thu Jul 15 17:10:46 2010 +0000 @@ -45208,6 +54371,22 @@ Date: Thu Jul 15 16:40:26 2010 +0000 M ChangeLog M UI/WebServerResources/UIxAppointmentEditor.js +commit b764a6e811ab651fe9d39cb09522aefd663af618 +Merge: 106dfe4 bafbffc +Author: Ludovic Marcotte +Date: Thu Jul 15 16:16:06 2010 +0000 + + merge of '3bf253d3d887017200751e451da4fd1a31cc57ce' + and '77a1a396ead2722d4c170d71c3f90eb39e0a4eee' + + Monotone-Parent: 3bf253d3d887017200751e451da4fd1a31cc57ce + Monotone-Parent: 77a1a396ead2722d4c170d71c3f90eb39e0a4eee + Monotone-Revision: e750571b424fd6eb63b5c1e2704f0f04635a6e51 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-07-15T16:16:06 + Monotone-Branch: ca.inverse.sogo + commit 106dfe4dbbad15d37d9a37d18c4e33f17e28e16f Author: Ludovic Marcotte Date: Thu Jul 15 15:03:35 2010 +0000 @@ -45340,6 +54519,38 @@ Date: Wed Jul 14 23:09:41 2010 +0000 M ChangeLog M Tests/Integration/test-davacl.py +commit 12ab7913f37117e6173d7262235d4e3af8d785a4 +Merge: 5331f00 780be72 +Author: Francis Lachapelle +Date: Wed Jul 14 22:30:00 2010 +0000 + + merge of '13eac3b68ef15a1ef039875fa0d5b9c4c2662728' + and '4520bccbe080f6685e84dc4ecd3ae2c5d9741940' + + Monotone-Parent: 13eac3b68ef15a1ef039875fa0d5b9c4c2662728 + Monotone-Parent: 4520bccbe080f6685e84dc4ecd3ae2c5d9741940 + Monotone-Revision: 1239295b979f0ffa4eaaaac3d20eda7873f1606d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-07-14T22:30:00 + Monotone-Branch: ca.inverse.sogo + +commit b530e071398ba20b1d743731d77e8f5af3c03c88 +Merge: 100285f ba1e5eb +Author: Wolfgang Sourdeau +Date: Wed Jul 14 20:37:47 2010 +0000 + + merge of '9b5cf1dad0f0c1ebc67a93241e06b486406df417' + and 'fcaffd578bcbd7038ac7318f0436491a6b5b04b6' + + Monotone-Parent: 9b5cf1dad0f0c1ebc67a93241e06b486406df417 + Monotone-Parent: fcaffd578bcbd7038ac7318f0436491a6b5b04b6 + Monotone-Revision: d6e0c020944934e7bb1070c67f8eca954c679efd + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-07-14T20:37:47 + Monotone-Branch: ca.inverse.sogo + commit 100285f763d0c5a9f24ef7d5312884f2aec43794 Author: Wolfgang Sourdeau Date: Wed Jul 14 20:37:38 2010 +0000 @@ -45373,6 +54584,22 @@ A Scripts/sql-update-1.2.2_to_1.3.0.sh M debian/sogo.docs M sogo.spec +commit 5331f00151fd45d6942a03362f2483001cd32f82 +Merge: 121119a bed50b5 +Author: Francis Lachapelle +Date: Wed Jul 14 15:33:35 2010 +0000 + + merge of '6241da9328c33188944caa2dcd2511fa0574ea5b' + and 'fadda581fd1abe4d86b55b0e83a0de4f42e41119' + + Monotone-Parent: 6241da9328c33188944caa2dcd2511fa0574ea5b + Monotone-Parent: fadda581fd1abe4d86b55b0e83a0de4f42e41119 + Monotone-Revision: 13eac3b68ef15a1ef039875fa0d5b9c4c2662728 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-07-14T15:33:35 + Monotone-Branch: ca.inverse.sogo + commit bed50b5b59b92aef504c2ef9b15b99313460ffe9 Author: Wolfgang Sourdeau Date: Wed Jul 14 14:13:10 2010 +0000 @@ -45685,6 +54912,22 @@ M UI/Contacts/Ukrainian.lproj/Localizable.strings M UI/Contacts/Welsh.lproj/Localizable.strings M UI/Templates/ContactsUI/UIxContactEditor.wox +commit 4b475ed7000662a068fa32810935b79126ef7165 +Merge: a08e5bd a9e204c +Author: Francis Lachapelle +Date: Wed Jun 30 21:12:43 2010 +0000 + + merge of 'bfae70f2a55e4f192f4b03068a3818e1458c8eef' + and 'e65f23f90fb5c66f4d022a83e3635b9f7d5973d8' + + Monotone-Parent: bfae70f2a55e4f192f4b03068a3818e1458c8eef + Monotone-Parent: e65f23f90fb5c66f4d022a83e3635b9f7d5973d8 + Monotone-Revision: d254b5cdebcd1a874f8b12799ae49020476c4295 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-06-30T21:12:43 + Monotone-Branch: ca.inverse.sogo + commit a9e204cb5019f60265ddfb2fc0e7a95cc535f3f5 Author: Francis Lachapelle Date: Wed Jun 30 21:12:11 2010 +0000 @@ -45802,6 +55045,22 @@ Date: Tue Jun 29 23:41:24 2010 +0000 M ChangeLog M UI/WebServerResources/MailerUI.js +commit 6707629e4b81cc807d82b9017d15cc11b3d63174 +Merge: 6682a6e 0ff309b +Author: Francis Lachapelle +Date: Tue Jun 29 20:32:33 2010 +0000 + + merge of '609fcde70ee5ebcb8ef0f4c8d578eb1e7ac74e09' + and 'aa47b57f3bbc833ffcc7199f21b79f0453a1cd87' + + Monotone-Parent: 609fcde70ee5ebcb8ef0f4c8d578eb1e7ac74e09 + Monotone-Parent: aa47b57f3bbc833ffcc7199f21b79f0453a1cd87 + Monotone-Revision: 5b2d034015171bcc6958b829b7479e9040fcef98 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-06-29T20:32:33 + Monotone-Branch: ca.inverse.sogo + commit 0ff309bb15cedbfa1d2567d506738065d7588cbb Author: Francis Lachapelle Date: Tue Jun 29 20:21:48 2010 +0000 @@ -45963,6 +55222,22 @@ M UI/WebServerResources/MailerUI.js M UI/WebServerResources/SOGoDataTable.js M UI/WebServerResources/SOGoMailDataSource.js +commit 339a9b60c51ad9a502533dddaaf6d089f7702795 +Merge: 96a5913 87f02a7 +Author: Wolfgang Sourdeau +Date: Wed Jun 23 21:01:07 2010 +0000 + + merge of '00387fb21eaf4cb1b4d1ece522a38e6417a162c1' + and '3316e8de631c5da2b7ba6c4505fa74b707b80b51' + + Monotone-Parent: 00387fb21eaf4cb1b4d1ece522a38e6417a162c1 + Monotone-Parent: 3316e8de631c5da2b7ba6c4505fa74b707b80b51 + Monotone-Revision: 2b83c62317d266d5f7a2e2046fc19f68f88a385f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-06-23T21:01:07 + Monotone-Branch: ca.inverse.sogo + commit 87f02a755d52129c5ae9bba8edd8fe72a8ef521e Author: Ludovic Marcotte Date: Wed Jun 23 19:46:51 2010 +0000 @@ -45995,6 +55270,22 @@ M ChangeLog M SoObjects/SOGo/SOGoUserDefaults.m M UI/Scheduler/UIxCalMonthView.m +commit 48658b274123b82a8bc86a4473f208b6c6b2b8ac +Merge: f36586e d1e2c5e +Author: Francis Lachapelle +Date: Wed Jun 23 15:47:50 2010 +0000 + + merge of '517b4606eb0bf70ff837ab032cd258dfcca1e292' + and '77c7a08939b557080f47653bfa1203e557eb14d2' + + Monotone-Parent: 517b4606eb0bf70ff837ab032cd258dfcca1e292 + Monotone-Parent: 77c7a08939b557080f47653bfa1203e557eb14d2 + Monotone-Revision: 9cb63fedb848baac983ef94694d11b7e242eef67 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-06-23T15:47:50 + Monotone-Branch: ca.inverse.sogo + commit f36586ef1635efb6b46cc1547dcf0846cf05b4d1 Author: Francis Lachapelle Date: Wed Jun 23 15:47:35 2010 +0000 @@ -46106,6 +55397,22 @@ M UI/WebServerResources/ckeditor/skins/v2/editor.css M UI/WebServerResources/ckeditor/skins/v2/templates.css M UI/WebServerResources/ckeditor/themes/default/theme.js +commit d1e2c5e1bf253a4353c6b49a16625228d5e5cefa +Merge: ddaf28f 633c7be +Author: Wolfgang Sourdeau +Date: Wed Jun 23 15:06:22 2010 +0000 + + merge of '432bfd0df53df4464e70c8b82989b3fcc7aa849e' + and '8e1a3af5628f31703023508d2fb742a933691c15' + + Monotone-Parent: 432bfd0df53df4464e70c8b82989b3fcc7aa849e + Monotone-Parent: 8e1a3af5628f31703023508d2fb742a933691c15 + Monotone-Revision: 77c7a08939b557080f47653bfa1203e557eb14d2 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-06-23T15:06:22 + Monotone-Branch: ca.inverse.sogo + commit ddaf28fc24e72b79176ec8b909efa223c4184d9f Author: Wolfgang Sourdeau Date: Wed Jun 23 14:47:20 2010 +0000 @@ -46271,6 +55578,22 @@ Date: Thu Jun 17 19:54:19 2010 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolders.m +commit 9c6a95c49b37a0447d0b284341f6279f300158c5 +Merge: 8e8c5c4 98df4f0 +Author: Wolfgang Sourdeau +Date: Wed Jun 16 21:17:09 2010 +0000 + + merge of 'f0bbd5c2ee25d0180b238170194330bf01bfa9fd' + and 'fb988c964ef041fc784d33b6c0cf192735fe88a0' + + Monotone-Parent: f0bbd5c2ee25d0180b238170194330bf01bfa9fd + Monotone-Parent: fb988c964ef041fc784d33b6c0cf192735fe88a0 + Monotone-Revision: 497c7c0a555d415e36d1f2aba0f96b960a3f0c8c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-06-16T21:17:09 + Monotone-Branch: ca.inverse.sogo + commit 8e8c5c4b88df1abcebbe13bf127570e668dce98b Author: Wolfgang Sourdeau Date: Wed Jun 16 21:15:34 2010 +0000 @@ -46883,6 +56206,22 @@ Date: Mon Jun 7 12:46:35 2010 +0000 M SoObjects/Appointments/SOGoAppointmentFolders.m +commit 7c98ada22309b1cd2adaa68a6f00261757a40a57 +Merge: bef2e77 49ab6e5 +Author: Wolfgang Sourdeau +Date: Mon Jun 7 12:45:25 2010 +0000 + + merge of '04792139eaeaa95bfa70e66349320e38518eb8da' + and 'f273242650aaecbcba217ab4ee2f04f5964f3ab0' + + Monotone-Parent: 04792139eaeaa95bfa70e66349320e38518eb8da + Monotone-Parent: f273242650aaecbcba217ab4ee2f04f5964f3ab0 + Monotone-Revision: 6d601c4d925dd7c8ff8648909b7bde1e3097127d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-06-07T12:45:25 + Monotone-Branch: ca.inverse.sogo + commit bef2e7773319ba31955f90200cdce162cef45769 Author: Francis Lachapelle Date: Mon Jun 7 16:31:51 2010 +0000 @@ -46899,6 +56238,22 @@ M UI/WebServerResources/MailerUI.js M UI/WebServerResources/SOGoDataTable.js M UI/WebServerResources/iefixes.css +commit 3df8728a68a09f8674d1b915e3d4bb6fd90ec93c +Merge: dcf4086 1191c6b +Author: Wolfgang Sourdeau +Date: Mon Jun 7 13:51:45 2010 +0000 + + merge of '10fadb79fc28a892498ff228f648c363587ed6e4' + and '6e082f09a153b3a0152c5b9355a2001b3c542c96' + + Monotone-Parent: 10fadb79fc28a892498ff228f648c363587ed6e4 + Monotone-Parent: 6e082f09a153b3a0152c5b9355a2001b3c542c96 + Monotone-Revision: 85281fd909e8f0d613327a321fb964be7ca872ca + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-06-07T13:51:45 + Monotone-Branch: ca.inverse.sogo + commit dcf408630cb04aa27604a4bbba78358df1a8c243 Author: Francis Lachapelle Date: Mon Jun 7 13:34:10 2010 +0000 @@ -47058,6 +56413,22 @@ Date: Fri Jun 4 21:14:17 2010 +0000 M ChangeLog M UI/Common/UIxUserRightsEditor.m +commit 00ffd36ca6f49ab85bc74159b3f5e1db8817d2e5 +Merge: 167a270 6728b5e +Author: Wolfgang Sourdeau +Date: Fri Jun 4 20:54:51 2010 +0000 + + merge of '10e4639d26e8856e1d1cce589fc7dcdd0639f703' + and '5402e16ca9d296346561a48b192ce3ed97373e2c' + + Monotone-Parent: 10e4639d26e8856e1d1cce589fc7dcdd0639f703 + Monotone-Parent: 5402e16ca9d296346561a48b192ce3ed97373e2c + Monotone-Revision: 75884864019e8268f2d2a24b534d0020370d2de5 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-06-04T20:54:51 + Monotone-Branch: ca.inverse.sogo + commit 6728b5eed6df6c4537917368ef0ae151a35ae6d6 Author: Wolfgang Sourdeau Date: Fri Jun 4 20:54:07 2010 +0000 @@ -47207,6 +56578,22 @@ D UI/Common/Toolbars/SOGoAclOwner.toolbar M UI/Templates/UIxAclEditor.wox M UI/WebServerResources/UIxAclEditor.css +commit dea9c242ea50417977286655becc30c0100d3a05 +Merge: 0959a88 31db238 +Author: Wolfgang Sourdeau +Date: Thu Jun 3 14:44:09 2010 +0000 + + merge of '7f2779135e9501efcfbb73fce0b3d244687ecaa4' + and '8e95e810adc0d63b540e7ad1bde7d23e688bd3b1' + + Monotone-Parent: 7f2779135e9501efcfbb73fce0b3d244687ecaa4 + Monotone-Parent: 8e95e810adc0d63b540e7ad1bde7d23e688bd3b1 + Monotone-Revision: 76b40deecb2e5b69e47348707c29710d2db05142 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-06-03T14:44:09 + Monotone-Branch: ca.inverse.sogo + commit 0959a88ea9c15585a3515385be85a1a8071aefeb Author: Wolfgang Sourdeau Date: Thu Jun 3 14:43:38 2010 +0000 @@ -47507,6 +56894,38 @@ M SoObjects/SOGo/SOGoUser.m M SoObjects/SOGo/SOGoWebAuthenticator.m M UI/MainUI/product.plist +commit 26cb2290ac65e549e1480ea486e2a56154131111 +Merge: f3b15c6 853060f +Author: Wolfgang Sourdeau +Date: Wed Jun 2 15:02:46 2010 +0000 + + merge of '33c96e6881c7a8bafb056ea86ca1517c42edb343' + and '5a7b30b7d5f425b2c0c3b96e6f1afb39c15257d7' + + Monotone-Parent: 33c96e6881c7a8bafb056ea86ca1517c42edb343 + Monotone-Parent: 5a7b30b7d5f425b2c0c3b96e6f1afb39c15257d7 + Monotone-Revision: 4ac4ae3613d51d31b8aa0f22e8581e25651b89fd + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-06-02T15:02:46 + Monotone-Branch: ca.inverse.sogo + +commit 31db238c4d31ff3decb95b443030304d5c288305 +Merge: 01e57b5 ab171b7 +Author: Francis Lachapelle +Date: Wed Jun 2 04:35:59 2010 +0000 + + merge of '137a22f54c5009171918bdd3a3e136138e9f9a67' + and 'c896a0d9f1b127ab4c1d9c4ba270727464984c2b' + + Monotone-Parent: 137a22f54c5009171918bdd3a3e136138e9f9a67 + Monotone-Parent: c896a0d9f1b127ab4c1d9c4ba270727464984c2b + Monotone-Revision: 8e95e810adc0d63b540e7ad1bde7d23e688bd3b1 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-06-02T04:35:59 + Monotone-Branch: ca.inverse.sogo + commit 01e57b599ac7560dcd0d14b1668d976459e2595f Author: Francis Lachapelle Date: Wed Jun 2 04:35:30 2010 +0000 @@ -47660,6 +57079,22 @@ Date: Tue Jun 1 17:35:51 2010 +0000 M ChangeLog M Tests/Integration/all.py +commit bb83e75057ea5977fc410a20a8833e204d04eed0 +Merge: 25ef214 990940c +Author: Wolfgang Sourdeau +Date: Tue Jun 1 14:09:31 2010 +0000 + + merge of '92aa17abc68474bee4eb24c3a407d5e730164973' + and 'a7ffefd73526ec82019cd487dbeacfa8219526c9' + + Monotone-Parent: 92aa17abc68474bee4eb24c3a407d5e730164973 + Monotone-Parent: a7ffefd73526ec82019cd487dbeacfa8219526c9 + Monotone-Revision: bda8c0c7d4f41ed2b18820b74e11fe35187b1afe + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-06-01T14:09:31 + Monotone-Branch: ca.inverse.sogo + commit 25ef21457302fbb9a4f08305c7041accb18f91d9 Author: Wolfgang Sourdeau Date: Tue Jun 1 14:08:59 2010 +0000 @@ -47837,6 +57272,22 @@ M UI/MailerUI/UIxMailListActions.h M UI/MailerUI/UIxMailListActions.m M UI/MailerUI/product.plist +commit 4b63a768c41e1d6ff94445c4ac7a75fe7c9786c2 +Merge: 8c0b02f a99d7b9 +Author: Francis Lachapelle +Date: Thu May 27 17:08:22 2010 +0000 + + merge of '29fd9949fb7298bd5c25f926f16a0126f65f6b15' + and '8db65223b26070872a7995e55aefc91c7b932796' + + Monotone-Parent: 29fd9949fb7298bd5c25f926f16a0126f65f6b15 + Monotone-Parent: 8db65223b26070872a7995e55aefc91c7b932796 + Monotone-Revision: fdc663e746cda0a1106c97d2d9af95b6eb0d1b40 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-05-27T17:08:22 + Monotone-Branch: ca.inverse.sogo + commit 8c0b02f57cce28734b56752645c5113511e766e6 Author: Francis Lachapelle Date: Thu May 27 17:00:22 2010 +0000 @@ -47863,6 +57314,22 @@ M UI/MainUI/Spanish.lproj/Localizable.strings M UI/MainUI/Swedish.lproj/Localizable.strings M UI/MainUI/Welsh.lproj/Localizable.strings +commit a99d7b9b90f14739d328475a135543e22071b600 +Merge: 3c0bf46 cae9967 +Author: Wolfgang Sourdeau +Date: Thu May 27 15:28:27 2010 +0000 + + merge of '4c3c63649f1424cf932228d812cb2a38ae67b434' + and 'aa9e23f566f7242b956beb43ee6e8103d5ac7f3c' + + Monotone-Parent: 4c3c63649f1424cf932228d812cb2a38ae67b434 + Monotone-Parent: aa9e23f566f7242b956beb43ee6e8103d5ac7f3c + Monotone-Revision: 8db65223b26070872a7995e55aefc91c7b932796 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-05-27T15:28:27 + Monotone-Branch: ca.inverse.sogo + commit cae996785af6d2262dbbfd18e865d19355af8ca0 Author: Wolfgang Sourdeau Date: Thu May 27 15:27:44 2010 +0000 @@ -47998,6 +57465,22 @@ M ChangeLog M UI/WebServerResources/SchedulerUI.css M UI/WebServerResources/SchedulerUIDnD.js +commit 417f5552385d0b061e628eb2f13623c5786d03a4 +Merge: b036d4b 505015a +Author: Francis Lachapelle +Date: Tue May 25 14:42:25 2010 +0000 + + merge of 'c7bedf71e117aebb3c471ca7dafef74ece6a678a' + and 'dd36447201e91b020480c7a6fea71a74097cf9fd' + + Monotone-Parent: c7bedf71e117aebb3c471ca7dafef74ece6a678a + Monotone-Parent: dd36447201e91b020480c7a6fea71a74097cf9fd + Monotone-Revision: 027321e56420de11bdfda4ed6b6c00478c2c22c7 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-05-25T14:42:25 + Monotone-Branch: ca.inverse.sogo + commit 505015a68e4a809421133e5cd881e79ecd2ee00e Author: Wolfgang Sourdeau Date: Tue May 25 13:46:36 2010 +0000 @@ -48078,6 +57561,22 @@ Date: Fri May 21 21:21:19 2010 +0000 M SoObjects/SOGo/SOGoDefaults.plist +commit b036d4baac479e285b589b7be38f8acf72cc51ff +Merge: 661d3f2 d2ca80f +Author: Francis Lachapelle +Date: Sun May 16 19:24:36 2010 +0000 + + merge of '0891f9bac2704aa4c0ef0224c54360af14c5618a' + and '7bb42646015cb99b0c6dfe942e088aba59cc5991' + + Monotone-Parent: 0891f9bac2704aa4c0ef0224c54360af14c5618a + Monotone-Parent: 7bb42646015cb99b0c6dfe942e088aba59cc5991 + Monotone-Revision: c7bedf71e117aebb3c471ca7dafef74ece6a678a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-05-16T19:24:36 + Monotone-Branch: ca.inverse.sogo + commit 661d3f28099e34833fe4a29f48b577888bd3ad99 Author: Francis Lachapelle Date: Sun May 16 19:24:07 2010 +0000 @@ -48521,6 +58020,22 @@ Date: Wed May 5 20:23:10 2010 +0000 M NEWS +commit cb8c1f6522b476110e95dfd55002a8c848f5e404 +Merge: 83831ab 1a54a38 +Author: Wolfgang Sourdeau +Date: Wed May 5 18:52:51 2010 +0000 + + merge of '29dc700a0a33827e16bd46a8d97f89d5f11630e9' + and 'b539ed81e839a831ce07b7618690feb8ac799176' + + Monotone-Parent: 29dc700a0a33827e16bd46a8d97f89d5f11630e9 + Monotone-Parent: b539ed81e839a831ce07b7618690feb8ac799176 + Monotone-Revision: a322b26bc82b5d04dfdd3997d676eec971639aec + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-05-05T18:52:51 + Monotone-Branch: ca.inverse.sogo + commit 1a54a3819486974089321fa223ea163898632daa Author: Wolfgang Sourdeau Date: Wed May 5 18:52:26 2010 +0000 @@ -48681,6 +58196,22 @@ Date: Wed May 5 13:46:58 2010 +0000 M SOPE/NGCards/versitCardsSaxDriver/ChangeLog M SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m +commit 2864ffff1e1218cc72b8aa7916eb8237b65a46ca +Merge: fb8a440 312ed28 +Author: Wolfgang Sourdeau +Date: Wed May 5 13:45:26 2010 +0000 + + merge of '2cbf84f8b8523601758341cbc178cf538f0a6dee' + and 'f2d1ff2e80e90f3c3d73fe6006e22ee1e9d39b01' + + Monotone-Parent: 2cbf84f8b8523601758341cbc178cf538f0a6dee + Monotone-Parent: f2d1ff2e80e90f3c3d73fe6006e22ee1e9d39b01 + Monotone-Revision: 915f4f176feb772bfa74b034b6b7ce28f66778f8 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-05-05T13:45:26 + Monotone-Branch: ca.inverse.sogo + commit 312ed2824fd1e94746209431dac6111de0030de9 Author: Wolfgang Sourdeau Date: Wed May 5 13:45:18 2010 +0000 @@ -48696,6 +58227,22 @@ M SOPE/NGCards/ChangeLog M SOPE/NGCards/iCalEntityObject.h M SOPE/NGCards/iCalEntityObject.m +commit 1f02dbc73463634eedfe448888e3c1f1e380d163 +Merge: 8ca67ca fb8a440 +Author: Francis Lachapelle +Date: Tue May 4 21:37:39 2010 +0000 + + merge of '0c7a3586830c4d7e3ddd7bb0a43931475b8e83f2' + and '2cbf84f8b8523601758341cbc178cf538f0a6dee' + + Monotone-Parent: 0c7a3586830c4d7e3ddd7bb0a43931475b8e83f2 + Monotone-Parent: 2cbf84f8b8523601758341cbc178cf538f0a6dee + Monotone-Revision: 77fd2c6c49b1f4507e0f5be304a29a407392053a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-05-04T21:37:39 + Monotone-Branch: ca.inverse.sogo + commit 8ca67ca9340ec016c5b81074f80572ae018a06ad Author: Francis Lachapelle Date: Tue May 4 21:37:16 2010 +0000 @@ -48738,6 +58285,23 @@ Date: Tue May 4 20:46:24 2010 +0000 M debian/changelog +commit 972dbbfeaf78d7dbcd08d40795852e4f5650c3ee +Merge: ad08499 a7688dc +Author: Francis Lachapelle +Date: Tue May 4 20:39:42 2010 +0000 + + merge of 'cd72e30c3ff6059abdd388e190f4886d3a0464c3' + and 'd6ab95fb5e01dd5626f96aaf55a07cd55725bef2' + + Monotone-Parent: cd72e30c3ff6059abdd388e190f4886d3a0464c3 + Monotone-Parent: d6ab95fb5e01dd5626f96aaf55a07cd55725bef2 + Monotone-Revision: 40b37915206fb95bdaa2f9e1e2b5453b995ea16e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-05-04T20:39:42 + Monotone-Branch: ca.inverse.sogo + Monotone-Tag: SOGo_v1.2.2 + commit a7688dcb621f6b162ed8e921faceccf50ea34073 Author: Wolfgang Sourdeau Date: Tue May 4 20:39:01 2010 +0000 @@ -48766,6 +58330,22 @@ Date: Tue May 4 20:35:42 2010 +0000 M Documentation/SOGo Installation Guide.odt +commit 76d66fb8813dfa307dae4b709a07ac3f1e69f1cd +Merge: dced455 cc0cb44 +Author: Francis Lachapelle +Date: Tue May 4 20:31:39 2010 +0000 + + merge of 'a26c83f12ef82aa63257ce34342230e701cb350e' + and 'c0e065124542dc89953bc74f2d8fdd2aa36185d9' + + Monotone-Parent: a26c83f12ef82aa63257ce34342230e701cb350e + Monotone-Parent: c0e065124542dc89953bc74f2d8fdd2aa36185d9 + Monotone-Revision: 987765a742a81dd1ec1d63940a2bc13d926dd6ca + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-05-04T20:31:39 + Monotone-Branch: ca.inverse.sogo + commit dced4553279b05e30a9d3667abe0198560fab1b9 Author: Wolfgang Sourdeau Date: Tue May 4 20:19:09 2010 +0000 @@ -48810,6 +58390,22 @@ Date: Tue May 4 20:10:27 2010 +0000 M NEWS +commit fd5f9fd4760bcc20c9ec16fbca99bd907a1cff91 +Merge: 2c43125 3ff779a +Author: Francis Lachapelle +Date: Tue May 4 19:53:23 2010 +0000 + + merge of '2e1565da869405c503b47261079abdaf1bcbe0dc' + and '5aa79fd0d4ac848647377f824a2f1a004888b1d4' + + Monotone-Parent: 2e1565da869405c503b47261079abdaf1bcbe0dc + Monotone-Parent: 5aa79fd0d4ac848647377f824a2f1a004888b1d4 + Monotone-Revision: 87feef5f6b5a134ba084a5136940995c74246765 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-05-04T19:53:23 + Monotone-Branch: ca.inverse.sogo + commit 2c431250796f8c3d8da1cc1be14b5cc714ab557d Author: Francis Lachapelle Date: Tue May 4 19:52:11 2010 +0000 @@ -48971,6 +58567,22 @@ Date: Wed Apr 28 17:57:02 2010 +0000 M ChangeLog M Tools/SOGoToolBackup.m +commit 1a62535756b415b6f00f70a1f73702593580f454 +Merge: 1e42494 76e8d13 +Author: Wolfgang Sourdeau +Date: Wed Apr 28 16:22:18 2010 +0000 + + merge of '09b7f3172646059661ecae8b9b613cb052cfff9a' + and '12a3d305a1e50a57c4bdbc1b4a3610a6f9627ccf' + + Monotone-Parent: 09b7f3172646059661ecae8b9b613cb052cfff9a + Monotone-Parent: 12a3d305a1e50a57c4bdbc1b4a3610a6f9627ccf + Monotone-Revision: abf0593bed546a2a9f1b2e7b96945af8f2dd4bee + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-04-28T16:22:18 + Monotone-Branch: ca.inverse.sogo + commit 1e424949c42d792a41383b619479db9b97cfa59c Author: Wolfgang Sourdeau Date: Wed Apr 28 16:21:58 2010 +0000 @@ -49031,6 +58643,22 @@ Date: Mon Apr 26 18:08:45 2010 +0000 M UI/Templates/PreferencesUI/UIxPreferences.wox M UI/WebServerResources/UIxPreferences.css +commit f07b979fa0399c96574d2c9f64a661e5a9ae4153 +Merge: 2387868 d2b76a8 +Author: Francis Lachapelle +Date: Mon Apr 26 16:01:39 2010 +0000 + + merge of '57d4b2a3ccb82fb9075fec4638adcd3bbb16ae4d' + and 'cd845bf5330077e8801634336d85db1dd1834d50' + + Monotone-Parent: 57d4b2a3ccb82fb9075fec4638adcd3bbb16ae4d + Monotone-Parent: cd845bf5330077e8801634336d85db1dd1834d50 + Monotone-Revision: 76b92aaa0be7118096a3287bc24849f4e5b6c795 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-04-26T16:01:39 + Monotone-Branch: ca.inverse.sogo + commit d2b76a871fd599fe6a4aaa5661688520631819a3 Author: Francis Lachapelle Date: Mon Apr 26 16:01:01 2010 +0000 @@ -49241,6 +58869,22 @@ Date: Thu Apr 22 18:11:31 2010 +0000 M ChangeLog M SoObjects/SOGo/SOGoGCSFolder.m +commit edb8bfd35c46171324c81660c13d85edde963f20 +Merge: f2439aa 535be69 +Author: Francis Lachapelle +Date: Thu Apr 22 14:50:01 2010 +0000 + + merge of '434dee0cc13fa6e16a52014e292f0e769e821680' + and 'b0d1ff8b21014633e8ebd6118da1ad59a9349dcb' + + Monotone-Parent: 434dee0cc13fa6e16a52014e292f0e769e821680 + Monotone-Parent: b0d1ff8b21014633e8ebd6118da1ad59a9349dcb + Monotone-Revision: fdc69a8bf5b6b5a68b37d7ddf77d671fc0bcbe15 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-04-22T14:50:01 + Monotone-Branch: ca.inverse.sogo + commit f2439aa90dd976d56a71ce978ef85749a6341682 Author: Francis Lachapelle Date: Thu Apr 22 14:49:46 2010 +0000 @@ -49255,6 +58899,22 @@ Date: Thu Apr 22 14:49:46 2010 +0000 M SOPE/NGCards/iCalYearlyRecurrenceCalculator.m A Tests/Unit/TestiCalRecurrenceCalculator.m +commit 535be695bf007d6f5756e8eed826910ea7ac509c +Merge: ed80559 4d119c5 +Author: Wolfgang Sourdeau +Date: Thu Apr 22 14:47:35 2010 +0000 + + merge of '18a37cc2e34898697d26aa8ab49aaab61673a465' + and '340a8fe3e4c8019fbd49b456058706ca807b68b5' + + Monotone-Parent: 18a37cc2e34898697d26aa8ab49aaab61673a465 + Monotone-Parent: 340a8fe3e4c8019fbd49b456058706ca807b68b5 + Monotone-Revision: b0d1ff8b21014633e8ebd6118da1ad59a9349dcb + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-04-22T14:47:35 + Monotone-Branch: ca.inverse.sogo + commit 4d119c5365a257534ce6d986ad09cd404631c935 Author: Wolfgang Sourdeau Date: Thu Apr 22 14:46:04 2010 +0000 @@ -49371,6 +59031,22 @@ M UI/SOGoUI/SOGoACLAdvisory.m M UI/SOGoUI/SOGoFolderAdvisory.m M UI/Scheduler/UIxCalMulticolumnDayView.m +commit 28911e16dda6da2333698019a1398b5f394ce35b +Merge: bd948aa b7067ee +Author: Wolfgang Sourdeau +Date: Wed Apr 21 14:14:56 2010 +0000 + + merge of '3e7ab09417e0eb7a43c8f716a4a51471466afee8' + and '7576485920bab942eaccc45f2ab5b1914255643d' + + Monotone-Parent: 3e7ab09417e0eb7a43c8f716a4a51471466afee8 + Monotone-Parent: 7576485920bab942eaccc45f2ab5b1914255643d + Monotone-Revision: a4b72920f072cccd72e189b05519b57436eb9471 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-04-21T14:14:56 + Monotone-Branch: ca.inverse.sogo + commit b7067eec65f0a719dea5a6f42f2ab268b2718dc0 Author: Wolfgang Sourdeau Date: Tue Apr 20 21:30:17 2010 +0000 @@ -49586,6 +59262,22 @@ Date: Tue Apr 20 13:24:17 2010 +0000 M UI/Contacts/UIxContactFoldersView.m +commit 00ccd6fea3f111f09d2ae31c2669d579725f2c6e +Merge: add1d54 0d89f02 +Author: Wolfgang Sourdeau +Date: Mon Apr 19 21:30:47 2010 +0000 + + merge of '28cde865644a3171d49fc0d08dad0efa39112fa2' + and 'b6b676075804a429d82d9d9a9fa7c68dd27cef65' + + Monotone-Parent: 28cde865644a3171d49fc0d08dad0efa39112fa2 + Monotone-Parent: b6b676075804a429d82d9d9a9fa7c68dd27cef65 + Monotone-Revision: c24fa70f3ef61ccf3c6aac8e4ecfe11f064cdf29 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-04-19T21:30:47 + Monotone-Branch: ca.inverse.sogo + commit add1d5441af7041a73e5ffa1847019240066a22a Author: Wolfgang Sourdeau Date: Mon Apr 19 21:30:25 2010 +0000 @@ -49637,6 +59329,22 @@ Date: Mon Apr 19 21:28:03 2010 +0000 A SOPE/NGCards/iCalByDayMask.h A SOPE/NGCards/iCalByDayMask.m +commit bed2246b97d7be37cfaa6c744f1c7784cd0b2bd2 +Merge: 260972e 98bd606 +Author: Wolfgang Sourdeau +Date: Mon Apr 19 21:25:30 2010 +0000 + + merge of '8f8b8e1ba740753f2a06bacb246e4d9768d57753' + and 'f9e18ec89398d410d9a1603f1d30c2911cb74a44' + + Monotone-Parent: 8f8b8e1ba740753f2a06bacb246e4d9768d57753 + Monotone-Parent: f9e18ec89398d410d9a1603f1d30c2911cb74a44 + Monotone-Revision: ab2613d820779df99f34c6d0ae2ec38908cae05f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-04-19T21:25:30 + Monotone-Branch: ca.inverse.sogo + commit 98bd606b4f115a0009afd7e9513e698804402bed Author: Francis Lachapelle Date: Mon Apr 19 21:15:04 2010 +0000 @@ -49972,6 +59680,22 @@ Date: Thu Apr 15 18:26:33 2010 +0000 M ChangeLog M Tools/SOGoSockDOperation.m +commit 99f5300e9d9d0f807d36ef32fe9fc916ce80b7b4 +Merge: 1394655 db22e52 +Author: Wolfgang Sourdeau +Date: Thu Apr 15 17:51:20 2010 +0000 + + merge of '6f00886ef5c38edb41e974783e7c09697556ceae' + and 'ab21c3e01c7f88f5f720128f63a22f009b5365f2' + + Monotone-Parent: 6f00886ef5c38edb41e974783e7c09697556ceae + Monotone-Parent: ab21c3e01c7f88f5f720128f63a22f009b5365f2 + Monotone-Revision: a19be68625a5093cfe153b4b51816f9388875b23 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-04-15T17:51:20 + Monotone-Branch: ca.inverse.sogo + commit db22e52abc1f8a087ecfa671a6caab096303c5c2 Author: Ludovic Marcotte Date: Thu Apr 15 00:27:30 2010 +0000 @@ -50014,6 +59738,22 @@ Date: Wed Apr 14 19:07:59 2010 +0000 M ChangeLog M UI/WebServerResources/SchedulerUI.js +commit 4ad3eefcddd1e9b6271783b856319b14fce1bbf1 +Merge: e10d4f2 80c953e +Author: Wolfgang Sourdeau +Date: Wed Apr 14 13:22:28 2010 +0000 + + merge of '47946984df94ecb19a0e0f351847e1df1ec07393' + and '4d2e9e4f4237fb0b335a34870686d9bd0fedcd78' + + Monotone-Parent: 47946984df94ecb19a0e0f351847e1df1ec07393 + Monotone-Parent: 4d2e9e4f4237fb0b335a34870686d9bd0fedcd78 + Monotone-Revision: c3ae4b113ff2c8334bbf16d65765c81a85d99929 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-04-14T13:22:28 + Monotone-Branch: ca.inverse.sogo + commit e10d4f2fcc24f75d943186a04a4edfb1da6501d6 Author: Wolfgang Sourdeau Date: Wed Apr 14 13:22:12 2010 +0000 @@ -50549,6 +60289,22 @@ Date: Wed Apr 7 15:42:25 2010 +0000 M UI/Scheduler/French.lproj/Localizable.strings +commit 19f531c9f8a14571a038b68e4f017108cfa94d4f +Merge: a0de7e9 88857d6 +Author: Francis Lachapelle +Date: Wed Apr 7 15:36:26 2010 +0000 + + merge of '3d5669e86bbeab76360e6a880abf55736dec22e1' + and 'fa3da496f8fda4380291c10cbb009ed34be0c475' + + Monotone-Parent: 3d5669e86bbeab76360e6a880abf55736dec22e1 + Monotone-Parent: fa3da496f8fda4380291c10cbb009ed34be0c475 + Monotone-Revision: 8dae20e5ee74408ab84e7a8148f380c92b636521 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-04-07T15:36:26 + Monotone-Branch: ca.inverse.sogo + commit a0de7e968386febcf3107e77901b869d74655d3b Author: Francis Lachapelle Date: Wed Apr 7 15:35:55 2010 +0000 @@ -50797,6 +60553,22 @@ M UI/WebServerResources/ckeditor/skins/v2/editor.css M UI/WebServerResources/ckeditor/skins/v2/templates.css M UI/WebServerResources/ckeditor/themes/default/theme.js +commit 0ad98e6a1a204c208a88a5a74d51610edc534589 +Merge: 2d6af76 dddce76 +Author: Francis Lachapelle +Date: Sat Apr 3 07:36:15 2010 +0000 + + merge of '815204fe1b8d9f62f875d9e22c4883aede5c1e8d' + and 'f84a4aea78f0990248fedd817ec377260a9120b3' + + Monotone-Parent: 815204fe1b8d9f62f875d9e22c4883aede5c1e8d + Monotone-Parent: f84a4aea78f0990248fedd817ec377260a9120b3 + Monotone-Revision: 82ff830f32b58a69104d076987745b96e90e0ebf + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-04-03T07:36:15 + Monotone-Branch: ca.inverse.sogo + commit 2d6af7647ecb8e22089d8e27b60c1313a822b78c Author: Ludovic Marcotte Date: Mon Apr 5 20:17:39 2010 +0000 @@ -50860,6 +60632,22 @@ M ChangeLog M SOPE/sope-patchset-r1664.diff M SoObjects/Mailer/SOGoMailAccount.m +commit 31bd407c540c067c61e774f67cfd6f0417cb2e5f +Merge: af23614 5a8b97d +Author: Wolfgang Sourdeau +Date: Fri Apr 2 20:03:25 2010 +0000 + + merge of '9e9ae5751a1a008c8b1986bd933c97f02aa65760' + and 'c87ee0c01e17a1a47680ed6ca858c1e5bdcac411' + + Monotone-Parent: 9e9ae5751a1a008c8b1986bd933c97f02aa65760 + Monotone-Parent: c87ee0c01e17a1a47680ed6ca858c1e5bdcac411 + Monotone-Revision: 7e6b126157fe6364467c441181458934b7c93347 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-04-02T20:03:25 + Monotone-Branch: ca.inverse.sogo + commit af23614cef0028ac84575bbceb07485d08c1d941 Author: Wolfgang Sourdeau Date: Fri Apr 2 20:03:13 2010 +0000 @@ -50936,6 +60724,22 @@ Date: Thu Apr 1 20:24:29 2010 +0000 M UI/WebServerResources/SOGoAutoCompletion.js +commit ee0560219c195c0ac35ae2c45576654dafa85cf7 +Merge: fb8d209 5842686 +Author: Francis Lachapelle +Date: Wed Mar 31 20:59:28 2010 +0000 + + merge of '55428fa2e114fb8a494d7411a553fb0a378a4995' + and 'b4e7bba523520804e5e2156a93f9fd775463b75f' + + Monotone-Parent: 55428fa2e114fb8a494d7411a553fb0a378a4995 + Monotone-Parent: b4e7bba523520804e5e2156a93f9fd775463b75f + Monotone-Revision: a15cd58d41cfa4e9d3ac44ddaa4fd3b9f1b5a5f4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-03-31T20:59:28 + Monotone-Branch: ca.inverse.sogo + commit 58426868e98685e019ae7cdde6461289a44e1a99 Author: Francis Lachapelle Date: Wed Mar 31 20:59:07 2010 +0000 @@ -50980,6 +60784,22 @@ Date: Wed Mar 31 20:44:22 2010 +0000 M UI/WebServerResources/SchedulerUIDnD.js M UI/WebServerResources/generic.js +commit 4ae82de32f6178fb50fbdc23b9cd525acab0ee6c +Merge: b26a512 c83872d +Author: Francis Lachapelle +Date: Wed Mar 31 20:22:11 2010 +0000 + + merge of '6fa4b48fbe28f1cf7fd69a18c2504d3ac7c2e806' + and '861e1c5552eaa1edddf6ca6869c53e708cf1c4d2' + + Monotone-Parent: 6fa4b48fbe28f1cf7fd69a18c2504d3ac7c2e806 + Monotone-Parent: 861e1c5552eaa1edddf6ca6869c53e708cf1c4d2 + Monotone-Revision: e5138baadcbf7f196e37747707b570897665a6d3 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-03-31T20:22:11 + Monotone-Branch: ca.inverse.sogo + commit c83872d82b0a8778532d0eb93ecc0c6dfa8b9fe2 Author: Francis Lachapelle Date: Wed Mar 31 20:21:49 2010 +0000 @@ -51338,6 +61158,22 @@ M ChangeLog M UI/WebServerResources/UIxContactsUserFolders.css M UI/WebServerResources/UIxContactsUserFolders.js +commit b4979825e845a008f4790d1674a638f9c2edd115 +Merge: 6f58d94 7c72b96 +Author: Ludovic Marcotte +Date: Thu Mar 25 01:20:16 2010 +0000 + + merge of '6518d809c62090407ee4ee8fc132902607385421' + and 'ae25610b2149f561f23ae34e0889a7197d4324c3' + + Monotone-Parent: 6518d809c62090407ee4ee8fc132902607385421 + Monotone-Parent: ae25610b2149f561f23ae34e0889a7197d4324c3 + Monotone-Revision: a625593a580ec03e118df9e1150b6baf7c8f5c53 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-03-25T01:20:16 + Monotone-Branch: ca.inverse.sogo + commit 7c72b96b1e4df7c90a88bc4462359bda34c9878f Author: Ludovic Marcotte Date: Thu Mar 25 01:20:06 2010 +0000 @@ -51354,6 +61190,22 @@ Date: Thu Mar 25 01:20:06 2010 +0000 M ChangeLog M SoObjects/SOGo/SQLSource.m +commit 6f58d9445ec5478b26344efa864eddeb8b61a725 +Merge: 8dfaa80 b1fd5e8 +Author: Wolfgang Sourdeau +Date: Wed Mar 24 15:59:39 2010 +0000 + + merge of '5cd36f9e514c2019e708362661b3ede2e8598fb8' + and 'fc4c1f1be84a58e494d27f5885576e38eeb809ba' + + Monotone-Parent: 5cd36f9e514c2019e708362661b3ede2e8598fb8 + Monotone-Parent: fc4c1f1be84a58e494d27f5885576e38eeb809ba + Monotone-Revision: 6518d809c62090407ee4ee8fc132902607385421 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-03-24T15:59:39 + Monotone-Branch: ca.inverse.sogo + commit 8dfaa80f3658a3feffa5731e9c870b50b2b3c26c Author: Ludovic Marcotte Date: Wed Mar 24 15:22:59 2010 +0000 @@ -51374,6 +61226,22 @@ M SoObjects/SOGo/SOGoCache.m M SoObjects/SOGo/SOGoSystemDefaults.h M SoObjects/SOGo/SOGoSystemDefaults.m +commit b1fd5e86f82c754ecb0634ac443fc4dbc2e11389 +Merge: 14ad710 c9c3226 +Author: Wolfgang Sourdeau +Date: Wed Mar 24 15:09:21 2010 +0000 + + merge of '73f3fa811c59b152f7c426fe28488efd6bcfe6f2' + and '83c63e63da91d2b44db08849dc570ff2029ed74a' + + Monotone-Parent: 73f3fa811c59b152f7c426fe28488efd6bcfe6f2 + Monotone-Parent: 83c63e63da91d2b44db08849dc570ff2029ed74a + Monotone-Revision: fc4c1f1be84a58e494d27f5885576e38eeb809ba + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-03-24T15:09:21 + Monotone-Branch: ca.inverse.sogo + commit 14ad71063033f63f38dd47d229e828dd53e3151c Author: Wolfgang Sourdeau Date: Wed Mar 24 15:09:17 2010 +0000 @@ -51435,6 +61303,22 @@ M SOPE/NGCards/iCalTimeZonePeriod.m M Tests/Unit/GNUmakefile A Tests/Unit/TestiCalTimeZonePeriod.m +commit abec0f84fb05311b093e7f73ec4fda7ce5a70517 +Merge: 9971737 d1e5ed2 +Author: Wolfgang Sourdeau +Date: Mon Mar 22 17:11:10 2010 +0000 + + merge of '7d7bd9ebaef743c2d234e3487f041c1d213b742e' + and 'c650aab7e4429bb8a2b8885d4161d881a1f9f2e7' + + Monotone-Parent: 7d7bd9ebaef743c2d234e3487f041c1d213b742e + Monotone-Parent: c650aab7e4429bb8a2b8885d4161d881a1f9f2e7 + Monotone-Revision: 00c44c219ebc45d53f4b71a1825bc55315546793 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-03-22T17:11:10 + Monotone-Branch: ca.inverse.sogo + commit 9971737b29389e6abe81b833f8e66dc377c7fd84 Author: Wolfgang Sourdeau Date: Mon Mar 22 17:10:27 2010 +0000 @@ -51504,6 +61388,22 @@ M SoObjects/SOGo/SOGoDomainDefaults.h M SoObjects/SOGo/SOGoDomainDefaults.m M SoObjects/SOGo/SOGoSystemDefaults.m +commit a6672ac59dcd72654735735b108c1b2bdd86a89c +Merge: bc693c8 a7ffeaf +Author: Wolfgang Sourdeau +Date: Tue Mar 16 13:44:53 2010 +0000 + + merge of 'e789f702b24bdc52b2a34ab4a58f4a2f26371610' + and 'fa44544f060a255e700fe82b3b47846be0343017' + + Monotone-Parent: e789f702b24bdc52b2a34ab4a58f4a2f26371610 + Monotone-Parent: fa44544f060a255e700fe82b3b47846be0343017 + Monotone-Revision: c1e5870e5f5c7546c7a47515125246ca856a2f40 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-03-16T13:44:53 + Monotone-Branch: ca.inverse.sogo + commit bc693c868faa09aaf4a472eb08a2a36d50cdb368 Author: Wolfgang Sourdeau Date: Tue Mar 16 13:38:28 2010 +0000 @@ -51570,6 +61470,22 @@ Date: Mon Mar 15 18:43:11 2010 +0000 M ChangeLog M SoObjects/SOGo/SOGoUserFolder.m +commit f1e38dec2d0157d26de393c0f513aa8575fa607a +Merge: 1b4dca7 a147ea5 +Author: Ludovic Marcotte +Date: Mon Mar 15 17:56:35 2010 +0000 + + merge of '9bd966b224328d78fb14df7e0b5cca2b4e4e4bfb' + and 'f14ae03d576d6870939b367861ecc7f56c411580' + + Monotone-Parent: 9bd966b224328d78fb14df7e0b5cca2b4e4e4bfb + Monotone-Parent: f14ae03d576d6870939b367861ecc7f56c411580 + Monotone-Revision: 2c333cbb2be8ee61b03f3ba7f4e2a293be78f431 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-03-15T17:56:35 + Monotone-Branch: ca.inverse.sogo + commit a147ea528fa0956cab559cd3fab01260d7479095 Author: Ludovic Marcotte Date: Mon Mar 15 17:56:13 2010 +0000 @@ -51613,6 +61529,22 @@ Date: Mon Mar 15 16:08:19 2010 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 8f8dddb1f143ba1436c71938383362cc6babf7b9 +Merge: 927c82c 914e382 +Author: Wolfgang Sourdeau +Date: Mon Mar 15 13:44:05 2010 +0000 + + merge of '5617028c92b280b921baa88c04ea7e1430dbef8a' + and 'ae3b606b25bf64895dc0e94fd5ceccaa439e457f' + + Monotone-Parent: 5617028c92b280b921baa88c04ea7e1430dbef8a + Monotone-Parent: ae3b606b25bf64895dc0e94fd5ceccaa439e457f + Monotone-Revision: d22bf4c980f45be9bbef3845ceeb3a8bf583f6c9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-03-15T13:44:05 + Monotone-Branch: ca.inverse.sogo + commit 927c82cdc10b85c03ca04a35ffb0704cce31addc Author: Wolfgang Sourdeau Date: Mon Mar 15 12:51:57 2010 +0000 @@ -51962,6 +61894,22 @@ Date: Tue Mar 9 14:29:16 2010 +0000 M ChangeLog M UI/WebServerResources/generic.js +commit abeac067fd2cb973e6ff7bc754903dfaa876c2d9 +Merge: f26856a 493989e +Author: Wolfgang Sourdeau +Date: Tue Mar 9 14:22:15 2010 +0000 + + merge of 'c34c0300a1f39388ab0115f21ccd4e9ac36b52ae' + and 'c6b8e3c75a4449f576bab78576b6ea03f5d7d891' + + Monotone-Parent: c34c0300a1f39388ab0115f21ccd4e9ac36b52ae + Monotone-Parent: c6b8e3c75a4449f576bab78576b6ea03f5d7d891 + Monotone-Revision: 03c23ddd42cc8c0dc879455acf6c14cc491d7f12 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-03-09T14:22:15 + Monotone-Branch: ca.inverse.sogo + commit f26856a8a11709809ae8f3f4e02eb567aa81e320 Author: Wolfgang Sourdeau Date: Tue Mar 9 13:50:54 2010 +0000 @@ -52052,6 +62000,22 @@ M ChangeLog M UI/WebServerResources/UIxContactsUserFolders.js M UI/WebServerResources/generic.js +commit 493989e954c52295dcda5c715a6b7aab4ca01738 +Merge: df8b5ba 96ae0d1 +Author: Ludovic Marcotte +Date: Mon Mar 8 21:01:35 2010 +0000 + + merge of 'c6339a8aa68698c675ee2d4eb594d55534556d0a' + and 'd6acf550ed6a03fbd33942b8d7cd672e30a07bf0' + + Monotone-Parent: c6339a8aa68698c675ee2d4eb594d55534556d0a + Monotone-Parent: d6acf550ed6a03fbd33942b8d7cd672e30a07bf0 + Monotone-Revision: c6b8e3c75a4449f576bab78576b6ea03f5d7d891 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2010-03-08T21:01:35 + Monotone-Branch: ca.inverse.sogo + commit df8b5ba7d55239bebf9475bcb535f000ac77d821 Author: Ludovic Marcotte Date: Mon Mar 8 21:01:25 2010 +0000 @@ -52119,6 +62083,22 @@ M UI/PreferencesUI/UIxPreferences.m M UI/Templates/PreferencesUI/UIxPreferences.wox M UI/WebServerResources/UIxPreferences.js +commit 32e7443688eb0f6776339b970b028739b3aad5e2 +Merge: 40c3cb7 bac6987 +Author: Wolfgang Sourdeau +Date: Mon Mar 8 16:27:32 2010 +0000 + + merge of '2cbc46c16f9b3d45d868b15a968f614dbbaf9749' + and '2f4f12453e4e198701812e72c5d221790c69d013' + + Monotone-Parent: 2cbc46c16f9b3d45d868b15a968f614dbbaf9749 + Monotone-Parent: 2f4f12453e4e198701812e72c5d221790c69d013 + Monotone-Revision: 9adf735e0d77302071b7cf3311f5304804b3927f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-03-08T16:27:32 + Monotone-Branch: ca.inverse.sogo + commit 40c3cb74d0e08d5205302efa6bd16afe5a99d686 Author: Ludovic Marcotte Date: Mon Mar 8 15:18:05 2010 +0000 @@ -52360,6 +62340,22 @@ Date: Tue Mar 2 19:53:53 2010 +0000 M ChangeLog M UI/WebServerResources/generic.js +commit a5171ea34fc15977e1d731d3036bea5d04a64055 +Merge: 43a51d3 c054109 +Author: Wolfgang Sourdeau +Date: Mon Mar 1 21:22:11 2010 +0000 + + merge of '708b215bd02d30547b93140994babe45b2472573' + and '7c54925b7d17d30cc75f406592cb3e9c01a59759' + + Monotone-Parent: 708b215bd02d30547b93140994babe45b2472573 + Monotone-Parent: 7c54925b7d17d30cc75f406592cb3e9c01a59759 + Monotone-Revision: 57e41fda15f1e4891e7b367169b5662b73274f50 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-03-01T21:22:11 + Monotone-Branch: ca.inverse.sogo + commit 43a51d3b448c53fbb87f1e4d71d831a53bb6b51b Author: Wolfgang Sourdeau Date: Mon Mar 1 17:56:33 2010 +0000 @@ -52390,6 +62386,22 @@ M ChangeLog M SoObjects/SOGo/SOGoDomainDefaults.h M SoObjects/SOGo/SOGoDomainDefaults.m +commit c0541095a75618b0661163596349201a4f321876 +Merge: 77ada2f 6f1c1ba +Author: Francis Lachapelle +Date: Mon Mar 1 15:31:38 2010 +0000 + + merge of '21ee7a1f6257a0c47b6bce99b088614daf239ad3' + and 'c753d4af992c07bd25d59ae087113384e379361b' + + Monotone-Parent: 21ee7a1f6257a0c47b6bce99b088614daf239ad3 + Monotone-Parent: c753d4af992c07bd25d59ae087113384e379361b + Monotone-Revision: 7c54925b7d17d30cc75f406592cb3e9c01a59759 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-03-01T15:31:38 + Monotone-Branch: ca.inverse.sogo + commit 6f1c1baa201423dcb59f0b225d52f55672afa6cf Author: Francis Lachapelle Date: Mon Mar 1 15:31:20 2010 +0000 @@ -52432,6 +62444,22 @@ Date: Thu Feb 25 14:47:57 2010 +0000 D UI/WebServerResources/HTMLUListElement.js +commit 92e5b3031029282be4daa2baf68799d0a67dfc89 +Merge: 639d6cf 0f4868c +Author: Wolfgang Sourdeau +Date: Wed Feb 24 21:39:01 2010 +0000 + + merge of '776dc75fed5683da1627715f48714600978e0286' + and 'a9979a68cce7a82e5b6ee0e52a65df546ab56c59' + + Monotone-Parent: 776dc75fed5683da1627715f48714600978e0286 + Monotone-Parent: a9979a68cce7a82e5b6ee0e52a65df546ab56c59 + Monotone-Revision: bc53d4486da9eb6b195273cef7d073fdcf53aa5c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-02-24T21:39:01 + Monotone-Branch: ca.inverse.sogo + commit 639d6cfde544af38aeff62fe6507873c76254457 Author: Wolfgang Sourdeau Date: Wed Feb 24 21:37:57 2010 +0000 @@ -52550,6 +62578,22 @@ Date: Fri Feb 19 22:12:25 2010 +0000 M SoObjects/Appointments/SOGoAptMailCzechICalReply.wo/SOGoAptMailCzechICalReply.html +commit 897e17aef55541f1b682d76213840f269f26b829 +Merge: 9325739 5384391 +Author: Wolfgang Sourdeau +Date: Fri Feb 19 20:16:55 2010 +0000 + + merge of '1334b0291ad757f98c96b8cb3b8c8adf02c08bad' + and '4221bfcbc24f6099f969c44a20f8736c7d6fa718' + + Monotone-Parent: 1334b0291ad757f98c96b8cb3b8c8adf02c08bad + Monotone-Parent: 4221bfcbc24f6099f969c44a20f8736c7d6fa718 + Monotone-Revision: 92e0d4c3b4bdc8ffd74aabd14c2d3e3ee7c1f7d4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-02-19T20:16:55 + Monotone-Branch: ca.inverse.sogo + commit 538439128f0f970f59dec300c0906baf5fb743b2 Author: Francis Lachapelle Date: Fri Feb 19 20:16:18 2010 +0000 @@ -52566,6 +62610,22 @@ Date: Fri Feb 19 20:16:18 2010 +0000 M Documentation/SOGo Installation Guide.odt M Documentation/SOGo Mozilla Thunderbird Configuration.odt +commit 93257396513cc851eadd8ca40769d934a0e17204 +Merge: db30303 fbc2493 +Author: Wolfgang Sourdeau +Date: Fri Feb 19 20:02:19 2010 +0000 + + merge of '27325903c7c22f4bf624c26770a8d5506aa2ef70' + and 'fbf33893aadacadd740bd14f543861a0c8f9aee5' + + Monotone-Parent: 27325903c7c22f4bf624c26770a8d5506aa2ef70 + Monotone-Parent: fbf33893aadacadd740bd14f543861a0c8f9aee5 + Monotone-Revision: 1334b0291ad757f98c96b8cb3b8c8adf02c08bad + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-02-19T20:02:19 + Monotone-Branch: ca.inverse.sogo + commit fbc2493d02996959148677d98843575b58251d05 Author: Wolfgang Sourdeau Date: Fri Feb 19 19:58:47 2010 +0000 @@ -52579,6 +62639,22 @@ Date: Fri Feb 19 19:58:47 2010 +0000 M NEWS +commit db30303c710461b16f63a0a949841d33cda7a9fd +Merge: a372bc6 e80dcd9 +Author: Francis Lachapelle +Date: Fri Feb 19 19:43:42 2010 +0000 + + merge of '2b2aeaee582fb444f9d1dff9992f1bd7aa86830d' + and 'ebb7a9c328e41d407de2da0ef3e8b8df2c454780' + + Monotone-Parent: 2b2aeaee582fb444f9d1dff9992f1bd7aa86830d + Monotone-Parent: ebb7a9c328e41d407de2da0ef3e8b8df2c454780 + Monotone-Revision: 27325903c7c22f4bf624c26770a8d5506aa2ef70 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-02-19T19:43:42 + Monotone-Branch: ca.inverse.sogo + commit e80dcd971d3829506ed95a30b6fad54b7c342353 Author: Wolfgang Sourdeau Date: Fri Feb 19 19:32:02 2010 +0000 @@ -52682,6 +62758,22 @@ M ChangeLog M SOPE/sope-patchset-r1664.diff M SoObjects/Mailer/SOGoMailAccount.m +commit fb12309ed44e07d148c1468ff4304b96101761f6 +Merge: 65fcd2b 6513761 +Author: Wolfgang Sourdeau +Date: Fri Feb 19 14:52:55 2010 +0000 + + merge of '92359dd58e30421ba90b8d9411ebae413f553836' + and 'f2cb92adb8ead8e44b81938a9d331584b7752fe4' + + Monotone-Parent: 92359dd58e30421ba90b8d9411ebae413f553836 + Monotone-Parent: f2cb92adb8ead8e44b81938a9d331584b7752fe4 + Monotone-Revision: c85488a496026efc268c07b0e8c84d1c1d1983d7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-02-19T14:52:55 + Monotone-Branch: ca.inverse.sogo + commit 65137616096aed902e9224d2b5f06a1e40a25366 Author: Wolfgang Sourdeau Date: Fri Feb 19 14:52:05 2010 +0000 @@ -52856,6 +62948,22 @@ M SoObjects/SOGo/GNUmakefile A SoObjects/SOGo/SOGoProductLoader.h A SoObjects/SOGo/SOGoProductLoader.m +commit 4209def9c3641d52ef178b488975a99db1be34ab +Merge: 4584652 d5af9f3 +Author: Wolfgang Sourdeau +Date: Thu Feb 18 21:40:29 2010 +0000 + + merge of '33a155bb9aa78b5b1566316b90bfe31c482dc6a2' + and 'dad4b61f6a15f4d008df898e890a7b7f753c94e9' + + Monotone-Parent: 33a155bb9aa78b5b1566316b90bfe31c482dc6a2 + Monotone-Parent: dad4b61f6a15f4d008df898e890a7b7f753c94e9 + Monotone-Revision: 96b7d5f5bff55eab43747cf0e5e2b7e3d5df7d82 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-02-18T21:40:29 + Monotone-Branch: ca.inverse.sogo + commit 4584652626d235e2d1c44c41ec1a22a75be5ae50 Author: Wolfgang Sourdeau Date: Thu Feb 18 21:39:25 2010 +0000 @@ -53435,6 +63543,22 @@ M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/SchedulerUIDnD.js A UI/WebServerResources/event-grippy-vertical.png +commit d8a541ab8d3c29f8eb8654efad8605f048e2c48c +Merge: b33f975 fe8b465 +Author: Wolfgang Sourdeau +Date: Thu Feb 11 02:48:41 2010 +0000 + + merge of '3a5f7ecea6abc6df1d89a08f33863028e17c287c' + and 'c8a36e926bc75ffc1d4206737365b76d6621e3ab' + + Monotone-Parent: 3a5f7ecea6abc6df1d89a08f33863028e17c287c + Monotone-Parent: c8a36e926bc75ffc1d4206737365b76d6621e3ab + Monotone-Revision: ebe63ce53628359dd83606f2bb756f112a053f66 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-02-11T02:48:41 + Monotone-Branch: ca.inverse.sogo + commit b33f9753e1412d42708338c0ccb6d540f5a82912 Author: Wolfgang Sourdeau Date: Thu Feb 11 02:38:01 2010 +0000 @@ -53615,6 +63739,22 @@ Date: Tue Feb 2 22:07:50 2010 +0000 M ChangeLog M SoObjects/Mailer/SOGoMailBodyPart.m +commit 6deb913777389b5d4811252e75d01479d0dc8eb0 +Merge: 122983c dab48cf +Author: Wolfgang Sourdeau +Date: Tue Feb 2 21:42:47 2010 +0000 + + merge of '94f45ff6951a0436a18fa4903817d09a28213af4' + and '9d18fbe46d6a29e9e61882026aae14cdf40ecd7c' + + Monotone-Parent: 94f45ff6951a0436a18fa4903817d09a28213af4 + Monotone-Parent: 9d18fbe46d6a29e9e61882026aae14cdf40ecd7c + Monotone-Revision: 2d74e4a1d7a6712cf530cd008210def6d2ee0ecc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-02-02T21:42:47 + Monotone-Branch: ca.inverse.sogo + commit dab48cf12a8cc585e14769329d4f870446403f55 Author: Wolfgang Sourdeau Date: Tue Feb 2 21:42:17 2010 +0000 @@ -53706,6 +63846,22 @@ M SoObjects/SOGo/SOGoProxyAuthenticator.h M SoObjects/SOGo/SOGoProxyAuthenticator.m M SoObjects/SOGo/SOGoWebAuthenticator.h +commit 764e5404b8b2ffcea06ff0db2eff2e37c9b8b326 +Merge: 6c2f247 8ef885f +Author: Wolfgang Sourdeau +Date: Sun Jan 31 00:47:20 2010 +0000 + + merge of '480019f7fbb2f5372b3caf4b1f0781edd7716532' + and 'd50cbb2db285dc1ae769ada376081f942570b9a1' + + Monotone-Parent: 480019f7fbb2f5372b3caf4b1f0781edd7716532 + Monotone-Parent: d50cbb2db285dc1ae769ada376081f942570b9a1 + Monotone-Revision: 6661b82baa487cf8e72c04a8e31c6c05b7c58321 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-31T00:47:20 + Monotone-Branch: ca.inverse.sogo + commit 6c2f247d5e506d4ba43e95c365dd83e7bfc09362 Author: Wolfgang Sourdeau Date: Sun Jan 31 00:46:14 2010 +0000 @@ -53854,6 +64010,22 @@ Date: Thu Jan 28 21:52:48 2010 +0000 M SOPE/sope-patchset-r1664.diff +commit 4d7d88667d5765c1c5f0c596075f648e2614d87e +Merge: 48f16a2 126651b +Author: Wolfgang Sourdeau +Date: Thu Jan 28 21:52:34 2010 +0000 + + merge of '83f360b9ad32a59125310f306b42d5ecac442834' + and 'ff12d30f9bf1800bb0b1bcbefba9493cdeeeccaf' + + Monotone-Parent: 83f360b9ad32a59125310f306b42d5ecac442834 + Monotone-Parent: ff12d30f9bf1800bb0b1bcbefba9493cdeeeccaf + Monotone-Revision: e6e156c468a28553e1f0a768c21f8ac2ef3cc930 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-28T21:52:34 + Monotone-Branch: ca.inverse.sogo + commit 126651b6a75325e3e61e963e3448fade1df75f06 Author: Wolfgang Sourdeau Date: Thu Jan 28 21:42:03 2010 +0000 @@ -53949,6 +64121,22 @@ M SoObjects/SOGo/SOGoObject.m M SoObjects/SOGo/SOGoUserFolder.m M UI/MainUI/SOGoRootPage.h +commit 20dd37bfe0f184c0ad736a9c75370e173f625165 +Merge: 3295345 35be26d +Author: Wolfgang Sourdeau +Date: Tue Jan 26 14:14:47 2010 +0000 + + merge of '01536fae1db92e4ed9c01a8b4279baa0fd924b6d' + and 'af9e4e5f70557e805b63e51e8a14442cf6d9ffce' + + Monotone-Parent: 01536fae1db92e4ed9c01a8b4279baa0fd924b6d + Monotone-Parent: af9e4e5f70557e805b63e51e8a14442cf6d9ffce + Monotone-Revision: 8eff3fcb9d28703e16adf6fd2da5a29c70cf6a0a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-26T14:14:47 + Monotone-Branch: ca.inverse.sogo + commit 35be26d1fa51d7b235638cc90fa6047b54660ff6 Author: Wolfgang Sourdeau Date: Tue Jan 26 13:35:04 2010 +0000 @@ -53975,6 +64163,22 @@ Date: Mon Jan 25 23:43:10 2010 +0000 M SOPE/sope-patchset-r1664.diff +commit 32953451f31ac579b884a475e77d78558f740e1d +Merge: 5826589 f72a64a +Author: Francis Lachapelle +Date: Mon Jan 25 23:07:22 2010 +0000 + + merge of '757b6521030075afab35a20d8dfccc19ae336ae9' + and 'c149c2681b78af12b651f3560f2c584754ccd9c1' + + Monotone-Parent: 757b6521030075afab35a20d8dfccc19ae336ae9 + Monotone-Parent: c149c2681b78af12b651f3560f2c584754ccd9c1 + Monotone-Revision: 01536fae1db92e4ed9c01a8b4279baa0fd924b6d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-25T23:07:22 + Monotone-Branch: ca.inverse.sogo + commit 5826589f26505648197a5bb26d65f60c5fd190d0 Author: Francis Lachapelle Date: Mon Jan 25 23:03:46 2010 +0000 @@ -54051,6 +64255,22 @@ Date: Mon Jan 25 19:10:18 2010 +0000 M UI/Templates/MailerUI/UIxMailFilterPanel.wox +commit 4430e6587f63bd470188a0d0b6ffcf3f53af9122 +Merge: ebc4a5c b49c581 +Author: Francis Lachapelle +Date: Mon Jan 25 19:03:05 2010 +0000 + + merge of '17e6a035351ab1ed8cac627eab40336501626d1d' + and '297bcf08ea5cbb7605247c525221f453b66e84ad' + + Monotone-Parent: 17e6a035351ab1ed8cac627eab40336501626d1d + Monotone-Parent: 297bcf08ea5cbb7605247c525221f453b66e84ad + Monotone-Revision: 7b05cf03726531102653ab798fe9755747588cb6 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-25T19:03:05 + Monotone-Branch: ca.inverse.sogo + commit ebc4a5ce7e29f1c1dda489630206c92384b9704d Author: Francis Lachapelle Date: Mon Jan 25 19:02:37 2010 +0000 @@ -54081,6 +64301,22 @@ Date: Mon Jan 25 17:57:13 2010 +0000 M NEWS +commit d9f84565fff5cf2231cb2fa4d80c2f165b203fc9 +Merge: 9d61c32 4534742 +Author: Wolfgang Sourdeau +Date: Mon Jan 25 17:40:26 2010 +0000 + + merge of '2a09733287aae014c2abab945596b03e401444ae' + and 'edcc0786cecbc0129855dd749f12c72557d2a08f' + + Monotone-Parent: 2a09733287aae014c2abab945596b03e401444ae + Monotone-Parent: edcc0786cecbc0129855dd749f12c72557d2a08f + Monotone-Revision: 809e26f6797e99b0dc3440bc4da33da4677540d9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-25T17:40:26 + Monotone-Branch: ca.inverse.sogo + commit 45347425b097a7e36d2e6765e06b4d9ce2cb497b Author: Wolfgang Sourdeau Date: Mon Jan 25 17:38:29 2010 +0000 @@ -54138,6 +64374,22 @@ Date: Mon Jan 25 17:10:00 2010 +0000 M NEWS M Version +commit 865b122da6afb953721c53f4673648d14c5ab2e7 +Merge: 1aa86a0 b6844c3 +Author: Francis Lachapelle +Date: Mon Jan 25 17:08:35 2010 +0000 + + merge of '03ab73ff63dcd41936ff772c87444389b1448a27' + and '517c5f244ae9b2a903f799c27dc64452fa8c75ee' + + Monotone-Parent: 03ab73ff63dcd41936ff772c87444389b1448a27 + Monotone-Parent: 517c5f244ae9b2a903f799c27dc64452fa8c75ee + Monotone-Revision: 139a022c95578093f60b05265c6af3758cb8fbdf + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-25T17:08:35 + Monotone-Branch: ca.inverse.sogo + commit 1aa86a0858fdce4a4c3453ba5bbe17c979eb9aaa Author: Francis Lachapelle Date: Mon Jan 25 17:08:17 2010 +0000 @@ -54154,6 +64406,22 @@ Date: Mon Jan 25 17:08:17 2010 +0000 M ChangeLog M UI/WebServerResources/SchedulerUI.js +commit b7c65cd06d099f3a01e26bb96f3630ef4497a305 +Merge: 786d418 9e0f946 +Author: Francis Lachapelle +Date: Mon Jan 25 17:04:31 2010 +0000 + + merge of '4b92bd8e12e3f79e2ba6838787a30729a0b2a4cb' + and '578bc8e9cf723c91e4011bbb0f7b4e1a1c52918a' + + Monotone-Parent: 4b92bd8e12e3f79e2ba6838787a30729a0b2a4cb + Monotone-Parent: 578bc8e9cf723c91e4011bbb0f7b4e1a1c52918a + Monotone-Revision: b8785a107526f1e90244fbdab4a759e95b15a5b0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-25T17:04:31 + Monotone-Branch: ca.inverse.sogo + commit b6844c3c8950334ec2637a0cae02538a6db9db7d Author: Wolfgang Sourdeau Date: Mon Jan 25 17:02:40 2010 +0000 @@ -54210,6 +64478,22 @@ Date: Mon Jan 25 16:26:02 2010 +0000 M Apache/SOGo.conf +commit 8937d26b92656df64fe5957e0877959f6426bad4 +Merge: f951751 4d6a9d1 +Author: Francis Lachapelle +Date: Mon Jan 25 16:03:26 2010 +0000 + + merge of '38bdad32536cc97eb69bad5515fa682a452c9be6' + and '69348ff83b958e39e8d6bdc38da8a1f1ea4ace1a' + + Monotone-Parent: 38bdad32536cc97eb69bad5515fa682a452c9be6 + Monotone-Parent: 69348ff83b958e39e8d6bdc38da8a1f1ea4ace1a + Monotone-Revision: 0b152b3b9b68eb80edffbcf7dec3d59fa6a7e76d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-25T16:03:26 + Monotone-Branch: ca.inverse.sogo + commit f951751ae81e22242034966828367b7f8a34d281 Author: Francis Lachapelle Date: Mon Jan 25 16:03:19 2010 +0000 @@ -54357,6 +64641,22 @@ Date: Fri Jan 22 22:02:34 2010 +0000 M UI/Templates/ContactsUI/UIxContactEditor.wox +commit 59196a3e904e3ca61aba0cfedc4f76df2b4b3d2f +Merge: 683ba2d dc41b95 +Author: Wolfgang Sourdeau +Date: Fri Jan 22 21:34:52 2010 +0000 + + merge of '637d4bc405444db20b4ed12bf09dd27c7780047b' + and 'c8e16863bcabf9adf6b224c4a9922c0ace67917f' + + Monotone-Parent: 637d4bc405444db20b4ed12bf09dd27c7780047b + Monotone-Parent: c8e16863bcabf9adf6b224c4a9922c0ace67917f + Monotone-Revision: 4f9cd9e4647b59cc1df48053efc611005b19b79c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-22T21:34:52 + Monotone-Branch: ca.inverse.sogo + commit dc41b95e0dd17222446a46ae1e8545fa85b9f6bd Author: Wolfgang Sourdeau Date: Fri Jan 22 21:34:39 2010 +0000 @@ -54404,6 +64704,22 @@ Date: Fri Jan 22 20:42:37 2010 +0000 M UI/WebServerResources/SchedulerUI.js +commit 05aa300146d9ea6aa6bffd5d86c9c033903333a3 +Merge: 98ebd45 820bc1a +Author: Francis Lachapelle +Date: Fri Jan 22 20:16:52 2010 +0000 + + merge of 'a343f74f4a124ecd3e0d422d0fc2b88a22459e97' + and 'dab4ee4d9a35331ab917eaf590b5318395be4a43' + + Monotone-Parent: a343f74f4a124ecd3e0d422d0fc2b88a22459e97 + Monotone-Parent: dab4ee4d9a35331ab917eaf590b5318395be4a43 + Monotone-Revision: 149c53aba731f158240e0887a26fa6309fc3694a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-22T20:16:52 + Monotone-Branch: ca.inverse.sogo + commit 98ebd45bd93a5eaa662f3bcfa6ec9c38f4b56ad6 Author: Wolfgang Sourdeau Date: Fri Jan 22 20:15:35 2010 +0000 @@ -54417,6 +64733,22 @@ Date: Fri Jan 22 20:15:35 2010 +0000 M UI/WebServerResources/SchedulerUI.js +commit 820bc1aa6742de52bcb9f3428820293ff754db78 +Merge: 7b8a8cc 544a6ca +Author: Francis Lachapelle +Date: Fri Jan 22 20:14:33 2010 +0000 + + merge of '15319a5f3d5074d8502634ab24003b28d070d85e' + and '98e797e237e41e316f67dab068ddf038cdcc0b9a' + + Monotone-Parent: 15319a5f3d5074d8502634ab24003b28d070d85e + Monotone-Parent: 98e797e237e41e316f67dab068ddf038cdcc0b9a + Monotone-Revision: dab4ee4d9a35331ab917eaf590b5318395be4a43 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-22T20:14:33 + Monotone-Branch: ca.inverse.sogo + commit 544a6ca798643dc2f143fe5c60238f9f2cb6b907 Author: Francis Lachapelle Date: Fri Jan 22 20:12:21 2010 +0000 @@ -54479,6 +64811,22 @@ M SoObjects/Appointments/iCalEntityObject+SOGo.h M SoObjects/Appointments/iCalEntityObject+SOGo.m M Tools/SOGoToolRestore.m +commit 36663b5c8e33cbc8d892cd17d06babf645326160 +Merge: 1e5155e 731973a +Author: Wolfgang Sourdeau +Date: Fri Jan 22 16:34:23 2010 +0000 + + merge of '9ea936d2bbff9184d4e2df3779bdc267702b6996' + and 'dc6ca87d2eb61c99218dd74023fe0f2bd84434ac' + + Monotone-Parent: 9ea936d2bbff9184d4e2df3779bdc267702b6996 + Monotone-Parent: dc6ca87d2eb61c99218dd74023fe0f2bd84434ac + Monotone-Revision: 1ee824cc2519285b798ee5a9b6d741e19bf29966 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-22T16:34:23 + Monotone-Branch: ca.inverse.sogo + commit 1e5155e1a20382fb38533258505eadec4de84934 Author: Wolfgang Sourdeau Date: Fri Jan 22 16:33:35 2010 +0000 @@ -54507,6 +64855,22 @@ M UI/SOGoUI/SOGoACLAdvisory.m M UI/SOGoUI/UIxComponent.m M UI/Scheduler/UIxAppointmentEditor.m +commit 731973ad30dbc12703f8677c6fb776b07725d689 +Merge: 2df89a8 7a41879 +Author: Francis Lachapelle +Date: Thu Jan 21 22:19:49 2010 +0000 + + merge of '45249fe68411e1b5ecd968fb87f91801d6882115' + and '6c3ab3f69b066603f5ac7caffee043e67c1ab883' + + Monotone-Parent: 45249fe68411e1b5ecd968fb87f91801d6882115 + Monotone-Parent: 6c3ab3f69b066603f5ac7caffee043e67c1ab883 + Monotone-Revision: dc6ca87d2eb61c99218dd74023fe0f2bd84434ac + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-21T22:19:49 + Monotone-Branch: ca.inverse.sogo + commit 7a418798701a7bf8a8dec0622741b138ded47d71 Author: Francis Lachapelle Date: Thu Jan 21 21:57:25 2010 +0000 @@ -54522,6 +64886,22 @@ Date: Thu Jan 21 21:57:25 2010 +0000 M UI/WebServerResources/UIxComponentEditor.css +commit 2df89a88ca3e459b541c7869267064422e20f3ea +Merge: bd85881 55f0db0 +Author: Wolfgang Sourdeau +Date: Thu Jan 21 20:53:54 2010 +0000 + + merge of '4c570fedd8a0bf2a5ec231caa2b981bd796da85b' + and 'a98828a2111fc135396157fa30a08e62d44cec82' + + Monotone-Parent: 4c570fedd8a0bf2a5ec231caa2b981bd796da85b + Monotone-Parent: a98828a2111fc135396157fa30a08e62d44cec82 + Monotone-Revision: 45249fe68411e1b5ecd968fb87f91801d6882115 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-21T20:53:54 + Monotone-Branch: ca.inverse.sogo + commit 55f0db064b79c151e2487e619dd7af324976da4a Author: Wolfgang Sourdeau Date: Thu Jan 21 20:53:18 2010 +0000 @@ -55008,6 +65388,22 @@ Date: Thu Jan 14 22:57:44 2010 +0000 M ChangeLog M Tools/SOGoToolBackup.m +commit 0197a8b333dc5a29d52ab3fb24916fd9fddea275 +Merge: c4820e0 3f0908f +Author: Wolfgang Sourdeau +Date: Wed Jan 13 23:03:17 2010 +0000 + + merge of '88fd2a0a000ff31c79e91314a17503ec1d076d23' + and 'bf01e6f088a2111decc0b38c4b13d77205fd3b39' + + Monotone-Parent: 88fd2a0a000ff31c79e91314a17503ec1d076d23 + Monotone-Parent: bf01e6f088a2111decc0b38c4b13d77205fd3b39 + Monotone-Revision: aada198309b5b9b1d7e6e2f2faade7b2b97c4718 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-13T23:03:17 + Monotone-Branch: ca.inverse.sogo + commit c4820e081ab679e507e9f90857dc2d5bf54c10f5 Author: Francis Lachapelle Date: Thu Jan 14 18:32:59 2010 +0000 @@ -55552,6 +65948,22 @@ M UI/WebServerResources/SchedulerUI.css M UI/WebServerResources/UIxAppointmentEditor.js M UI/WebServerResources/UIxComponentEditor.js +commit 3f0908f3847934e1abbbc0b0270532b672ce22fb +Merge: bc90de0 ec9697d +Author: Wolfgang Sourdeau +Date: Wed Jan 13 22:50:05 2010 +0000 + + merge of '2185decf68286616e141956d251df6580c4747cd' + and '6970e7a89b13f1353d770e663717021a53350856' + + Monotone-Parent: 2185decf68286616e141956d251df6580c4747cd + Monotone-Parent: 6970e7a89b13f1353d770e663717021a53350856 + Monotone-Revision: bf01e6f088a2111decc0b38c4b13d77205fd3b39 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-13T22:50:05 + Monotone-Branch: ca.inverse.sogo + commit bc90de08262b96244ce8a2be96b7a415b27fbe68 Author: Wolfgang Sourdeau Date: Wed Jan 13 22:49:54 2010 +0000 @@ -55584,6 +65996,22 @@ M ChangeLog M UI/WebServerResources/ContactsUI.css M UI/WebServerResources/ContactsUI.js +commit 5d5d0ea60a7a95555441852719897a72666a8607 +Merge: dad75bb 304a332 +Author: Francis Lachapelle +Date: Wed Jan 13 04:46:56 2010 +0000 + + merge of '583f127303a07196077a96b395056caf120f4117' + and 'e963d0d35abbc798444e616c5532ac4a7461c63a' + + Monotone-Parent: 583f127303a07196077a96b395056caf120f4117 + Monotone-Parent: e963d0d35abbc798444e616c5532ac4a7461c63a + Monotone-Revision: e01a6cf59f2ee75d0b39a067e4bb3dc8f01bc380 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-13T04:46:56 + Monotone-Branch: ca.inverse.sogo + commit 304a332d04f29847cbf8b3a7895546c8f730200b Author: Ludovic Marcotte Date: Tue Jan 12 19:43:47 2010 +0000 @@ -55617,6 +66045,22 @@ Date: Mon Jan 11 18:38:44 2010 +0000 M ChangeLog M UI/Contacts/UIxContactFolderActions.m +commit dad75bbdde52da43738b2a35652daace92e1ec16 +Merge: 575ca49 b11895f +Author: Francis Lachapelle +Date: Mon Jan 11 18:25:50 2010 +0000 + + merge of '18bcde63a97bfd2933b370687c939865d8c21d61' + and '32e14dc57c4f6d9a43de5dfdf3c298091cbf84ea' + + Monotone-Parent: 18bcde63a97bfd2933b370687c939865d8c21d61 + Monotone-Parent: 32e14dc57c4f6d9a43de5dfdf3c298091cbf84ea + Monotone-Revision: 583f127303a07196077a96b395056caf120f4117 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-11T18:25:50 + Monotone-Branch: ca.inverse.sogo + commit 105a5b7305a04b492150a1a6b502a2c441e9153f Author: Wolfgang Sourdeau Date: Fri Jan 8 20:48:45 2010 +0000 @@ -55770,6 +66214,22 @@ Date: Thu Jan 7 19:24:18 2010 +0000 M UI/WebServerResources/SchedulerUI.js +commit bfd2d9f070a784773db880768a931dd6c5d080ca +Merge: 1afac41 a123053 +Author: Francis Lachapelle +Date: Thu Jan 7 19:07:11 2010 +0000 + + merge of '53583144c5d999d03c432c06fcea467dcb2b4988' + and 'ba80cda7e44181710c6bab1a4dbafe1c4da06a57' + + Monotone-Parent: 53583144c5d999d03c432c06fcea467dcb2b4988 + Monotone-Parent: ba80cda7e44181710c6bab1a4dbafe1c4da06a57 + Monotone-Revision: 1bafb5734a88e44a2e54a0ecf6daae5cee2a0f57 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2010-01-07T19:07:11 + Monotone-Branch: ca.inverse.sogo + commit 1afac41537a3c130ac250f25e5ab5d29ce31878b Author: Wolfgang Sourdeau Date: Thu Jan 7 16:59:41 2010 +0000 @@ -56162,6 +66622,22 @@ Date: Mon Jan 4 16:05:12 2010 +0000 M SoObjects/Mailer/SOGoMailForward.m +commit 524cba9bfd79093d1bf2bf1684e2a57f7df6e5c9 +Merge: c90366c 1af27ac +Author: Wolfgang Sourdeau +Date: Mon Jan 4 16:03:36 2010 +0000 + + merge of '495c84a755d7c3dc5b821ce81dde08939ec11972' + and 'f910b2c688865ff7576908ec3caa65dbd9cd74a2' + + Monotone-Parent: 495c84a755d7c3dc5b821ce81dde08939ec11972 + Monotone-Parent: f910b2c688865ff7576908ec3caa65dbd9cd74a2 + Monotone-Revision: a2b439e6942cf7fae5cee8b06159f0a6c4ac6ba6 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2010-01-04T16:03:36 + Monotone-Branch: ca.inverse.sogo + commit c90366c08af7ae8ce68a405b4949e1b9f3185c85 Author: Francis Lachapelle Date: Mon Jan 4 16:01:18 2010 +0000 @@ -56234,6 +66710,22 @@ M SoObjects/Mailer/SOGoMailForward.m M SoObjects/SOGo/NSString+Utilities.h M SoObjects/SOGo/NSString+Utilities.m +commit 0a187f9d383424c5d7b55520ee72a2d5a3c9a82a +Merge: 84c7e14 516861d +Author: Ludovic Marcotte +Date: Sun Dec 27 22:37:41 2009 +0000 + + merge of '0c1ec7e54de5221c8ed291d64541b4524fc8ca6d' + and '71bc211c9fb2a32b06f59717e4f1706d6482c950' + + Monotone-Parent: 0c1ec7e54de5221c8ed291d64541b4524fc8ca6d + Monotone-Parent: 71bc211c9fb2a32b06f59717e4f1706d6482c950 + Monotone-Revision: f6829bdd7a8f8207d69f2c7bd6e1dc52fe733eb0 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-12-27T22:37:41 + Monotone-Branch: ca.inverse.sogo + commit 516861d6f6c7eafdfe6ab9ac4271b4a0d1fab832 Author: Ludovic Marcotte Date: Sat Dec 26 19:02:01 2009 +0000 @@ -56297,6 +66789,22 @@ Date: Fri Dec 25 22:52:52 2009 +0000 M ChangeLog M Tools/SOGoToolBackup.m +commit 84c7e145abdeba3a485b211e8fe37a989cc2c993 +Merge: 3b3d4e6 3525149 +Author: Wolfgang Sourdeau +Date: Thu Dec 24 14:24:01 2009 +0000 + + merge of '5475eac0e45624fa60269bb388e23e6e2dc89bd8' + and '6c665d10d66699c41ab79b02a4b7703765bc6d2a' + + Monotone-Parent: 5475eac0e45624fa60269bb388e23e6e2dc89bd8 + Monotone-Parent: 6c665d10d66699c41ab79b02a4b7703765bc6d2a + Monotone-Revision: 0c1ec7e54de5221c8ed291d64541b4524fc8ca6d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-24T14:24:01 + Monotone-Branch: ca.inverse.sogo + commit 3b3d4e68c0277e1e81b473f01936c1bf82812e63 Author: Ludovic Marcotte Date: Wed Dec 23 22:09:18 2009 +0000 @@ -56313,6 +66821,22 @@ Date: Wed Dec 23 22:09:18 2009 +0000 M ChangeLog M UI/WebServerResources/SchedulerUI.js +commit 35251494f2a077a63e8aab1b56e9777571cc8241 +Merge: 7163e4e b080e01 +Author: Ludovic Marcotte +Date: Wed Dec 23 21:40:56 2009 +0000 + + merge of '4d3351a8b6b27006c2727b36d6fae250d5c24d40' + and 'fbe3cd1ce788185ea42f3ac4b3238f48a16821ad' + + Monotone-Parent: 4d3351a8b6b27006c2727b36d6fae250d5c24d40 + Monotone-Parent: fbe3cd1ce788185ea42f3ac4b3238f48a16821ad + Monotone-Revision: 6c665d10d66699c41ab79b02a4b7703765bc6d2a + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-12-23T21:40:56 + Monotone-Branch: ca.inverse.sogo + commit b080e012ae322e83013e914770d75ccb5dc021fd Author: Ludovic Marcotte Date: Wed Dec 23 21:39:09 2009 +0000 @@ -56330,6 +66854,22 @@ M ChangeLog M SoObjects/SOGo/NSDictionary+Utilities.m M SoObjects/SOGo/NSString+Utilities.m +commit 7163e4ed0ba53b09014ff617a92544ee62463552 +Merge: 1add40c 4320805 +Author: Wolfgang Sourdeau +Date: Wed Dec 23 21:25:07 2009 +0000 + + merge of '3823bd3cc970f67d1d304545984ce01cc2c32ac6' + and '9b5272463fac61370796a5551a285c8f7d3dd24c' + + Monotone-Parent: 3823bd3cc970f67d1d304545984ce01cc2c32ac6 + Monotone-Parent: 9b5272463fac61370796a5551a285c8f7d3dd24c + Monotone-Revision: 4d3351a8b6b27006c2727b36d6fae250d5c24d40 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-23T21:25:07 + Monotone-Branch: ca.inverse.sogo + commit 4320805ece29b0e6b8fae01149c1ddebf16ae6c6 Author: Ludovic Marcotte Date: Wed Dec 23 21:14:18 2009 +0000 @@ -56381,6 +66921,38 @@ M ChangeLog M SoObjects/Mailer/SOGoMailAccount.h M SoObjects/Mailer/SOGoMailAccount.m +commit 8de7496f556efa43b1f04ab7376cd05d7b37f103 +Merge: 84b7582 15849bc +Author: Wolfgang Sourdeau +Date: Wed Dec 23 02:22:35 2009 +0000 + + merge of '048651c03289ee8aea9a9d3d3088a91e534dbe5b' + and 'cef59e89d1cdca1998457ce41e60e9271b884a23' + + Monotone-Parent: 048651c03289ee8aea9a9d3d3088a91e534dbe5b + Monotone-Parent: cef59e89d1cdca1998457ce41e60e9271b884a23 + Monotone-Revision: 06d8a080e505b11bad76b3afa0c1ffa5aa02bc23 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-23T02:22:35 + Monotone-Branch: ca.inverse.sogo + +commit 15849bc3cdafbdf563abd195a2de7f08e66e5b30 +Merge: 8ee88b6 215282e +Author: Wolfgang Sourdeau +Date: Tue Dec 22 23:04:49 2009 +0000 + + merge of '15a323395e06e9dba494ab7c7ad2871d2e95bdd4' + and '77f74fbd8da16c35f71279bd179f0afad94285b5' + + Monotone-Parent: 15a323395e06e9dba494ab7c7ad2871d2e95bdd4 + Monotone-Parent: 77f74fbd8da16c35f71279bd179f0afad94285b5 + Monotone-Revision: cef59e89d1cdca1998457ce41e60e9271b884a23 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-22T23:04:49 + Monotone-Branch: ca.inverse.sogo + commit 215282e08021d15316b483b6572b070dc88cf522 Author: Wolfgang Sourdeau Date: Tue Dec 22 23:04:21 2009 +0000 @@ -56446,6 +67018,22 @@ M UI/Templates/SchedulerUI/UIxTaskProposal.wox M UI/WebServerResources/MailerUI.css M UI/WebServerResources/SchedulerUI.js +commit 8ee88b6a42909ff198aef7c5488e18b4a5426f5f +Merge: 14201aa ab3c3f3 +Author: Francis Lachapelle +Date: Tue Dec 22 21:07:40 2009 +0000 + + merge of '2c0e8a6a410ecb7bc3984b724b271bf6bbdb8947' + and '6f84a669db2d05b99c1720fe9558575f53130156' + + Monotone-Parent: 2c0e8a6a410ecb7bc3984b724b271bf6bbdb8947 + Monotone-Parent: 6f84a669db2d05b99c1720fe9558575f53130156 + Monotone-Revision: 15a323395e06e9dba494ab7c7ad2871d2e95bdd4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-12-22T21:07:40 + Monotone-Branch: ca.inverse.sogo + commit 14201aa76d721e3160f400fbf4a3a67cfdf38643 Author: Francis Lachapelle Date: Tue Dec 22 21:07:06 2009 +0000 @@ -56490,6 +67078,22 @@ Date: Tue Dec 22 20:35:19 2009 +0000 M ChangeLog M Tests/test-webdav.py +commit 0dccddb87bbf4e2b82382af15df2bb80c62668f3 +Merge: 56075d6 843af28 +Author: Wolfgang Sourdeau +Date: Tue Dec 22 20:34:02 2009 +0000 + + merge of 'a678bfc28369a5cca8665c85a0a2e944c1a1fa37' + and 'c6211d892652356a678ac26ac4f287499fbe91ea' + + Monotone-Parent: a678bfc28369a5cca8665c85a0a2e944c1a1fa37 + Monotone-Parent: c6211d892652356a678ac26ac4f287499fbe91ea + Monotone-Revision: becba1041ad050a1189effa1d6444a31a7727dc3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-22T20:34:02 + Monotone-Branch: ca.inverse.sogo + commit 56075d6240416f4b2a3c082d8d16598b21f19dee Author: Wolfgang Sourdeau Date: Tue Dec 22 20:33:47 2009 +0000 @@ -56597,6 +67201,38 @@ Date: Fri Dec 18 19:03:47 2009 +0000 M Documentation/SOGo Installation Guide.odt +commit 941e6dcf23861b9c025b3e1bf3efaea0c04bab77 +Merge: f7b70bf b1075fe +Author: Wolfgang Sourdeau +Date: Thu Dec 17 15:07:11 2009 +0000 + + merge of '69372764b79859a841a1bd84d4f52b2fa501d13a' + and '74f02749420fc106c34d4d9fc437bfa2b41dc6cb' + + Monotone-Parent: 69372764b79859a841a1bd84d4f52b2fa501d13a + Monotone-Parent: 74f02749420fc106c34d4d9fc437bfa2b41dc6cb + Monotone-Revision: 1f7e36970ce281b76583914ff0a8e814841077cb + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-17T15:07:11 + Monotone-Branch: ca.inverse.sogo + +commit f7b70bf926744e2a61d589943457b62b1d513006 +Merge: 133425e f875b39 +Author: Wolfgang Sourdeau +Date: Tue Dec 15 20:21:59 2009 +0000 + + merge of '80091501b42618d93c33de4da16ce798fd5915f3' + and 'e389d9fcfdbcd0c7734388d2a608f86d15589fcf' + + Monotone-Parent: 80091501b42618d93c33de4da16ce798fd5915f3 + Monotone-Parent: e389d9fcfdbcd0c7734388d2a608f86d15589fcf + Monotone-Revision: 69372764b79859a841a1bd84d4f52b2fa501d13a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-15T20:21:59 + Monotone-Branch: ca.inverse.sogo + commit f875b39f4d7504ddbb6b98bdb525b7ae3d709ab7 Author: Wolfgang Sourdeau Date: Tue Dec 15 20:21:38 2009 +0000 @@ -56687,6 +67323,22 @@ M SoObjects/Mailer/NSString+Mail.m M Tools/SOGoToolCheckDoubles.m M Tools/SOGoToolRemoveDoubles.m +commit 9595a07c82320c2424efc29028fd61ea106a7778 +Merge: 33777d0 ff048cd +Author: Wolfgang Sourdeau +Date: Mon Dec 14 14:37:43 2009 +0000 + + merge of '41c1c07c9e64afed10d305ba098bdffb69a7e77d' + and '4bfa73f8df33a1fad6c74b0321872b8b41b526fa' + + Monotone-Parent: 41c1c07c9e64afed10d305ba098bdffb69a7e77d + Monotone-Parent: 4bfa73f8df33a1fad6c74b0321872b8b41b526fa + Monotone-Revision: 26b5f40103235f325bd04edf2ca9fe43ad924990 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-14T14:37:43 + Monotone-Branch: ca.inverse.sogo + commit 33777d04bcf0d4314ee0be91a421c2328ecc47e7 Author: Wolfgang Sourdeau Date: Mon Dec 14 14:37:24 2009 +0000 @@ -56732,6 +67384,22 @@ M ChangeLog M UI/Contacts/Toolbars/SOGoContactFolder.toolbar M UI/WebServerResources/ContactsUI.js +commit f08aed28d3f9de34efff93213d66d9defad4c0de +Merge: 61c0072 89a5e0d +Author: Wolfgang Sourdeau +Date: Wed Dec 9 21:46:39 2009 +0000 + + merge of '9003f157ebcad8369e5e69e70dc966267d1cf728' + and 'db370b54d1c04790d487307a6c2427a914aae37b' + + Monotone-Parent: 9003f157ebcad8369e5e69e70dc966267d1cf728 + Monotone-Parent: db370b54d1c04790d487307a6c2427a914aae37b + Monotone-Revision: 0fae105daa23d0bfd278a2c1253b578984b8876e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-09T21:46:39 + Monotone-Branch: ca.inverse.sogo + commit 61c0072fc5a02343856f5d403427ffb7fb65cefd Author: Wolfgang Sourdeau Date: Wed Dec 9 21:46:05 2009 +0000 @@ -56873,6 +67541,22 @@ Date: Mon Dec 7 20:39:00 2009 +0000 M SOPE/sope-patchset-r1660.diff +commit 36fdb452e149dc2fd254e6a5453768d20d0a9a52 +Merge: 0b1dab8 3af65ad +Author: Wolfgang Sourdeau +Date: Mon Dec 7 16:16:33 2009 +0000 + + merge of '6a57f3626fde7fbfcae50a7c894c35736ad794c8' + and 'be5e3b15cde44245718151c5191d6eb1a73b061b' + + Monotone-Parent: 6a57f3626fde7fbfcae50a7c894c35736ad794c8 + Monotone-Parent: be5e3b15cde44245718151c5191d6eb1a73b061b + Monotone-Revision: ac9fdaf585c4ef94cbc22bcacdf8a0bef4ccd28a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-12-07T16:16:33 + Monotone-Branch: ca.inverse.sogo + commit 3af65adf0afd290fc67433370ffe2a640eedd0e5 Author: Wolfgang Sourdeau Date: Mon Dec 7 16:16:01 2009 +0000 @@ -57159,6 +67843,22 @@ M SoObjects/SOGo/SOGoUserDefaults.m M UI/MailerUI/UIxMailFolderActions.m M UI/PreferencesUI/UIxPreferences.m +commit e8dc2e31c5629e14ef4ae9d8f25aae6f11cf0876 +Merge: f08365d 0a96b7c +Author: Wolfgang Sourdeau +Date: Mon Nov 30 22:38:33 2009 +0000 + + merge of '004229d10ec89760026cebaca31254e6487c54ab' + and '8ac7c60ab7cfe1eb0f5cedd0ac4b33114af38fb8' + + Monotone-Parent: 004229d10ec89760026cebaca31254e6487c54ab + Monotone-Parent: 8ac7c60ab7cfe1eb0f5cedd0ac4b33114af38fb8 + Monotone-Revision: afb2242cf07ec3d3c9cbe25bb4a43d4e15d1ec70 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-11-30T22:38:33 + Monotone-Branch: ca.inverse.sogo + commit 0a96b7ca89fbb0e861dada833395362fffcca478 Author: Wolfgang Sourdeau Date: Mon Nov 30 22:38:22 2009 +0000 @@ -57642,6 +68342,22 @@ M SoObjects/SOGo/SOGoUserDefaults.m M SoObjects/SOGo/SOGoUserManager.m M UI/Scheduler/UIxComponentEditor.m +commit b0446051d325c9fbff58c0bcfac68d14756f721e +Merge: 55c9719 988df04 +Author: Wolfgang Sourdeau +Date: Thu Nov 26 18:24:10 2009 +0000 + + merge of '00ffb0295fd6e6526c1e1132bcd23e8726c80997' + and '5cb63d3b6d43af52102d0fcf33a7587994776330' + + Monotone-Parent: 00ffb0295fd6e6526c1e1132bcd23e8726c80997 + Monotone-Parent: 5cb63d3b6d43af52102d0fcf33a7587994776330 + Monotone-Revision: bcd29d180f0f481f03088f9e1fcb3066dcfdbcc9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-11-26T18:24:10 + Monotone-Branch: ca.inverse.sogo + commit 988df04587a2dc59554961056baba7fa26308246 Author: Ludovic Marcotte Date: Thu Nov 26 16:59:29 2009 +0000 @@ -57712,6 +68428,22 @@ M UI/WebServerResources/UIxPreferences.css M UI/WebServerResources/UIxPreferences.js M UI/WebServerResources/iefixes.css +commit 33b662f13636426bd70ff0feda81d7eb0e4fa86d +Merge: ea61156 57a29bf +Author: Wolfgang Sourdeau +Date: Wed Nov 25 21:16:10 2009 +0000 + + merge of 'a08cbc6fd5fb7b2ac306802cada535a59514a495' + and 'd9edaa5a4ca6782486f4ff16bb99afda3eb95d68' + + Monotone-Parent: a08cbc6fd5fb7b2ac306802cada535a59514a495 + Monotone-Parent: d9edaa5a4ca6782486f4ff16bb99afda3eb95d68 + Monotone-Revision: 39c75e19bf860149cbc9f36ece8744fbd26e0134 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-11-25T21:16:10 + Monotone-Branch: ca.inverse.sogo + commit 57a29bf6b03029e45e5f63c465d79bf13270e1b9 Author: Wolfgang Sourdeau Date: Wed Nov 25 19:45:58 2009 +0000 @@ -57725,6 +68457,22 @@ Date: Wed Nov 25 19:45:58 2009 +0000 M SOPE/sope-patchset-r1660.diff +commit ea611566afc9861701fa6c39b5799348cb0dbae4 +Merge: 3a28682 e9a9134 +Author: Francis Lachapelle +Date: Wed Nov 25 19:29:21 2009 +0000 + + merge of '6159e0c704df2f0a52d5c655b815ae3ef9db304d' + and '9f67c189b2251b9511b4088c2ea0553e82a50502' + + Monotone-Parent: 6159e0c704df2f0a52d5c655b815ae3ef9db304d + Monotone-Parent: 9f67c189b2251b9511b4088c2ea0553e82a50502 + Monotone-Revision: a08cbc6fd5fb7b2ac306802cada535a59514a495 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-11-25T19:29:21 + Monotone-Branch: ca.inverse.sogo + commit e9a9134d927a9ee51165fd550ea84d0c24d1083e Author: Francis Lachapelle Date: Wed Nov 25 19:21:58 2009 +0000 @@ -57794,6 +68542,22 @@ M ChangeLog M SoObjects/SOGo/SOGoGroup.m M SoObjects/SOGo/SQLSource.m +commit 0e50fc3ef9ee84b46a19a6814e58f015803536e7 +Merge: 4071fdb c834daa +Author: Wolfgang Sourdeau +Date: Tue Nov 24 20:33:06 2009 +0000 + + merge of '0c87f247ac8738bb8abb3be8b9181fa346568ad5' + and '7aed954ad4ebbca743fbd0ed569ccff8ef579d50' + + Monotone-Parent: 0c87f247ac8738bb8abb3be8b9181fa346568ad5 + Monotone-Parent: 7aed954ad4ebbca743fbd0ed569ccff8ef579d50 + Monotone-Revision: 8bf27e6a6e311b43dd1eefbb9eab21ed89a80f6d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-11-24T20:33:06 + Monotone-Branch: ca.inverse.sogo + commit c834daa7cafaa7d64b573acecc47623ae9264b23 Author: Francis Lachapelle Date: Mon Nov 23 22:46:14 2009 +0000 @@ -57863,6 +68627,22 @@ A Main/SOGoStartupLogger.h A Main/SOGoStartupLogger.m M Main/sogod.m +commit 5f86e04f2fdd1375aa6f466726df674d739e220e +Merge: d6ddc23 ef483a5 +Author: Wolfgang Sourdeau +Date: Fri Nov 20 19:02:51 2009 +0000 + + merge of '6c60bad69f933684089ae1979a3fe51e84f2c0e5' + and '8c9e590b755c113a30dd211d600f834108d3d3c5' + + Monotone-Parent: 6c60bad69f933684089ae1979a3fe51e84f2c0e5 + Monotone-Parent: 8c9e590b755c113a30dd211d600f834108d3d3c5 + Monotone-Revision: c0283461e792310f219134254634aca1351aec58 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-11-20T19:02:51 + Monotone-Branch: ca.inverse.sogo + commit ef483a59ea008a41d0d6ed6e0e0f76ce1edfd18f Author: Wolfgang Sourdeau Date: Fri Nov 20 19:02:39 2009 +0000 @@ -57890,6 +68670,22 @@ Date: Fri Nov 20 18:59:52 2009 +0000 M Main/SOGoProductLoader.m +commit d6ddc2394da72250d9d699ca20b46a9f48973189 +Merge: d086fd5 02db1a1 +Author: Francis Lachapelle +Date: Fri Nov 20 16:18:32 2009 +0000 + + merge of '3f1a705ea4e12fea3f816fcc523a8b481c081f11' + and 'cb353540581231ee354e2ecfb4ee098e1f4fd5b7' + + Monotone-Parent: 3f1a705ea4e12fea3f816fcc523a8b481c081f11 + Monotone-Parent: cb353540581231ee354e2ecfb4ee098e1f4fd5b7 + Monotone-Revision: 6c60bad69f933684089ae1979a3fe51e84f2c0e5 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-11-20T16:18:32 + Monotone-Branch: ca.inverse.sogo + commit 02db1a1be73dfad491d24178b7315c6c6d7a7300 Author: Francis Lachapelle Date: Fri Nov 20 16:18:10 2009 +0000 @@ -58092,6 +68888,22 @@ M SOPE/GDLContentStore/ChangeLog M SOPE/GDLContentStore/GCSChannelManager.h M SOPE/GDLContentStore/GCSChannelManager.m +commit ddbbb02373944294bce1ea7746cb207dd8ae0be6 +Merge: b35a2e9 7e03b25 +Author: Wolfgang Sourdeau +Date: Thu Nov 19 14:44:54 2009 +0000 + + merge of '8284970df75a548f065196f3da7fcd70bc8c47b3' + and '8b5b324a1c2f984ac4755fedfc3bf7a66169a6af' + + Monotone-Parent: 8284970df75a548f065196f3da7fcd70bc8c47b3 + Monotone-Parent: 8b5b324a1c2f984ac4755fedfc3bf7a66169a6af + Monotone-Revision: 42650c7e11b236bf9b1b25f7089b591ad1af31aa + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-11-19T14:44:54 + Monotone-Branch: ca.inverse.sogo + commit b35a2e92cd2b3b385caf3c35c6e57b836120e5d9 Author: Francis Lachapelle Date: Thu Nov 19 01:59:24 2009 +0000 @@ -58209,6 +69021,22 @@ Date: Wed Nov 18 23:13:44 2009 +0000 M ChangeLog M Main/SOGo.m +commit dec37c41bd737b41dc87e6208817178173f058bc +Merge: 9259ff5 dcc9ae8 +Author: Francis Lachapelle +Date: Wed Nov 18 22:55:10 2009 +0000 + + merge of 'c1d0200c4b60b6258231cb033e48e83ccd97ed4e' + and 'ed66e83d2feb1a41dee7a2a6ca422f440f0e7b18' + + Monotone-Parent: c1d0200c4b60b6258231cb033e48e83ccd97ed4e + Monotone-Parent: ed66e83d2feb1a41dee7a2a6ca422f440f0e7b18 + Monotone-Revision: 12a59355a419419882f630c0b278d47eefbbd116 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-11-18T22:55:10 + Monotone-Branch: ca.inverse.sogo + commit dcc9ae85ef09c052d4b670d4d3917eea04741b92 Author: Francis Lachapelle Date: Wed Nov 18 22:54:12 2009 +0000 @@ -58411,6 +69239,22 @@ Date: Fri Nov 13 14:17:35 2009 +0000 M sogo.spec +commit ba7581f4f44d81775de5966366f9613ca6d32670 +Merge: 83c23e0 c7c0809 +Author: Wolfgang Sourdeau +Date: Thu Nov 12 18:30:42 2009 +0000 + + merge of '7c3174b2dda8eadea001bf8ed529fc682f44b4eb' + and '9324608c23d9ecf3722d0720d2628281ed725d79' + + Monotone-Parent: 7c3174b2dda8eadea001bf8ed529fc682f44b4eb + Monotone-Parent: 9324608c23d9ecf3722d0720d2628281ed725d79 + Monotone-Revision: 6be35fb163738ebd89b9e08ca6fbb581da88e8b6 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-11-12T18:30:42 + Monotone-Branch: ca.inverse.sogo + commit 83c23e05fcf7b3dd64943ff175481e3fc9ac134b Author: Wolfgang Sourdeau Date: Thu Nov 12 18:30:21 2009 +0000 @@ -58446,6 +69290,25 @@ Date: Wed Nov 11 14:57:15 2009 +0000 M Scripts/updates.php +commit ff1496649fdc173c56930df1c20a9dd2ddf1a464 +Merge: e36c0b3 fb9ac84 +Author: Francis Lachapelle +Date: Wed Nov 11 14:53:29 2009 +0000 + + merge of 'd3a95d579a2f82053505d322483528cb41b5690f' + and 'f3dd7372c4f74c5e1e309b528107e222964ca70b' + + Monotone-Parent: d3a95d579a2f82053505d322483528cb41b5690f + Monotone-Parent: f3dd7372c4f74c5e1e309b528107e222964ca70b + Monotone-Revision: 4c5d2c4066a223a058bf92270c21c3319e0a25fc + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-11-11T14:53:29 + Monotone-Date: 2009-11-12T14:57:10 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit fb9ac84533503018fd33d2b44228658e073e2148 Author: Wolfgang Sourdeau Date: Tue Nov 10 21:39:40 2009 +0000 @@ -58465,6 +69328,22 @@ M UI/SOGoUI/UIxComponent.h M UI/SOGoUI/UIxComponent.m M UI/Templates/UIxPageFrame.wox +commit e36c0b372df21337b314b7baf2c92a220a88244a +Merge: e1797c9 5adaba3 +Author: Francis Lachapelle +Date: Tue Nov 10 21:18:46 2009 +0000 + + merge of '9aa24eb1e4a4107aaa9cf4e74e6f8c5b0477350a' + and 'f9a04cc4832d7c1ca8d70b594faba3c5a0eda334' + + Monotone-Parent: 9aa24eb1e4a4107aaa9cf4e74e6f8c5b0477350a + Monotone-Parent: f9a04cc4832d7c1ca8d70b594faba3c5a0eda334 + Monotone-Revision: d3a95d579a2f82053505d322483528cb41b5690f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-11-10T21:18:46 + Monotone-Branch: ca.inverse.sogo + commit 5adaba3ca9b464ea8a447536c9e8a1418ca0c5b5 Author: Wolfgang Sourdeau Date: Tue Nov 10 21:08:58 2009 +0000 @@ -58478,6 +69357,22 @@ Date: Tue Nov 10 21:08:58 2009 +0000 M UI/Templates/UIxPageFrame.wox +commit 30abfa18cb3efb9e3796b5773c6232fe89ed35c7 +Merge: 4446507 a6a841d +Author: Wolfgang Sourdeau +Date: Tue Nov 10 20:58:11 2009 +0000 + + merge of 'bc27fcec7009f89be6225808b581d3967066dfac' + and 'e41ab0579999c2bec5931b07e24575fdd3352c01' + + Monotone-Parent: bc27fcec7009f89be6225808b581d3967066dfac + Monotone-Parent: e41ab0579999c2bec5931b07e24575fdd3352c01 + Monotone-Revision: 132b2ba750acac2321a05f595c90612251cc2660 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-11-10T20:58:11 + Monotone-Branch: ca.inverse.sogo + commit 44465073bbfd665fb29e605d64cec9e97d03e626 Author: Wolfgang Sourdeau Date: Tue Nov 10 20:57:55 2009 +0000 @@ -58728,6 +69623,22 @@ A UI/WebServerResources/thead_bg.png A UI/WebServerResources/toolbarbtn_a_bg.png A UI/WebServerResources/toolbarbtn_span_bg.png +commit a0eef52a7f508ac7863b3cb917bc83fefc139673 +Merge: ad0de63 dd6fb4c +Author: Francis Lachapelle +Date: Wed Nov 4 20:52:35 2009 +0000 + + merge of '106be109a8235ab909bab6ec1c0cc13000074eac' + and 'b2d46c6b2a5ef48f18ce5b5dae9339ace2025d0d' + + Monotone-Parent: 106be109a8235ab909bab6ec1c0cc13000074eac + Monotone-Parent: b2d46c6b2a5ef48f18ce5b5dae9339ace2025d0d + Monotone-Revision: 508bbe52515b0ad7119c755b4cc91d17e313c06b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-11-04T20:52:35 + Monotone-Branch: ca.inverse.sogo + commit dd6fb4c07dba58b7560cab75e72483cfa90c4be6 Author: Wolfgang Sourdeau Date: Wed Nov 4 16:26:22 2009 +0000 @@ -58842,6 +69753,22 @@ Date: Fri Oct 30 14:43:36 2009 +0000 M ChangeLog M UI/WebServerResources/UIxComponentEditor.js +commit 820bbbbe0b3998cc479e7f66480028ca2fa8651d +Merge: e9179e2 b1f4016 +Author: Francis Lachapelle +Date: Fri Oct 30 14:42:32 2009 +0000 + + merge of 'a2cbb882585652aa32a8a34aa0b1e4c61649ce04' + and 'a74245035e03f9c4d879846e3b90f3d7f0c64657' + + Monotone-Parent: a2cbb882585652aa32a8a34aa0b1e4c61649ce04 + Monotone-Parent: a74245035e03f9c4d879846e3b90f3d7f0c64657 + Monotone-Revision: 4e15640eabc9053b15d1d41557d0a3d2e9ddd1ec + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-30T14:42:32 + Monotone-Branch: ca.inverse.sogo + commit e9179e28faba6760502eff0812c08fd2930dcdd7 Author: Francis Lachapelle Date: Fri Oct 30 13:05:44 2009 +0000 @@ -58870,6 +69797,22 @@ Date: Thu Oct 29 21:36:00 2009 +0000 M SOPE/sope-debian.diff +commit adb4dd67322887523015c35032eb3393a272bb29 +Merge: d597ef4 e3aa5b6 +Author: Francis Lachapelle +Date: Thu Oct 29 15:49:00 2009 +0000 + + merge of '66579c760e295ff673528237f7a3497509335c5b' + and '757818bcf28a80dc4ced3f18d49bf9499207ebd8' + + Monotone-Parent: 66579c760e295ff673528237f7a3497509335c5b + Monotone-Parent: 757818bcf28a80dc4ced3f18d49bf9499207ebd8 + Monotone-Revision: 84f16af60b24272574dd4cda1e264912e25d3f4e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-29T15:49:00 + Monotone-Branch: ca.inverse.sogo + commit d597ef40d866a077c7d9f04f3d43c35c35aa2a31 Author: Wolfgang Sourdeau Date: Wed Oct 28 21:10:27 2009 +0000 @@ -58899,6 +69842,23 @@ Date: Wed Oct 28 20:27:22 2009 +0000 M NEWS +commit 46143430450e4563bb195cf23c61e4cfaa4084d7 +Merge: 88d5a1d d9cb0cc +Author: Francis Lachapelle +Date: Wed Oct 28 19:45:46 2009 +0000 + + merge of '37036b35704ebb8a3dea409c83f85cfb5aac658a' + and '505a627078dae3b66b4dd1a147d36c51fdcb0f02' + + Monotone-Parent: 37036b35704ebb8a3dea409c83f85cfb5aac658a + Monotone-Parent: 505a627078dae3b66b4dd1a147d36c51fdcb0f02 + Monotone-Revision: 85db266345780c5066e6f15194a42e0cb6b64250 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-28T19:45:46 + Monotone-Branch: ca.inverse.sogo + Monotone-Tag: SOGo_v1.1.0 + commit 88d5a1ddce994519a657739fd72a22b881d9cca8 Author: Francis Lachapelle Date: Wed Oct 28 19:45:19 2009 +0000 @@ -58997,6 +69957,22 @@ M UI/WebServerResources/UIxMailToSelection.js M UI/WebServerResources/generic.css M UI/WebServerResources/generic.js +commit d9cb0cc5a85250a8c5e5b34a3ea152b09790586c +Merge: 1e658ab 2e0d488 +Author: Ludovic Marcotte +Date: Wed Oct 28 17:47:12 2009 +0000 + + merge of '438a063520e89ce01a9e4e9104a4f5899bad3202' + and '62137d02651888053a8bd415f6e6f5aa79e44cf4' + + Monotone-Parent: 438a063520e89ce01a9e4e9104a4f5899bad3202 + Monotone-Parent: 62137d02651888053a8bd415f6e6f5aa79e44cf4 + Monotone-Revision: 505a627078dae3b66b4dd1a147d36c51fdcb0f02 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-10-28T17:47:12 + Monotone-Branch: ca.inverse.sogo + commit 1e658ab39f11ed5edd830228353c3e9ecc2bd26f Author: Wolfgang Sourdeau Date: Wed Oct 28 17:23:28 2009 +0000 @@ -59061,6 +70037,22 @@ M SoObjects/SOGo/SOGoUserManager.m M UI/Contacts/UIxContactFoldersView.m M UI/MainUI/SOGoUserHomePage.m +commit df66723d570eb4a7a6eac41c3c03352025fa8dc1 +Merge: cc8ae31 cd3c744 +Author: Wolfgang Sourdeau +Date: Tue Oct 27 18:45:06 2009 +0000 + + merge of '540f090a7d557ec7343d1c63082b35d288d03630' + and '7aef600466ee268d07b4d4516d7457e184d2e0be' + + Monotone-Parent: 540f090a7d557ec7343d1c63082b35d288d03630 + Monotone-Parent: 7aef600466ee268d07b4d4516d7457e184d2e0be + Monotone-Revision: 2f97890bbf7aff0d55eb80775c6c96e7bf5a6343 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-27T18:45:06 + Monotone-Branch: ca.inverse.sogo + commit cc8ae31729e382cbf31682187e8363e688cd9f5e Author: Wolfgang Sourdeau Date: Tue Oct 27 18:17:37 2009 +0000 @@ -59090,6 +70082,22 @@ Date: Tue Oct 27 15:57:58 2009 +0000 M ChangeLog M Documentation/SOGo Installation Guide.odt +commit d3a6b7ae40a23cdc013690f2e2bc58fec6dc1518 +Merge: 37823ea b00bcf1 +Author: C Robert +Date: Tue Oct 27 16:07:16 2009 +0000 + + merge of '352d23b933923d47d85f540dbc1f7dae0abe7ddb' + and 'cb47401127bc90adde66734592f99174a37c6e8b' + + Monotone-Parent: 352d23b933923d47d85f540dbc1f7dae0abe7ddb + Monotone-Parent: cb47401127bc90adde66734592f99174a37c6e8b + Monotone-Revision: ed24a4c73d409a237db89ecae8763c9078fe440e + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-10-27T16:07:16 + Monotone-Branch: ca.inverse.sogo + commit 37823ea401bd26630698c22bbc27828d9dd18631 Author: C Robert Date: Tue Oct 27 16:06:59 2009 +0000 @@ -59135,6 +70143,22 @@ Date: Tue Oct 27 13:09:40 2009 +0000 M SOPE/sope-patchset-r1660.diff +commit 98c0419a241059c96e88aae378fa809dfc766388 +Merge: c38cb52 daba82a +Author: Francis Lachapelle +Date: Mon Oct 26 18:30:28 2009 +0000 + + merge of '0750a53ed5f3840d792633c143fd51e07040d486' + and 'c7ad331417d6c2767578747a293dae8820497511' + + Monotone-Parent: 0750a53ed5f3840d792633c143fd51e07040d486 + Monotone-Parent: c7ad331417d6c2767578747a293dae8820497511 + Monotone-Revision: 5f797d0ee49e0c4a8db09057f193305ea618291c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-26T18:30:28 + Monotone-Branch: ca.inverse.sogo + commit c38cb5200de1b7800d5828190b3240e4ec04b567 Author: Francis Lachapelle Date: Mon Oct 26 18:30:06 2009 +0000 @@ -59184,6 +70208,22 @@ Date: Mon Oct 26 15:52:45 2009 +0000 M ChangeLog M UI/WebServerResources/ContactsUI.js +commit 59ed1ace53e23976bd84dd1d472650e7a248d166 +Merge: cd8b08c 0c15bc1 +Author: Francis Lachapelle +Date: Mon Oct 26 14:49:48 2009 +0000 + + merge of '5dc4cb1b1db106a86e6f11efc1734d6d529c5a5b' + and 'ee8550aaa8fff50b1f80d13d050359038bd92e54' + + Monotone-Parent: 5dc4cb1b1db106a86e6f11efc1734d6d529c5a5b + Monotone-Parent: ee8550aaa8fff50b1f80d13d050359038bd92e54 + Monotone-Revision: cc50967cd5623fad93774ada2fe5af98c14b2a98 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-26T14:49:48 + Monotone-Branch: ca.inverse.sogo + commit 0c15bc1be7f2fde6ff2b25d80b725698e39bd93c Author: Francis Lachapelle Date: Mon Oct 26 14:49:25 2009 +0000 @@ -59352,6 +70392,22 @@ M UI/PreferencesUI/Czech.lproj/Localizable.strings M UI/PreferencesUI/French.lproj/Localizable.strings M UI/Scheduler/Czech.lproj/Localizable.strings +commit e54807ff3962010261d871bad532653f1078a468 +Merge: 2ee667d e30a6ca +Author: Francis Lachapelle +Date: Fri Oct 23 21:20:45 2009 +0000 + + merge of '5ca0171c2820bdea8fa61c516f7b07890504fe94' + and 'ae600dde90a09517ff2cad4629bd94dc68652e03' + + Monotone-Parent: 5ca0171c2820bdea8fa61c516f7b07890504fe94 + Monotone-Parent: ae600dde90a09517ff2cad4629bd94dc68652e03 + Monotone-Revision: f515f427a2758c70b0acbdb399f62573b5979407 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-23T21:20:45 + Monotone-Branch: ca.inverse.sogo + commit 2ee667d38d7562ec8d9652d3d569015541e09111 Author: Francis Lachapelle Date: Fri Oct 23 21:20:06 2009 +0000 @@ -59408,6 +70464,22 @@ Date: Fri Oct 23 21:10:42 2009 +0000 M ChangeLog M SoObjects/Contacts/SOGoContactSourceFolder.m +commit 6e973a44b22301931ec84e60268aba67a05fdddd +Merge: e7e31ef 7663cdc +Author: Wolfgang Sourdeau +Date: Fri Oct 23 21:06:27 2009 +0000 + + merge of '3f0a698566b940e183824009e4aae638d5263054' + and '7c369f5daacf319b74a648fea43f833dda69d81d' + + Monotone-Parent: 3f0a698566b940e183824009e4aae638d5263054 + Monotone-Parent: 7c369f5daacf319b74a648fea43f833dda69d81d + Monotone-Revision: 991fcab97beb9fd908675007805ffd9ce421800e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-23T21:06:27 + Monotone-Branch: ca.inverse.sogo + commit e7e31ef543bf0a694f0393ddc1c53aefd5da2c5b Author: Wolfgang Sourdeau Date: Fri Oct 23 21:06:05 2009 +0000 @@ -59516,6 +70588,22 @@ Date: Fri Oct 23 15:04:28 2009 +0000 M ChangeLog M UI/Scheduler/UIxComponentEditor.m +commit e3702243dfa167ddfd2dee3bc66406f9270bacf0 +Merge: 0138026 bfe9202 +Author: Wolfgang Sourdeau +Date: Fri Oct 23 12:55:05 2009 +0000 + + merge of '0b4f4888f8c4911de2f9cab76cdd5c442df13689' + and 'f3e126a601c0f8c108b12798b89b865a4a61cdb1' + + Monotone-Parent: 0b4f4888f8c4911de2f9cab76cdd5c442df13689 + Monotone-Parent: f3e126a601c0f8c108b12798b89b865a4a61cdb1 + Monotone-Revision: 4f0bf8feeb9303c272c290edf3a27a53d5f0e7f6 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-23T12:55:05 + Monotone-Branch: ca.inverse.sogo + commit 01380267d2471cc85d1fd90015476601a6892c9f Author: Wolfgang Sourdeau Date: Fri Oct 23 12:54:50 2009 +0000 @@ -59562,6 +70650,22 @@ Date: Wed Oct 21 21:30:21 2009 +0000 M SOPE/sope-patchset-r1660.diff +commit 57545694964ef1f3ba70a1b20d8004cb45d8a0d7 +Merge: bfb2bf0 8bbe631 +Author: Wolfgang Sourdeau +Date: Wed Oct 21 21:18:19 2009 +0000 + + merge of '2486c891d32ba8306f9e058c37f500a0d43424c5' + and 'fe50cf1e82dc1e3027fc400eb2f405261b9ad9f3' + + Monotone-Parent: 2486c891d32ba8306f9e058c37f500a0d43424c5 + Monotone-Parent: fe50cf1e82dc1e3027fc400eb2f405261b9ad9f3 + Monotone-Revision: 846fa20b13dd09d896ed82cad5836822133d22c3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-21T21:18:19 + Monotone-Branch: ca.inverse.sogo + commit 8bbe631dac2ead0784bb3574a834e1af0e8894bc Author: Wolfgang Sourdeau Date: Wed Oct 21 21:17:11 2009 +0000 @@ -59771,6 +70875,22 @@ Date: Mon Oct 19 21:44:25 2009 +0000 M debian/sogo.cron.daily +commit ab9c9b72633fa60ca9df3567161abac8dc80e5a7 +Merge: ffd3b8d 7344e4d +Author: Wolfgang Sourdeau +Date: Mon Oct 19 21:40:01 2009 +0000 + + merge of '62d1af99422697f56336f8de72d9a7ae0ec1b210' + and 'c3418cb8dc92a811cb6b1d3b583d6ffd09d6bd4d' + + Monotone-Parent: 62d1af99422697f56336f8de72d9a7ae0ec1b210 + Monotone-Parent: c3418cb8dc92a811cb6b1d3b583d6ffd09d6bd4d + Monotone-Revision: 950380ef7d21e236720a256867099e544955446c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-19T21:40:01 + Monotone-Branch: ca.inverse.sogo + commit ffd3b8d2e06d7ebf7520430693d9d4dcce2994c0 Author: Wolfgang Sourdeau Date: Mon Oct 19 21:39:49 2009 +0000 @@ -60349,6 +71469,22 @@ M UI/Templates/AdministrationUI/UIxAdministration.wox M UI/WebServerResources/AdministrationUI.css M UI/WebServerResources/AdministrationUI.js +commit d5b7afa129987f6f2131e4adc878740c1a27604c +Merge: 2db389e 8bb4876 +Author: Francis Lachapelle +Date: Thu Oct 15 16:10:31 2009 +0000 + + merge of '0125ec85f12db797fda490ba70897a61682fadad' + and '543e45199920400765ecaa8cf762102cd49ee1cb' + + Monotone-Parent: 0125ec85f12db797fda490ba70897a61682fadad + Monotone-Parent: 543e45199920400765ecaa8cf762102cd49ee1cb + Monotone-Revision: 7145f91bc53473eb5af77730e87d0ebc7d3988e3 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-15T16:10:31 + Monotone-Branch: ca.inverse.sogo + commit 2db389e38d6945c89c2d9704d06586b5db935c47 Author: Ludovic Marcotte Date: Thu Oct 15 13:40:36 2009 +0000 @@ -60449,6 +71585,22 @@ Date: Wed Oct 14 19:43:21 2009 +0000 M UI/WebServerResources/MailerUI.css +commit ec67e4d654141a566abc1ed6b732e4a3e06e50b4 +Merge: 5396c23 b6d3139 +Author: Francis Lachapelle +Date: Wed Oct 14 19:27:54 2009 +0000 + + merge of '2b398c7917c2665525f315c4a078f13665aeea62' + and '9808a0781250c62da6dbd16dbd959fef199ace09' + + Monotone-Parent: 2b398c7917c2665525f315c4a078f13665aeea62 + Monotone-Parent: 9808a0781250c62da6dbd16dbd959fef199ace09 + Monotone-Revision: 9718b3ccbc149f9b4b497423af72e8271ec7b624 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-14T19:27:54 + Monotone-Branch: ca.inverse.sogo + commit 5396c23a62f52656c3784e80654a59ac7223d2c1 Author: Francis Lachapelle Date: Wed Oct 14 19:27:45 2009 +0000 @@ -60465,6 +71617,22 @@ Date: Wed Oct 14 19:27:45 2009 +0000 M ChangeLog M UI/Scheduler/UIxCalListingActions.m +commit b6d3139fb7f66974a148c19c7d857de428f189cb +Merge: 29e239b 9cd9670 +Author: Francis Lachapelle +Date: Wed Oct 14 18:28:07 2009 +0000 + + merge of '78eddfb311776e904d4f6650bcc5e2930af4519a' + and 'cff51eb80ef633a72d1cc7527a1092b597f57f55' + + Monotone-Parent: 78eddfb311776e904d4f6650bcc5e2930af4519a + Monotone-Parent: cff51eb80ef633a72d1cc7527a1092b597f57f55 + Monotone-Revision: 9808a0781250c62da6dbd16dbd959fef199ace09 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-14T18:28:07 + Monotone-Branch: ca.inverse.sogo + commit 9cd9670741518af471030351ddbee23bbe64d4a0 Author: Francis Lachapelle Date: Wed Oct 14 18:25:50 2009 +0000 @@ -60497,6 +71665,22 @@ Date: Wed Oct 14 16:47:15 2009 +0000 M ChangeLog M UI/Scheduler/UIxCalMainActions.m +commit 46e526721516819b4cf742dc67abada2105c4d3c +Merge: 68253d1 e5d8de7 +Author: Wolfgang Sourdeau +Date: Wed Oct 14 12:48:55 2009 +0000 + + merge of 'a9673b6b7feb76572f80c31fe67ba936ed709f8f' + and 'b246c3979cba84d0c46cb39e0141ae390baaea7a' + + Monotone-Parent: a9673b6b7feb76572f80c31fe67ba936ed709f8f + Monotone-Parent: b246c3979cba84d0c46cb39e0141ae390baaea7a + Monotone-Revision: dfb0905a14bcb6b22ea2b02eb9910b1e098aeaa9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-14T12:48:55 + Monotone-Branch: ca.inverse.sogo + commit e5d8de7d5c9a3e93c7370a1e15309ec5d8717b12 Author: Wolfgang Sourdeau Date: Wed Oct 14 12:01:59 2009 +0000 @@ -60579,6 +71763,22 @@ M SoObjects/SOGo/SOGoUserDefaults.h M SoObjects/SOGo/SOGoUserDefaults.m M UI/PreferencesUI/UIxPreferences.m +commit bf95e107462c29c5c360bf6f2e86b2e9f44d5c7d +Merge: 2da9e90 114e8bd +Author: Francis Lachapelle +Date: Tue Oct 13 21:08:25 2009 +0000 + + merge of '31bc4f6b49316e2603b7496cfee3b18fdd5e490f' + and '5244339e45ef9095573b10733228f85b81a17377' + + Monotone-Parent: 31bc4f6b49316e2603b7496cfee3b18fdd5e490f + Monotone-Parent: 5244339e45ef9095573b10733228f85b81a17377 + Monotone-Revision: 4437a82e041d016710ea3a45d8b7cf5b6341afff + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-13T21:08:25 + Monotone-Branch: ca.inverse.sogo + commit 2da9e90ebc3212ab0573995de89b9c55e7d761b3 Author: Francis Lachapelle Date: Tue Oct 13 19:14:21 2009 +0000 @@ -60666,6 +71866,22 @@ Date: Tue Oct 13 14:09:04 2009 +0000 M ChangeLog M SoObjects/SOGo/LDAPSource.m +commit 3e0a6e488d6322025765be4234dc3d5a955dc1df +Merge: ff237b7 11cd327 +Author: Wolfgang Sourdeau +Date: Tue Oct 13 14:04:09 2009 +0000 + + merge of 'ae9bb8c02977fbcbedcef40778d6fffefd1fb58c' + and 'dc10f7852e5329afe91c3cba3227fead4f0ae366' + + Monotone-Parent: ae9bb8c02977fbcbedcef40778d6fffefd1fb58c + Monotone-Parent: dc10f7852e5329afe91c3cba3227fead4f0ae366 + Monotone-Revision: c20caa2683b07b4d462317997632facb96fcdd72 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-13T14:04:09 + Monotone-Branch: ca.inverse.sogo + commit ff237b7b90862010078d08466934f3f237d7dded Author: Wolfgang Sourdeau Date: Tue Oct 13 14:04:02 2009 +0000 @@ -60732,6 +71948,22 @@ M UI/MainUI/Version M UI/Templates/UIxPageFrame.wox M Version +commit fea3baff04637e2e0d2e143a1a3e66749f0fee17 +Merge: 95b4763 d681e9a +Author: Wolfgang Sourdeau +Date: Sat Oct 10 18:40:15 2009 +0000 + + merge of '11b16e47828dac92fd5fc6a0141e90ca854b7b89' + and 'c1d31c63186b0154a4c8aae294a6968d64136187' + + Monotone-Parent: 11b16e47828dac92fd5fc6a0141e90ca854b7b89 + Monotone-Parent: c1d31c63186b0154a4c8aae294a6968d64136187 + Monotone-Revision: 9cd6cf883ffe8961708e6bdb5a8b3a3f439eebbf + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-10T18:40:15 + Monotone-Branch: ca.inverse.sogo + commit 95b4763d9225d63eaf40c8730c8f3eb3ec7cdbba Author: Wolfgang Sourdeau Date: Sat Oct 10 18:37:10 2009 +0000 @@ -60960,6 +72192,22 @@ M UI/Templates/PreferencesUI/UIxPreferences.wox M UI/WebServerResources/UIxPreferences.css M UI/WebServerResources/UIxPreferences.js +commit b31c571cee008fdbb369549b84e2c432c9d4ad50 +Merge: 1300cd4 768e3cf +Author: Francis Lachapelle +Date: Thu Oct 8 22:04:58 2009 +0000 + + merge of '434d80a4af8672744673019c8fab2fbb0c4f0004' + and 'e11d0b2861cf3888ff5f2fa58e01243c5de99a1d' + + Monotone-Parent: 434d80a4af8672744673019c8fab2fbb0c4f0004 + Monotone-Parent: e11d0b2861cf3888ff5f2fa58e01243c5de99a1d + Monotone-Revision: 3862a22ce756fbd4c559e0d9a9a211821d9c597b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-08T22:04:58 + Monotone-Branch: ca.inverse.sogo + commit 768e3cf2249d9b5f30c44535acc4bebee6904261 Author: Wolfgang Sourdeau Date: Thu Oct 8 22:34:52 2009 +0000 @@ -61256,6 +72504,22 @@ M SoObjects/Mailer/EOQualifier+MailDAV.m M SoObjects/Mailer/SOGoMailFolder.m M Tests/test-maildav.py +commit e7c0170569fc28395c9ccad087ea94827dcb67c4 +Merge: 52bc9fc 09a051f +Author: Francis Lachapelle +Date: Wed Oct 7 17:40:35 2009 +0000 + + merge of '139de259dfc247ae1f4819f5700da66891c36157' + and '262c953376c0f20b5400b85f39fb76c6a95e025d' + + Monotone-Parent: 139de259dfc247ae1f4819f5700da66891c36157 + Monotone-Parent: 262c953376c0f20b5400b85f39fb76c6a95e025d + Monotone-Revision: b8a3105c4f499a2da3ed4edc4828e90d7dac93a5 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-07T17:40:35 + Monotone-Branch: ca.inverse.sogo + commit 52bc9fce36f054b262f98b5021f123b9a6d75c1a Author: Francis Lachapelle Date: Wed Oct 7 17:40:02 2009 +0000 @@ -61272,6 +72536,22 @@ Date: Wed Oct 7 17:40:02 2009 +0000 M ChangeLog M UI/Scheduler/UIxCalListingActions.m +commit 09a051fd3066e99a9d5b7dddf47a46278afa3480 +Merge: 4085592 cea6118 +Author: Wolfgang Sourdeau +Date: Wed Oct 7 16:38:07 2009 +0000 + + merge of '77d594aad6116d444e02c306b0279825a2b43994' + and 'c1c4f8fa1e677ec974e669c16ee667a5040a4f0a' + + Monotone-Parent: 77d594aad6116d444e02c306b0279825a2b43994 + Monotone-Parent: c1c4f8fa1e677ec974e669c16ee667a5040a4f0a + Monotone-Revision: 262c953376c0f20b5400b85f39fb76c6a95e025d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-07T16:38:07 + Monotone-Branch: ca.inverse.sogo + commit cea61181824850b9ecc733ef608e0597ec2744e0 Author: Francis Lachapelle Date: Wed Oct 7 14:59:30 2009 +0000 @@ -61367,6 +72647,22 @@ Date: Tue Oct 6 20:53:15 2009 +0000 M SOPE/sope-patchset-r1660.diff +commit 244e05307e26ffdb92d232b8350ec7e3289f37a4 +Merge: 725878e 8f85f81 +Author: Wolfgang Sourdeau +Date: Tue Oct 6 18:27:56 2009 +0000 + + merge of '33a4befb91778f46b962f6c895f7697b0d1df722' + and 'bdbaabe6229246948b265d310037a9694b45d91f' + + Monotone-Parent: 33a4befb91778f46b962f6c895f7697b0d1df722 + Monotone-Parent: bdbaabe6229246948b265d310037a9694b45d91f + Monotone-Revision: ae35a52b6b85f7b941d2d5a27bdae17a0e87e216 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-06T18:27:56 + Monotone-Branch: ca.inverse.sogo + commit 8f85f81cdafdb3e26f4f185fdb31cf0975d5927e Author: Wolfgang Sourdeau Date: Tue Oct 6 18:26:22 2009 +0000 @@ -61448,6 +72744,22 @@ Date: Tue Oct 6 13:08:16 2009 +0000 M UI/Templates/SchedulerUI/UIxCalMainView.wox +commit 77996f2b7a72df2a32161363ef4bc972efcdb772 +Merge: 5cc26fa 088cb75 +Author: Francis Lachapelle +Date: Mon Oct 5 22:10:12 2009 +0000 + + merge of '24faa1b3ee3108a8faa323c456c74d517b4e233d' + and 'ce654c24f2f00574570b6f4719cccc588905dc0e' + + Monotone-Parent: 24faa1b3ee3108a8faa323c456c74d517b4e233d + Monotone-Parent: ce654c24f2f00574570b6f4719cccc588905dc0e + Monotone-Revision: 9091f162c671a0d32c003aa063bff71fb1e68a10 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-05T22:10:12 + Monotone-Branch: ca.inverse.sogo + commit 5cc26fad8ab71d43d65dd3e917d38099e8e2c757 Author: Francis Lachapelle Date: Mon Oct 5 22:09:35 2009 +0000 @@ -61607,6 +72919,22 @@ Date: Fri Oct 2 20:59:52 2009 +0000 M Tests/preferences.py +commit 59da0220d32d6fbe2f2f6ed932718c4ee8dd4e47 +Merge: 4c68d9f 50709fb +Author: C Robert +Date: Fri Oct 2 20:49:55 2009 +0000 + + merge of '1e98981134df0b7159efec9e9e202b43a2c90b0b' + and '28406780a6c50ff64f105729a3da838862931031' + + Monotone-Parent: 1e98981134df0b7159efec9e9e202b43a2c90b0b + Monotone-Parent: 28406780a6c50ff64f105729a3da838862931031 + Monotone-Revision: 19556539dea890ea9ed78ae2d8b4ebfdfa9a4756 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-10-02T20:49:55 + Monotone-Branch: ca.inverse.sogo + commit 50709fba65b5331b5fcec620f4fea4d739013724 Author: C Robert Date: Fri Oct 2 20:49:39 2009 +0000 @@ -61760,6 +73088,38 @@ Date: Fri Oct 2 13:41:49 2009 +0000 M UI/WebServerResources/SOGoAutoCompletion.js +commit 79e582d9e9af1acd56600d4c6356234695b086ba +Merge: f273572 e9584b6 +Author: Francis Lachapelle +Date: Fri Oct 2 13:24:41 2009 +0000 + + merge of '3b18c2f1210021a7c5a829e08dbc01abb290d085' + and '5a074ab7a9fac70c04e1d59bb93005aab536c9f7' + + Monotone-Parent: 3b18c2f1210021a7c5a829e08dbc01abb290d085 + Monotone-Parent: 5a074ab7a9fac70c04e1d59bb93005aab536c9f7 + Monotone-Revision: 0c24951c6f23e1c5c5c97871b0a535b026ad55e4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-02T13:24:41 + Monotone-Branch: ca.inverse.sogo + +commit e9584b649bfac359c973acdfe08e054d9034c57e +Merge: dae82c8 87007c3 +Author: Francis Lachapelle +Date: Fri Oct 2 13:21:28 2009 +0000 + + merge of '40a85071e7335fa3da3361d43dbbf6cf13684342' + and 'd41e13d636a1fa2bf22bce99faacdbfccca67d9e' + + Monotone-Parent: 40a85071e7335fa3da3361d43dbbf6cf13684342 + Monotone-Parent: d41e13d636a1fa2bf22bce99faacdbfccca67d9e + Monotone-Revision: 5a074ab7a9fac70c04e1d59bb93005aab536c9f7 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-02T13:21:28 + Monotone-Branch: ca.inverse.sogo + commit f273572c9572ea4cb2c03a89e6de3bbf27b1c613 Author: Ludovic Marcotte Date: Fri Oct 2 13:13:00 2009 +0000 @@ -61913,6 +73273,22 @@ Date: Thu Oct 1 19:47:02 2009 +0000 M UI/Templates/MailPartViewers/UIxMailPartMessageViewer.wox +commit bf093a8053b09879a565e9201fa5aa6a0e4dbed7 +Merge: cd2c6e9 1e5e4ff +Author: Francis Lachapelle +Date: Thu Oct 1 18:56:36 2009 +0000 + + merge of '612feb8d0685768e00f996a577adc89429721263' + and 'c8a95d2308d9bd094568d9a719c5f29d11543123' + + Monotone-Parent: 612feb8d0685768e00f996a577adc89429721263 + Monotone-Parent: c8a95d2308d9bd094568d9a719c5f29d11543123 + Monotone-Revision: 2b6cf9ec13774912de440dcfe08a03df4a580d4e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-10-01T18:56:36 + Monotone-Branch: ca.inverse.sogo + commit 1e5e4ff46e1f0c5ba3d772ef5901ff27c89af351 Author: Francis Lachapelle Date: Thu Oct 1 18:55:51 2009 +0000 @@ -61985,6 +73361,22 @@ Date: Thu Oct 1 14:40:10 2009 +0000 M general.make +commit 917364313c96bf8fb11c38c96a8708a74f3f278b +Merge: aaba35a ad49c5d +Author: Wolfgang Sourdeau +Date: Thu Oct 1 14:37:48 2009 +0000 + + merge of '378c2fe5c0cef090bbc8c6a6cfe47eace6fbe923' + and 'b5beb9beec402717a04f1250f79638aae4d70b55' + + Monotone-Parent: 378c2fe5c0cef090bbc8c6a6cfe47eace6fbe923 + Monotone-Parent: b5beb9beec402717a04f1250f79638aae4d70b55 + Monotone-Revision: b0d8d058d4066dff46512567c9ebf3f888825052 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-01T14:37:48 + Monotone-Branch: ca.inverse.sogo + commit aaba35ab88946686f88a41552adf493a29b8966e Author: Wolfgang Sourdeau Date: Thu Oct 1 14:37:35 2009 +0000 @@ -62100,6 +73492,22 @@ Date: Thu Oct 1 12:47:43 2009 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolders.m +commit 2e93d8d329c41579009ac8b30e7aeca259f16407 +Merge: b3d3c61 57c5a4e +Author: Wolfgang Sourdeau +Date: Thu Oct 1 12:41:57 2009 +0000 + + merge of '11bccd9e32f64627c80021f1ebe5a4a27341208f' + and 'd76a6bc23d031a16535ce20a79d7881c485b3025' + + Monotone-Parent: 11bccd9e32f64627c80021f1ebe5a4a27341208f + Monotone-Parent: d76a6bc23d031a16535ce20a79d7881c485b3025 + Monotone-Revision: bbd203abc78f2fcaff9b64e547342ba96b97bfb3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-10-01T12:41:57 + Monotone-Branch: ca.inverse.sogo + commit b3d3c6171374a15c277649b3d3974e624a9fc254 Author: Wolfgang Sourdeau Date: Thu Oct 1 12:20:52 2009 +0000 @@ -62406,6 +73814,22 @@ Date: Mon Sep 28 20:47:27 2009 +0000 A Tests/test-maildav.py M Tests/webdavlib.py +commit 9ae151dfb90ec157e1802fc5545c32eb7ec967f6 +Merge: 8b591d6 f66e173 +Author: Ludovic Marcotte +Date: Mon Sep 28 15:07:20 2009 +0000 + + merge of '5052783f79bc86c62042f5d4a556a3573c4a3876' + and '8889afbf143b1653a2ac96bad029b4301fc1f146' + + Monotone-Parent: 5052783f79bc86c62042f5d4a556a3573c4a3876 + Monotone-Parent: 8889afbf143b1653a2ac96bad029b4301fc1f146 + Monotone-Revision: fcece651323f876baef1d1d08bc52772b67ce6a4 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-09-28T15:07:20 + Monotone-Branch: ca.inverse.sogo + commit 8b591d6f07189338540eed607289311eff1f73ec Author: Ludovic Marcotte Date: Mon Sep 28 15:06:54 2009 +0000 @@ -62819,6 +74243,22 @@ Date: Wed Sep 23 17:21:02 2009 +0000 M configure A general.make +commit d5957ac5c594a537d483cd7957eeeb04ccc4e783 +Merge: 7cc930f 582dee6 +Author: Wolfgang Sourdeau +Date: Wed Sep 23 17:18:32 2009 +0000 + + merge of '11ca52315bdce5c8e4b000e5b9f33d5b2ecbd052' + and 'd999a58fea7c083b81da56a7f2274d857b44eb7a' + + Monotone-Parent: 11ca52315bdce5c8e4b000e5b9f33d5b2ecbd052 + Monotone-Parent: d999a58fea7c083b81da56a7f2274d857b44eb7a + Monotone-Revision: 1e1b1ea27969183ec35f1d755b26adeadb3874c0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-09-23T17:18:32 + Monotone-Branch: ca.inverse.sogo + commit 7cc930fb55618c46f22b4191e61a6e1d11105cbe Author: C Robert Date: Wed Sep 23 15:00:50 2009 +0000 @@ -62869,6 +74309,22 @@ M ChangeLog M UI/WebServerResources/SOGoAutoCompletion.js M UI/WebServerResources/UIxMailToSelection.js +commit f1198fed5e55938a584c5f9d009744a63314cf1c +Merge: c1e494b d405890 +Author: Wolfgang Sourdeau +Date: Wed Sep 23 14:08:10 2009 +0000 + + merge of '1443769c1e31f2a1fd56f511f744a2511816cad6' + and 'eb849cd1ed0d0c971d478b71224c6832391b51e7' + + Monotone-Parent: 1443769c1e31f2a1fd56f511f744a2511816cad6 + Monotone-Parent: eb849cd1ed0d0c971d478b71224c6832391b51e7 + Monotone-Revision: 90ce7306feefa92f1dc0cb7d38c3530919015bb5 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-09-23T14:08:10 + Monotone-Branch: ca.inverse.sogo + commit c1e494b6527a1869acdb465963f88e699f7862bb Author: C Robert Date: Wed Sep 23 13:03:37 2009 +0000 @@ -62930,6 +74386,22 @@ Date: Tue Sep 22 21:06:44 2009 +0000 M ChangeLog M Tests/webdavlib.py +commit 5104dcb4c67402e3cca1a351a5e5684bfc401d7c +Merge: 75365c7 4af8436 +Author: C Robert +Date: Tue Sep 22 20:54:22 2009 +0000 + + merge of '083c5eacbea5cf39b26ae89e1fa54412357634af' + and '5549339aa6c865731d17f2f65a560a401cb19e1f' + + Monotone-Parent: 083c5eacbea5cf39b26ae89e1fa54412357634af + Monotone-Parent: 5549339aa6c865731d17f2f65a560a401cb19e1f + Monotone-Revision: a6b2e3c5d395d584befdfa5576912f12276f0677 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-09-22T20:54:22 + Monotone-Branch: ca.inverse.sogo + commit 75365c7e5f436e9015fc81f7ae54bef946744f03 Author: C Robert Date: Tue Sep 22 20:54:09 2009 +0000 @@ -63062,6 +74534,22 @@ Date: Tue Sep 22 16:19:01 2009 +0000 M SOPE/sope-patchset-r1660.diff +commit 98a95e6c7d836313eb174b7adec14e1a395a06d9 +Merge: 9ce1b2d b491d2b +Author: Wolfgang Sourdeau +Date: Tue Sep 22 16:18:46 2009 +0000 + + merge of '38d99d8e3c69a7b418c3c71ebadc112262ad53db' + and 'c67e433732722d75d043f48a847d38b5f7acad9d' + + Monotone-Parent: 38d99d8e3c69a7b418c3c71ebadc112262ad53db + Monotone-Parent: c67e433732722d75d043f48a847d38b5f7acad9d + Monotone-Revision: 797076e3cfc53405c373bf68e4ec84628c293235 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-09-22T16:18:46 + Monotone-Branch: ca.inverse.sogo + commit b491d2b0eb0f69661c0ec259f46c550adfe89a9f Author: Wolfgang Sourdeau Date: Tue Sep 22 15:58:43 2009 +0000 @@ -63241,6 +74729,22 @@ M ChangeLog M UI/WebServerResources/UIxPreferences.js M UI/WebServerResources/generic.js +commit fd2185a463b57dcc0d90dcd809d13af1a9204d7d +Merge: 282f33c c6a6d7a +Author: Wolfgang Sourdeau +Date: Thu Sep 17 15:23:10 2009 +0000 + + merge of '329632453c9a3f0fdbb5eb9f65ce204e82fe7549' + and 'a2f77c74b5edb6ba4c72880ef957354f05292c27' + + Monotone-Parent: 329632453c9a3f0fdbb5eb9f65ce204e82fe7549 + Monotone-Parent: a2f77c74b5edb6ba4c72880ef957354f05292c27 + Monotone-Revision: 652a580846111dfcf9de40e4ccfcded593cf6f0d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-09-17T15:23:10 + Monotone-Branch: ca.inverse.sogo + commit 282f33cc4014c3a1b125d1d3dd88da139d10a778 Author: Wolfgang Sourdeau Date: Thu Sep 17 15:22:53 2009 +0000 @@ -63453,6 +74957,22 @@ Date: Mon Sep 14 21:29:09 2009 +0000 M UI/MainUI/product.plist +commit 7794982fc5c38c56640b2279eda7b4a3d1c67b15 +Merge: 7399f16 eaed6f4 +Author: Wolfgang Sourdeau +Date: Mon Sep 14 20:50:41 2009 +0000 + + merge of '5b2a32ba5341455fbf5f685a68a8b18fd5d22fb8' + and '9495d1f289e6a977a13ee774c20ad749628a99ac' + + Monotone-Parent: 5b2a32ba5341455fbf5f685a68a8b18fd5d22fb8 + Monotone-Parent: 9495d1f289e6a977a13ee774c20ad749628a99ac + Monotone-Revision: dd55b0862cf04b300528e65ce2245dd5ff05b730 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-09-14T20:50:41 + Monotone-Branch: ca.inverse.sogo + commit 7399f16a8588a49bcd47571f5906ccf237e06c2c Author: C Robert Date: Mon Sep 14 20:43:50 2009 +0000 @@ -63787,6 +75307,22 @@ M UI/WebServerResources/UIxListEditor.js M UI/WebServerResources/UIxMailEditor.js M UI/WebServerResources/UIxMailToSelection.js +commit 106e818d2e0948677011a7baa4916a17b83a1c0c +Merge: 4fc5be3 f31fc1c +Author: C Robert +Date: Fri Sep 11 19:27:11 2009 +0000 + + merge of '432ae5bfbc553377904f4af62eb75728fdd9ff07' + and 'b5fd6a81fe5f1b221278976163e751f500a6a90c' + + Monotone-Parent: 432ae5bfbc553377904f4af62eb75728fdd9ff07 + Monotone-Parent: b5fd6a81fe5f1b221278976163e751f500a6a90c + Monotone-Revision: bd7bfc7a8af12b0b27f7a5b9d7a313a298cd99fb + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-09-11T19:27:11 + Monotone-Branch: ca.inverse.sogo + commit 4fc5be37ca41b6d284dd58073c865ed8aeafed25 Author: Wolfgang Sourdeau Date: Fri Sep 11 15:09:32 2009 +0000 @@ -63993,6 +75529,22 @@ M UI/WebServerResources/generic.js M UI/WebServerResources/prototype.js M debian/sogo.overrides +commit b63b53fecdf211a07a8d74827d50c87e20379daf +Merge: a4d616d 91b2623 +Author: Francis Lachapelle +Date: Thu Sep 10 18:22:56 2009 +0000 + + merge of '0e8b1704a04c5c494b76cbc377b9d9075df6cb1a' + and '3665058235c9d303e295671add1811764b128816' + + Monotone-Parent: 0e8b1704a04c5c494b76cbc377b9d9075df6cb1a + Monotone-Parent: 3665058235c9d303e295671add1811764b128816 + Monotone-Revision: 4d711e074341810486c1842c6a345777cc3664bb + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-09-10T18:22:56 + Monotone-Branch: ca.inverse.sogo + commit 91b2623d6fea6be4a8680c8ed018910a4c392c2f Author: C Robert Date: Thu Sep 10 18:19:12 2009 +0000 @@ -64114,6 +75666,22 @@ Date: Thu Sep 10 13:38:56 2009 +0000 M ChangeLog M UI/Scheduler/UIxComponentEditor.m +commit b2789c005c9024c3ea33e86c20b875bcc84fe596 +Merge: 62e4148 8072316 +Author: C Robert +Date: Thu Sep 10 13:03:34 2009 +0000 + + merge of '40d996b280dc1152661e729288981bcbd446b344' + and '921b2ca3d3518b0f7304e14f0bfd8e3dd09e0054' + + Monotone-Parent: 40d996b280dc1152661e729288981bcbd446b344 + Monotone-Parent: 921b2ca3d3518b0f7304e14f0bfd8e3dd09e0054 + Monotone-Revision: dc5bdda4eee483eae805bffa6ff605e9995cd81d + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-09-10T13:03:34 + Monotone-Branch: ca.inverse.sogo + commit 62e41486c0bfacc7183a426821f2faf4b83f9dda Author: C Robert Date: Thu Sep 10 13:03:14 2009 +0000 @@ -64129,6 +75697,38 @@ Date: Thu Sep 10 13:03:14 2009 +0000 M debian/control +commit a4d616d19b9e639847f963f64cece3a18453c050 +Merge: 204dcd6 b2789c0 +Author: Francis Lachapelle +Date: Wed Sep 9 21:51:45 2009 +0000 + + merge of '5f06eea4bed0099215d8a10c86ab93337557a176' + and 'dc5bdda4eee483eae805bffa6ff605e9995cd81d' + + Monotone-Parent: 5f06eea4bed0099215d8a10c86ab93337557a176 + Monotone-Parent: dc5bdda4eee483eae805bffa6ff605e9995cd81d + Monotone-Revision: 0e8b1704a04c5c494b76cbc377b9d9075df6cb1a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-09-09T21:51:45 + Monotone-Branch: ca.inverse.sogo + +commit 807231629a05fc4fc27be3457e0cc446dce31e05 +Merge: f4fabba 6a4dd19 +Author: Wolfgang Sourdeau +Date: Wed Sep 9 17:35:44 2009 +0000 + + merge of '2ca761e2d40488480678e105a10bfe240b9c689c' + and 'edd72b1e960245b7bca420619b28446ba3ce513b' + + Monotone-Parent: 2ca761e2d40488480678e105a10bfe240b9c689c + Monotone-Parent: edd72b1e960245b7bca420619b28446ba3ce513b + Monotone-Revision: 921b2ca3d3518b0f7304e14f0bfd8e3dd09e0054 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-09-09T17:35:44 + Monotone-Branch: ca.inverse.sogo + commit 6a4dd19e85f92a462dbbd11c39ad95f4db50d983 Author: Wolfgang Sourdeau Date: Wed Sep 9 17:35:03 2009 +0000 @@ -64144,6 +75744,22 @@ M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m M SoObjects/SOGo/SOGoUser.m +commit 204dcd6e7a895844f3e72df6777c4288a0218ad4 +Merge: c543b9e ae8211e +Author: Francis Lachapelle +Date: Wed Sep 9 15:53:41 2009 +0000 + + merge of 'd124c012f70febcfcbb9a2b5d4f3a20a7a001d7a' + and 'dc27f9e63f17e21dca5f0eca9226336de591e299' + + Monotone-Parent: d124c012f70febcfcbb9a2b5d4f3a20a7a001d7a + Monotone-Parent: dc27f9e63f17e21dca5f0eca9226336de591e299 + Monotone-Revision: 5f06eea4bed0099215d8a10c86ab93337557a176 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-09-09T15:53:41 + Monotone-Branch: ca.inverse.sogo + commit f4fabba6b900b14d53672e4d728b14a584daa88a Author: C Robert Date: Wed Sep 9 15:30:22 2009 +0000 @@ -64255,6 +75871,22 @@ M UI/WebServerResources/UIxContactsUserFolders.css M UI/WebServerResources/UIxContactsUserFolders.js M UI/WebServerResources/generic.js +commit 1bd01c2ce09932ee497388b53910a7b8b46deabf +Merge: 083f6fa 2d70be8 +Author: C Robert +Date: Fri Sep 4 19:31:59 2009 +0000 + + merge of '580c60138894e89e690be96ec87dcf17034ebbc8' + and 'cd47285793879adfc070a9c4d18ddeff85722b7f' + + Monotone-Parent: 580c60138894e89e690be96ec87dcf17034ebbc8 + Monotone-Parent: cd47285793879adfc070a9c4d18ddeff85722b7f + Monotone-Revision: 23831e953238f691f5c6c210b4ddec5d7aee5aec + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-09-04T19:31:59 + Monotone-Branch: ca.inverse.sogo + commit 2d70be8981fa1aa6ca4fb3f28e2e2d7c0816a33a Author: C Robert Date: Fri Sep 4 19:31:38 2009 +0000 @@ -64656,6 +76288,22 @@ M UI/WebServerResources/MailerUI.js M UI/WebServerResources/UIxContactsUserFolders.js M UI/WebServerResources/dtree.js +commit ad7a9f27e71be37e11c37ba0e37a8ba67b71f76c +Merge: d416156 06b296d +Author: Wolfgang Sourdeau +Date: Thu Aug 27 21:15:39 2009 +0000 + + merge of '4a2351cfd0ee0b84e1abe4b32284c6d363471ef3' + and 'f5b8996b9296ee950ea712c8de2c37e474163519' + + Monotone-Parent: 4a2351cfd0ee0b84e1abe4b32284c6d363471ef3 + Monotone-Parent: f5b8996b9296ee950ea712c8de2c37e474163519 + Monotone-Revision: 42546d8b4fa35f6a7815d1398a17f302007d272d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-27T21:15:39 + Monotone-Branch: ca.inverse.sogo + commit 06b296ddbad8c46af4159b16458362f2b23de90d Author: Wolfgang Sourdeau Date: Thu Aug 27 21:14:54 2009 +0000 @@ -65344,6 +76992,38 @@ M ChangeLog A SoObjects/Appointments/SOGoAptMailReceipt.h A SoObjects/Appointments/SOGoAptMailReceipt.m +commit 5dec3b0c7c0f7d7a19b8846b645b01b25f5934a7 +Merge: 669e48b 655d7ac +Author: Francis Lachapelle +Date: Tue Aug 25 06:55:34 2009 +0000 + + merge of '30348f77456e478212615701c8fefcf7bca6d8c7' + and 'aef1019c7301247713eb09de3ac3db5bad7bd607' + + Monotone-Parent: 30348f77456e478212615701c8fefcf7bca6d8c7 + Monotone-Parent: aef1019c7301247713eb09de3ac3db5bad7bd607 + Monotone-Revision: 3c0ee7a5e6c3b55080de52b9f49fb1e40b652fae + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-25T06:55:34 + Monotone-Branch: ca.inverse.sogo + +commit 669e48b8e391e1ebd475e08eacd77867a1a6da4d +Merge: 9126a62 1486216 +Author: Wolfgang Sourdeau +Date: Tue Aug 25 21:28:55 2009 +0000 + + merge of '8795a814c4d6589297d2b23d6a67cf1981228e11' + and 'f04c25f5f8bfb6f1876bab3f70b89ee5c99bcc01' + + Monotone-Parent: 8795a814c4d6589297d2b23d6a67cf1981228e11 + Monotone-Parent: f04c25f5f8bfb6f1876bab3f70b89ee5c99bcc01 + Monotone-Revision: 30348f77456e478212615701c8fefcf7bca6d8c7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-25T21:28:55 + Monotone-Branch: ca.inverse.sogo + commit 1486216b0c25dea64650087d94f808d7ab90f2c9 Author: Wolfgang Sourdeau Date: Tue Aug 25 21:28:24 2009 +0000 @@ -65607,6 +77287,22 @@ Date: Mon Aug 24 19:40:29 2009 +0000 M UI/MailerUI/UIxMailMainFrame.m +commit 99bd149b3bc6d510bca0603e35aa4e458568d253 +Merge: 658afee 1c7e5b8 +Author: Francis Lachapelle +Date: Wed Aug 19 07:17:12 2009 +0000 + + merge of 'bc3bfc52f8785d114d335b22f794ece898dbd164' + and 'de4013a540009902497a1085be5975e4ff6c3a83' + + Monotone-Parent: bc3bfc52f8785d114d335b22f794ece898dbd164 + Monotone-Parent: de4013a540009902497a1085be5975e4ff6c3a83 + Monotone-Revision: cd1bb1e892161fcc358630fd5cf9f3c3511c886f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-19T07:17:12 + Monotone-Branch: ca.inverse.sogo + commit 1c7e5b8680e4ae39137cf35062275eaec8bfacad Author: C Robert Date: Fri Aug 21 17:41:52 2009 +0000 @@ -65707,6 +77403,22 @@ M SoObjects/SOGo/SOGoUser.m M UI/PreferencesUI/UIxPreferences.m M UI/WebServerResources/UIxMailEditor.js +commit 5da3373d1e336f30760d313008031715b7ea06a7 +Merge: f4e1c30 486d69f +Author: Wolfgang Sourdeau +Date: Thu Aug 20 20:07:08 2009 +0000 + + merge of '4eec48b0737f46c7d29a611b8aacf7df08d809fb' + and 'd7d88aba2043056ef5f8c9a2b7f5e77653ee01f7' + + Monotone-Parent: 4eec48b0737f46c7d29a611b8aacf7df08d809fb + Monotone-Parent: d7d88aba2043056ef5f8c9a2b7f5e77653ee01f7 + Monotone-Revision: fd4f04fce6a66b3dc14b58f9b67f93c6af6d450a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-20T20:07:08 + Monotone-Branch: ca.inverse.sogo + commit 486d69f331936297220f2301d391827883652518 Author: Wolfgang Sourdeau Date: Thu Aug 20 20:06:43 2009 +0000 @@ -65945,6 +77657,22 @@ Date: Wed Aug 19 20:04:59 2009 +0000 M UI/WebServerResources/flag-col.png +commit 32e80f39032cfdecce7912856d370881565daea2 +Merge: bcc6384 1eeea5b +Author: C Robert +Date: Wed Aug 19 20:04:38 2009 +0000 + + merge of '1720cf251b5e03b7d77aadbba2e8a9b52b80ce5a' + and '7c984206f0f8720225b0539588bf187498c7ca04' + + Monotone-Parent: 1720cf251b5e03b7d77aadbba2e8a9b52b80ce5a + Monotone-Parent: 7c984206f0f8720225b0539588bf187498c7ca04 + Monotone-Revision: fbeef1c7f78a5c59c02f565b96c5e2cfe2e6b18b + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-08-19T20:04:38 + Monotone-Branch: ca.inverse.sogo + commit 1eeea5b7008e20204b16bff49aaf4cd16f22e64e Author: Ludovic Marcotte Date: Wed Aug 19 19:52:42 2009 +0000 @@ -66104,6 +77832,22 @@ Date: Tue Aug 18 18:23:13 2009 +0000 M UI/WebServerResources/SchedulerUI.js +commit 01416af35170916e5cd5e1380c2c1fef4c78f7a2 +Merge: 1ae7e9d 11d5455 +Author: Francis Lachapelle +Date: Tue Aug 18 01:56:12 2009 +0000 + + merge of '973efc6b7800601981d13f7968d2b1ff1e7e5858' + and 'fc29c1b763c506067039095b47f73dfd6301f0e2' + + Monotone-Parent: 973efc6b7800601981d13f7968d2b1ff1e7e5858 + Monotone-Parent: fc29c1b763c506067039095b47f73dfd6301f0e2 + Monotone-Revision: e7b81958c4674e9abdea432ddd234af617b11eda + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-18T01:56:12 + Monotone-Branch: ca.inverse.sogo + commit 11d5455737c73506901430442162d3db1c7b4ad2 Author: C Robert Date: Tue Aug 18 17:41:14 2009 +0000 @@ -66120,6 +77864,22 @@ Date: Tue Aug 18 17:41:14 2009 +0000 M debian/control M debian/rules +commit b7e5eef86fc1d732e970e6cdfe7fea9384970136 +Merge: 7885aa1 1652ba8 +Author: Wolfgang Sourdeau +Date: Tue Aug 18 17:37:04 2009 +0000 + + merge of 'b5a68a922e7dfe7ff0ee88a40ce86bf257337314' + and 'c0ba6ea9411e86e50582cdd4036256776349b556' + + Monotone-Parent: b5a68a922e7dfe7ff0ee88a40ce86bf257337314 + Monotone-Parent: c0ba6ea9411e86e50582cdd4036256776349b556 + Monotone-Revision: 2c8266b41b53ae4ece560d6f611a57376986383a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-18T17:37:04 + Monotone-Branch: ca.inverse.sogo + commit 1652ba8c0bb1d02de50348252370fc01487ce41c Author: Wolfgang Sourdeau Date: Tue Aug 18 17:36:20 2009 +0000 @@ -66231,6 +77991,25 @@ Date: Tue Aug 18 16:52:52 2009 +0000 M Documentation/SOGo Installation Guide.odt +commit 231e5253c88e25099742554dfc96d82165c3a39d +Merge: a22876a 8a6457e +Author: Francis Lachapelle +Date: Tue Aug 18 01:06:24 2009 +0000 + + merge of '7238e3a0d03138ec5ff31751dee6c1f8d162b693' + and 'b0b741447cee83cc3c6abb1efe8e10d41ca9b746' + + Monotone-Parent: 7238e3a0d03138ec5ff31751dee6c1f8d162b693 + Monotone-Parent: b0b741447cee83cc3c6abb1efe8e10d41ca9b746 + Monotone-Revision: d7d1c2dca6201480a29c35b33a4b32fbfac9af55 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-08-18T01:06:24 + Monotone-Date: 2009-08-18T16:52:26 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit 8a6457e30c39315793a2222079ada06dda9c8aec Author: C Robert Date: Tue Aug 18 16:27:28 2009 +0000 @@ -66248,6 +78027,25 @@ M UI/Templates/UIxPageFrame.wox A UI/WebServerResources/XMLHttpRequest.js M UI/WebServerResources/generic.js +commit a22876a72e87b9d45bae2ba60bd15e918de8f6fc +Merge: d09c9cd 25a7357 +Author: Francis Lachapelle +Date: Tue Aug 18 01:06:23 2009 +0000 + + merge of '0c53de1af9568d623ce0caee5e1b914df12b40bb' + and '3015b169187acab527747642b2900806a48dbe60' + + Monotone-Parent: 0c53de1af9568d623ce0caee5e1b914df12b40bb + Monotone-Parent: 3015b169187acab527747642b2900806a48dbe60 + Monotone-Revision: 7238e3a0d03138ec5ff31751dee6c1f8d162b693 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-08-18T01:06:23 + Monotone-Date: 2009-08-18T16:52:24 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit d09c9cd6050d2c5ec4ce998ecb6251b657779ec4 Author: Francis Lachapelle Date: Tue Aug 18 01:05:46 2009 +0000 @@ -66321,6 +78119,38 @@ M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/UIxCalendarProperties.css M UI/WebServerResources/UIxCalendarProperties.js +commit ee2ebd206d64438a7c0773ea164854b050520047 +Merge: e99cb37 3687660 +Author: Francis Lachapelle +Date: Mon Aug 17 22:41:31 2009 +0000 + + merge of '81b84aa1dccb31c15c94976cc8ed486e6a1efd9a' + and 'afa8a9fe095d6de052bd0ce6faa3412737247666' + + Monotone-Parent: 81b84aa1dccb31c15c94976cc8ed486e6a1efd9a + Monotone-Parent: afa8a9fe095d6de052bd0ce6faa3412737247666 + Monotone-Revision: 6eda087f6dba9f0f98b63f259880cf2d343835d5 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-17T22:41:31 + Monotone-Branch: ca.inverse.sogo + +commit e99cb37de3c7579207da7d98a9416f52917d3c44 +Merge: 0444386 be7be5b +Author: Francis Lachapelle +Date: Mon Aug 17 21:33:55 2009 +0000 + + merge of '45aca387e14de293ad62e303a3c8c06620805e6c' + and '9cbe6e6f1780024d4dcb37d4ce3de593f9c91828' + + Monotone-Parent: 45aca387e14de293ad62e303a3c8c06620805e6c + Monotone-Parent: 9cbe6e6f1780024d4dcb37d4ce3de593f9c91828 + Monotone-Revision: 81b84aa1dccb31c15c94976cc8ed486e6a1efd9a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-17T21:33:55 + Monotone-Branch: ca.inverse.sogo + commit be7be5bc938868064edbee9dc2981e267b291ee4 Author: C Robert Date: Mon Aug 17 20:34:18 2009 +0000 @@ -66386,6 +78216,22 @@ Date: Thu Aug 13 19:09:16 2009 +0000 M UI/WebServerResources/AdministrationUI.js +commit bd2246bdbe824f3960f527d7259f74d7ba752d61 +Merge: 6f2f5b0 93b569a +Author: Francis Lachapelle +Date: Thu Aug 13 14:32:01 2009 +0000 + + merge of '83ce5dcf2ff56b688fb6c8b0b1128b665111170a' + and 'cd7b1310c287fec8f03fa7a5432b1fc774378ea1' + + Monotone-Parent: 83ce5dcf2ff56b688fb6c8b0b1128b665111170a + Monotone-Parent: cd7b1310c287fec8f03fa7a5432b1fc774378ea1 + Monotone-Revision: b618e1688ed06827d0300b85ed2a93ae6a4930fe + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-13T14:32:01 + Monotone-Branch: ca.inverse.sogo + commit 93b569ab9ad74b69c1f6e897b78542257b914f52 Author: Ludovic Marcotte Date: Mon Aug 17 09:48:04 2009 +0000 @@ -66435,6 +78281,22 @@ Date: Thu Aug 13 14:09:53 2009 +0000 A UI/Templates/AdministrationUI/UIxAdministration.wox A UI/Templates/AdministrationUI/UIxAdministrationFilterPanel.wox +commit ae79668b1d81764068f1358e6f4387be36246a13 +Merge: bd43877 2fd167b +Author: Wolfgang Sourdeau +Date: Fri Aug 14 19:18:20 2009 +0000 + + merge of '97bd3b4f7ef7920ded0314bd1d5eadce2a2af62a' + and 'e43e6e313ceb0162bb60e87d3316e25f02875be4' + + Monotone-Parent: 97bd3b4f7ef7920ded0314bd1d5eadce2a2af62a + Monotone-Parent: e43e6e313ceb0162bb60e87d3316e25f02875be4 + Monotone-Revision: 29f51b2d5e324b7999ae51b3eb6485059497cdb3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-14T19:18:20 + Monotone-Branch: ca.inverse.sogo + commit bd43877c6bab696181bea2153ea19dcfbcd1baa6 Author: Wolfgang Sourdeau Date: Fri Aug 14 19:17:53 2009 +0000 @@ -66488,6 +78350,22 @@ Date: Fri Aug 14 15:17:58 2009 +0000 M Tools/GNUmakefile.preamble +commit 3b270cda013992d7bdf6a61bd0be715624905f34 +Merge: 87b0e27 31a647b +Author: Wolfgang Sourdeau +Date: Fri Aug 14 15:05:06 2009 +0000 + + merge of '5253a478333e1c7fb21c61abd4592b1f92a0c899' + and '831abd52d51297f3a0de88978cf6abeda7fad46c' + + Monotone-Parent: 5253a478333e1c7fb21c61abd4592b1f92a0c899 + Monotone-Parent: 831abd52d51297f3a0de88978cf6abeda7fad46c + Monotone-Revision: 8fd2ccda774229842a01a4095b96f10a9511ede4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-14T15:05:06 + Monotone-Branch: ca.inverse.sogo + commit 31a647b19497ac0e4a8efd3e9b087b5db3e9dc68 Author: Wolfgang Sourdeau Date: Fri Aug 14 14:57:05 2009 +0000 @@ -66645,6 +78523,22 @@ D Tools/sogo-contacts-checkdoubles.m D Tools/sogo-contacts-removedoubles.m A Tools/sogo-tool.m +commit 2fd167beb020dc313e0e68ef737c2549a856eeff +Merge: 584c3ca c868274 +Author: Francis Lachapelle +Date: Thu Aug 13 10:44:18 2009 +0000 + + merge of '1cab635a2c57c6953c8a393b67f593bdaccb43b9' + and '1e80eeeca87a58cdd799df8c0a9561f4e0e692b7' + + Monotone-Parent: 1cab635a2c57c6953c8a393b67f593bdaccb43b9 + Monotone-Parent: 1e80eeeca87a58cdd799df8c0a9561f4e0e692b7 + Monotone-Revision: e43e6e313ceb0162bb60e87d3316e25f02875be4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-13T10:44:18 + Monotone-Branch: ca.inverse.sogo + commit c868274fe04873003816e25c97450bedb9c6f649 Author: Francis Lachapelle Date: Thu Aug 13 10:43:18 2009 +0000 @@ -66700,6 +78594,22 @@ M UI/MainUI/SOGoUserHomePage.m M UI/Templates/UIxPageFrame.wox M UI/WebServerResources/SOGoDragHandles.js +commit 87b0e27193a98710e1789c3fadd8db3154be20c5 +Merge: 70898b2 990f026 +Author: Francis Lachapelle +Date: Thu Aug 13 06:46:49 2009 +0000 + + merge of '98e35c999db27e9159edf91d2c17f8b5bc742330' + and 'c8a13e58e7ce73cd9924b4567998c6246b793672' + + Monotone-Parent: 98e35c999db27e9159edf91d2c17f8b5bc742330 + Monotone-Parent: c8a13e58e7ce73cd9924b4567998c6246b793672 + Monotone-Revision: 5253a478333e1c7fb21c61abd4592b1f92a0c899 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-13T06:46:49 + Monotone-Branch: ca.inverse.sogo + commit 990f0260ea52ec838f7daf20bd0b8102b2d0ff76 Author: Francis Lachapelle Date: Thu Aug 13 03:17:38 2009 +0000 @@ -66745,6 +78655,22 @@ Date: Wed Aug 12 18:33:13 2009 +0000 M NEWS +commit 5a671abd4e4e93654ba0ec2a3537c7c71bb447ae +Merge: 8374b07 90fbbd2 +Author: Ludovic Marcotte +Date: Wed Aug 12 18:32:06 2009 +0000 + + merge of '30b17f8b132aabf466920f5741c98449cf90b643' + and 'bc6ce04250c2cbad21bdc2d1f485e5a659478282' + + Monotone-Parent: 30b17f8b132aabf466920f5741c98449cf90b643 + Monotone-Parent: bc6ce04250c2cbad21bdc2d1f485e5a659478282 + Monotone-Revision: 7160d34efc971b66d2814d542e0ba0d577a8bcd6 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-08-12T18:32:06 + Monotone-Branch: ca.inverse.sogo + commit 90fbbd211c34c8b619712836f9d2c5ed024a972a Author: Wolfgang Sourdeau Date: Wed Aug 12 19:03:04 2009 +0000 @@ -66817,6 +78743,39 @@ A debian/sogo.logrotate A debian/sogo.overrides A debian/sogo.preinst +commit 6716bb6b8f592d1ff0a3664ea0daf9b3e9f0abe4 +Merge: e196a06 d78b051 +Author: Francis Lachapelle +Date: Wed Aug 12 16:32:39 2009 +0000 + + merge of '6c5400ad876892d2492cc0fc30b4cfb3561245f0' + and 'dbb2faa4ece00785610d1dc432ae7e76a17f8961' + + Monotone-Parent: 6c5400ad876892d2492cc0fc30b4cfb3561245f0 + Monotone-Parent: dbb2faa4ece00785610d1dc432ae7e76a17f8961 + Monotone-Revision: bea77de1f9abc0ecf4b75dd637ecb87af1981845 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-12T16:32:39 + Monotone-Branch: ca.inverse.sogo + Monotone-Tag: SOGo_v1.0.4 + +commit d78b0516aab14aea075d84dbd6be2e927059265f +Merge: 73c603c c2d9a2e +Author: Wolfgang Sourdeau +Date: Wed Aug 12 16:32:14 2009 +0000 + + merge of '0044cf5f6592a131133f84f76e539a47a7d8f64a' + and '87d1d936dba4536ea960f1ec23222ecd8c906d10' + + Monotone-Parent: 0044cf5f6592a131133f84f76e539a47a7d8f64a + Monotone-Parent: 87d1d936dba4536ea960f1ec23222ecd8c906d10 + Monotone-Revision: dbb2faa4ece00785610d1dc432ae7e76a17f8961 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-12T16:32:14 + Monotone-Branch: ca.inverse.sogo + commit c2d9a2ea344a60c0722498163f1cf427a923b0ba Author: Wolfgang Sourdeau Date: Wed Aug 12 16:32:01 2009 +0000 @@ -66830,6 +78789,22 @@ Date: Wed Aug 12 16:32:01 2009 +0000 M debian/sogo.prerm +commit e196a0617bcf98d1bf5ec7e787c92028f0f11a3a +Merge: 73c603c 8b9042d +Author: Francis Lachapelle +Date: Wed Aug 12 16:31:38 2009 +0000 + + merge of '0044cf5f6592a131133f84f76e539a47a7d8f64a' + and 'e36cbb9da53308642513123a9831ab22030eca9f' + + Monotone-Parent: 0044cf5f6592a131133f84f76e539a47a7d8f64a + Monotone-Parent: e36cbb9da53308642513123a9831ab22030eca9f + Monotone-Revision: 6c5400ad876892d2492cc0fc30b4cfb3561245f0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-12T16:31:38 + Monotone-Branch: ca.inverse.sogo + commit 73c603cb2a9385e0dd96160673d6537df477b4ef Author: Francis Lachapelle Date: Wed Aug 12 16:28:54 2009 +0000 @@ -66900,6 +78875,25 @@ Date: Wed Aug 12 15:18:07 2009 +0000 M ChangeLog M UI/MainUI/Version +commit 7bf21e3dc168fbcd6f1eebc55dc2a5857296fe51 +Merge: e4999b8 aab012e +Author: Francis Lachapelle +Date: Wed Aug 12 14:22:38 2009 +0000 + + merge of '0e58e513a89ec890f9064334253d81189c9b4b77' + and '64564dd4ca1852af3441d98e355837a9511444c6' + + Monotone-Parent: 0e58e513a89ec890f9064334253d81189c9b4b77 + Monotone-Parent: 64564dd4ca1852af3441d98e355837a9511444c6 + Monotone-Revision: b73c9a8e960042141668dfb6cc60ef8926fd189a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-12T14:22:38 + Monotone-Date: 2009-08-12T15:14:21 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit e4999b857b5321e8f3a270e5c068eea90b682b56 Author: Francis Lachapelle Date: Wed Aug 12 14:13:54 2009 +0000 @@ -67014,6 +79008,22 @@ Date: Tue Aug 11 17:31:05 2009 +0000 M NEWS +commit 698a8e955a4024ea244b982dd431d701369137cc +Merge: 72f16ae ee3f45e +Author: Wolfgang Sourdeau +Date: Tue Aug 11 17:30:49 2009 +0000 + + merge of '49622a78cc682f73b0d14c2e5e0ba8cc5ddbdc89' + and '6dba4565cf1a4808254012e5e6299fe143f884f5' + + Monotone-Parent: 49622a78cc682f73b0d14c2e5e0ba8cc5ddbdc89 + Monotone-Parent: 6dba4565cf1a4808254012e5e6299fe143f884f5 + Monotone-Revision: 7a113f7bea732d33ac70591602ece2a138aee9b3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-11T17:30:49 + Monotone-Branch: ca.inverse.sogo + commit ee3f45e0df2af0bd154ebae9f1bbf780b0c65220 Author: Wolfgang Sourdeau Date: Tue Aug 11 16:52:10 2009 +0000 @@ -67436,6 +79446,22 @@ Date: Fri Aug 7 17:40:57 2009 +0000 M Tests/test-davacl.py +commit a23ab48820aa3d4d536c7c5e474d5c3a482e029f +Merge: a8a3246 c7513e3 +Author: Wolfgang Sourdeau +Date: Fri Aug 7 17:35:38 2009 +0000 + + merge of '22327124753059b633156bc954cc02084275bce4' + and '424fe05c145a975ee16eb60cf1c50dda3ff5e588' + + Monotone-Parent: 22327124753059b633156bc954cc02084275bce4 + Monotone-Parent: 424fe05c145a975ee16eb60cf1c50dda3ff5e588 + Monotone-Revision: 15cfd78a03a492815ed414c938dc732ee440dedb + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-07T17:35:38 + Monotone-Branch: ca.inverse.sogo + commit c7513e338dd81c85e0aee8b326ebae3987a13610 Author: Wolfgang Sourdeau Date: Fri Aug 7 17:35:15 2009 +0000 @@ -67450,6 +79476,22 @@ Date: Fri Aug 7 17:35:15 2009 +0000 M ChangeLog M Tests/test-davacl.py +commit a8a32461d4f96c0bdddba5e438e875808fa7f12b +Merge: d5efec6 41f230c +Author: Francis Lachapelle +Date: Fri Aug 7 16:02:14 2009 +0000 + + merge of '6eb182232c54958d95899ac372dfe954dcc1b9f4' + and 'b187467dece23f6eb8bf6fef314b1cf1ca22eaec' + + Monotone-Parent: 6eb182232c54958d95899ac372dfe954dcc1b9f4 + Monotone-Parent: b187467dece23f6eb8bf6fef314b1cf1ca22eaec + Monotone-Revision: 22327124753059b633156bc954cc02084275bce4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-07T16:02:14 + Monotone-Branch: ca.inverse.sogo + commit 41f230c6b2d8eb1e4c1d5291a7f58dbc82f11960 Author: Francis Lachapelle Date: Fri Aug 7 16:01:14 2009 +0000 @@ -67483,6 +79525,22 @@ Date: Fri Aug 7 15:55:15 2009 +0000 M Tests/all.py +commit d5efec6e728f4d28ea44f35be6f91b06ef3a8bfc +Merge: f6baff6 395f584 +Author: Wolfgang Sourdeau +Date: Fri Aug 7 15:40:42 2009 +0000 + + merge of '087438694b433e2d312278234d9a1776d302326f' + and '6c5c0cfc38476abab3bbd81d781d653717c5be6d' + + Monotone-Parent: 087438694b433e2d312278234d9a1776d302326f + Monotone-Parent: 6c5c0cfc38476abab3bbd81d781d653717c5be6d + Monotone-Revision: 6eb182232c54958d95899ac372dfe954dcc1b9f4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-07T15:40:42 + Monotone-Branch: ca.inverse.sogo + commit 395f584db75d71aad550347a3432d7ee9f7b55e2 Author: Wolfgang Sourdeau Date: Fri Aug 7 15:40:03 2009 +0000 @@ -67519,6 +79577,22 @@ Date: Fri Aug 7 15:21:14 2009 +0000 M UI/WebServerResources/UIxAppointmentEditor.js +commit f6baff69f8c04f408682105d4c4d7c7aabda6dc1 +Merge: 19f5d50 2f3758e +Author: Ludovic Marcotte +Date: Fri Aug 7 09:32:44 2009 +0000 + + merge of '65d93d27a238a5e86f0c7bc9fd3cbc658d5ee681' + and '7fdf5019b42b8f7abfe4265a47d3175189493e24' + + Monotone-Parent: 65d93d27a238a5e86f0c7bc9fd3cbc658d5ee681 + Monotone-Parent: 7fdf5019b42b8f7abfe4265a47d3175189493e24 + Monotone-Revision: 087438694b433e2d312278234d9a1776d302326f + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-08-07T09:32:44 + Monotone-Branch: ca.inverse.sogo + commit 2f3758efa6a8ccacfa6ddbd4103b369128e2d45a Author: Francis Lachapelle Date: Thu Aug 6 22:03:58 2009 +0000 @@ -67580,6 +79654,22 @@ Date: Thu Aug 6 21:38:41 2009 +0000 M Tests/README +commit ee1e2a3f7df27a3f973dc778726790f4d78a5f58 +Merge: d0f60f9 888d078 +Author: Francis Lachapelle +Date: Thu Aug 6 21:22:45 2009 +0000 + + merge of '8ba93fdae75ee545af159a1b88dfb6faccbe7bc2' + and 'f14da511e49cf36d5c6f6a7d9fe1aed0eeda1c79' + + Monotone-Parent: 8ba93fdae75ee545af159a1b88dfb6faccbe7bc2 + Monotone-Parent: f14da511e49cf36d5c6f6a7d9fe1aed0eeda1c79 + Monotone-Revision: a1e57050a74f60b51f4353a56736984146736973 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-06T21:22:45 + Monotone-Branch: ca.inverse.sogo + commit d0f60f9e9301373b1914d13181c6ea228f1a823d Author: Francis Lachapelle Date: Thu Aug 6 21:22:11 2009 +0000 @@ -67650,6 +79740,22 @@ Date: Thu Aug 6 19:21:10 2009 +0000 M ChangeLog M Tests/webdavlib.py +commit 7895f290c97cfa51b3f1b617cf5bdfdc059ea9c5 +Merge: cf7b984 c3ff1d6 +Author: Wolfgang Sourdeau +Date: Thu Aug 6 19:19:32 2009 +0000 + + merge of '977a2fc6635839b5595a2518bac96d0260c9b3da' + and '997781056d484980738b11e151b8156a66f0998b' + + Monotone-Parent: 977a2fc6635839b5595a2518bac96d0260c9b3da + Monotone-Parent: 997781056d484980738b11e151b8156a66f0998b + Monotone-Revision: f0967567767bc3e201a892b9a9fc17de9c47f0a1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-06T19:19:32 + Monotone-Branch: ca.inverse.sogo + commit cf7b984ad7d5d9f2507d8674a13ca1c5fa1e6b88 Author: Wolfgang Sourdeau Date: Thu Aug 6 19:18:51 2009 +0000 @@ -67707,6 +79813,22 @@ Date: Thu Aug 6 18:51:58 2009 +0000 M UI/WebServerResources/ckeditor/_source/core/_bootstrap.js +commit 927575dc9d6814a150ad71907d734ea4c9d6a1e6 +Merge: 0ee22d9 e94b025 +Author: Francis Lachapelle +Date: Thu Aug 6 14:37:53 2009 +0000 + + merge of 'a0d0b11a9d09b6e2a4c1105454c00cca7c853ac5' + and 'd35569adb5f95d077a2e359cae7af87c6ba720d1' + + Monotone-Parent: a0d0b11a9d09b6e2a4c1105454c00cca7c853ac5 + Monotone-Parent: d35569adb5f95d077a2e359cae7af87c6ba720d1 + Monotone-Revision: 2ae443d1e9e3ef66ebb42cbba16fc86deb005615 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-06T14:37:53 + Monotone-Branch: ca.inverse.sogo + commit c8e3996fee3fb3e1eb07c8da3c2b1a0d67c9e1df Author: Wolfgang Sourdeau Date: Wed Aug 5 16:44:50 2009 +0000 @@ -67778,6 +79900,38 @@ A Tests/testconfig.py.in A Tests/webdav-sync.py A Tests/webdavlib.py +commit d6bb70c29c76fcf3863f91f21454075c56ad1347 +Merge: b2638c1 689f10d +Author: Wolfgang Sourdeau +Date: Wed Aug 5 15:20:08 2009 +0000 + + merge of 'a5d8a3ec1f85f1e3b6704040be5e3e1e48a905d0' + and 'a8c64d14750befd92b3c27234b3603d4a6f894c9' + + Monotone-Parent: a5d8a3ec1f85f1e3b6704040be5e3e1e48a905d0 + Monotone-Parent: a8c64d14750befd92b3c27234b3603d4a6f894c9 + Monotone-Revision: 11e7712d6d915167dfc15be7f67ab23f7f9e7cc7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-05T15:20:08 + Monotone-Branch: ca.inverse.sogo + +commit 689f10d8ad741ada8484410a94e0177f20513d31 +Merge: b1b8ce2 e2dd875 +Author: Wolfgang Sourdeau +Date: Wed Aug 5 15:19:08 2009 +0000 + + merge of '4ac197b200da843253c472d28004ce7d849b7299' + and '64703eddf193d3b0fa0bcca0b336e5a68d8a1256' + + Monotone-Parent: 4ac197b200da843253c472d28004ce7d849b7299 + Monotone-Parent: 64703eddf193d3b0fa0bcca0b336e5a68d8a1256 + Monotone-Revision: a8c64d14750befd92b3c27234b3603d4a6f894c9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-08-05T15:19:08 + Monotone-Branch: ca.inverse.sogo + commit b1b8ce2aa313bd0b878b03fa041268000178bd9f Author: Wolfgang Sourdeau Date: Wed Aug 5 15:19:01 2009 +0000 @@ -67910,6 +80064,22 @@ Date: Tue Aug 4 15:42:02 2009 +0000 M UI/WebServerResources/UIxMailEditor.js +commit b792ebcd3da8c3b7dc72d7e0948efb92d0760235 +Merge: f3be199 9e71e5e +Author: Francis Lachapelle +Date: Tue Aug 4 13:09:25 2009 +0000 + + merge of '76398ce8225fa84ac8374a71833feefd637f4353' + and 'f36a1e49c67549ae0dd10c6f3aede630507c8a19' + + Monotone-Parent: 76398ce8225fa84ac8374a71833feefd637f4353 + Monotone-Parent: f36a1e49c67549ae0dd10c6f3aede630507c8a19 + Monotone-Revision: 42e38d681c5b553626459ab2c9fc83fa9d65d3b0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-08-04T13:09:25 + Monotone-Branch: ca.inverse.sogo + commit f3be199fa336f641afd01af34bcce200daf9da41 Author: Francis Lachapelle Date: Tue Aug 4 13:07:30 2009 +0000 @@ -67984,6 +80154,22 @@ Date: Mon Aug 3 18:59:57 2009 +0000 M UI/WebServerResources/SchedulerUI.js +commit 9e71e5e57bc330128d2297eb307a8f95679b362f +Merge: f4fac23 f1df83e +Author: Ludovic Marcotte +Date: Mon Aug 3 18:14:10 2009 +0000 + + merge of '2212bb9a2c983d084ee30e6ffdefbb85028501b9' + and '740d7bf9e85e6faf504cb29387d81a224a6a92e9' + + Monotone-Parent: 2212bb9a2c983d084ee30e6ffdefbb85028501b9 + Monotone-Parent: 740d7bf9e85e6faf504cb29387d81a224a6a92e9 + Monotone-Revision: f36a1e49c67549ae0dd10c6f3aede630507c8a19 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-08-03T18:14:10 + Monotone-Branch: ca.inverse.sogo + commit f1df83e44c23822d35f4ac545d207f071d34de2e Author: Ludovic Marcotte Date: Mon Aug 3 15:46:02 2009 +0000 @@ -68369,6 +80555,22 @@ Date: Wed Jul 29 21:46:11 2009 +0000 M UI/WebServerResources/UIxAppointmentEditor.css +commit b3c7b6f4a78c55bed3bc7da54de217373f1321bd +Merge: 16a7bbc c4176bc +Author: Francis Lachapelle +Date: Wed Jul 29 20:50:19 2009 +0000 + + merge of '14aa5300641c43328c0f753870eaabd762151300' + and 'a64db0af208294bbcd6d4fc902d82ed61bcbc070' + + Monotone-Parent: 14aa5300641c43328c0f753870eaabd762151300 + Monotone-Parent: a64db0af208294bbcd6d4fc902d82ed61bcbc070 + Monotone-Revision: 863a2bf77ab81b7d1c3fc3135371ca8eab6a32f9 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-29T20:50:19 + Monotone-Branch: ca.inverse.sogo + commit c4176bc1739f180a07e346481abc9b879d2230cf Author: Francis Lachapelle Date: Wed Jul 29 20:47:56 2009 +0000 @@ -68425,6 +80627,22 @@ Date: Wed Jul 29 18:53:11 2009 +0000 M SOPE/sope-deb.diff +commit aaaa125ccaa1b2db766fe5361c58a916feb8642b +Merge: 1cc51af ec8b942 +Author: C Robert +Date: Wed Jul 29 18:49:21 2009 +0000 + + merge of '08f744da20c99e50446879fca5f5ee8194b2217b' + and '783f97bcf896d7f1f4a68b2bdb211c79e4383241' + + Monotone-Parent: 08f744da20c99e50446879fca5f5ee8194b2217b + Monotone-Parent: 783f97bcf896d7f1f4a68b2bdb211c79e4383241 + Monotone-Revision: c58fc8185274bae5a88c2fc98e49c56fb4e81878 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-29T18:49:21 + Monotone-Branch: ca.inverse.sogo + commit 1cc51af9efc202a2295ec7eb6b9c0ab005c7fd6b Author: Francis Lachapelle Date: Wed Jul 29 18:46:44 2009 +0000 @@ -68522,6 +80740,22 @@ Date: Wed Jul 29 15:52:43 2009 +0000 M ChangeLog M SoObjects/Contacts/SOGoContactGCSFolder.m +commit d2d010d913ed0e4d8748977aa10501e60defee22 +Merge: 17ee622 37a4b12 +Author: Francis Lachapelle +Date: Wed Jul 29 15:40:52 2009 +0000 + + merge of '1480ab87cd945c5b85d9c1f7282d0ab1267f37d0' + and '79cc22f9c2a49076ea278b33a8c3a3ac249d9b75' + + Monotone-Parent: 1480ab87cd945c5b85d9c1f7282d0ab1267f37d0 + Monotone-Parent: 79cc22f9c2a49076ea278b33a8c3a3ac249d9b75 + Monotone-Revision: 4114bd0be7d5fc4d73b57879b042ffab8c6a8d7f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-29T15:40:52 + Monotone-Branch: ca.inverse.sogo + commit 37a4b12fa6968d8fd064b7e157fa211e28941528 Author: C Robert Date: Wed Jul 29 14:47:14 2009 +0000 @@ -68580,6 +80814,22 @@ Date: Wed Jul 29 13:43:47 2009 +0000 M UI/WebServerResources/SchedulerUI.js +commit a39eef4f6479e3b76f5906bba76437fbbff8fad4 +Merge: e314556 ced2268 +Author: C Robert +Date: Wed Jul 29 13:12:24 2009 +0000 + + merge of 'dd15c9733b13187e5bb3c64144e52558efbdf42d' + and 'dea46a9c0a007139fa87fd98c606f1185523a535' + + Monotone-Parent: dd15c9733b13187e5bb3c64144e52558efbdf42d + Monotone-Parent: dea46a9c0a007139fa87fd98c606f1185523a535 + Monotone-Revision: 510caacd94dac9fc1a3fdf4240cc641a70be63d8 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-29T13:12:24 + Monotone-Branch: ca.inverse.sogo + commit ced2268aa511e4127f5b8761fd1949fe4b0677a4 Author: C Robert Date: Wed Jul 29 13:11:46 2009 +0000 @@ -68628,6 +80878,22 @@ Date: Tue Jul 28 20:17:58 2009 +0000 M UI/Templates/SchedulerUI/UIxCalDateSelector.wox +commit dee097622a8e2edbfe69635b01208cb612fa6ac2 +Merge: 2c91496 1a1b062 +Author: Francis Lachapelle +Date: Tue Jul 28 20:10:30 2009 +0000 + + merge of '7d3304b769784beb1122a7a8507098f0d966fc4d' + and 'cff25745ccc8bc7caca33ea99cd3b32e15d60a4e' + + Monotone-Parent: 7d3304b769784beb1122a7a8507098f0d966fc4d + Monotone-Parent: cff25745ccc8bc7caca33ea99cd3b32e15d60a4e + Monotone-Revision: 25ef4774f63414bacd7d7a784ee1c61d318f7003 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-28T20:10:30 + Monotone-Branch: ca.inverse.sogo + commit 1a1b062a04ce768886e2fb20e09f00e838721492 Author: Francis Lachapelle Date: Tue Jul 28 20:09:24 2009 +0000 @@ -68713,6 +80979,22 @@ Date: Tue Jul 28 18:36:06 2009 +0000 M UI/WebServerResources/HTMLElement.js M UI/WebServerResources/generic.js +commit 76d6f9a3983e06c2059186e72a5c70fa821d74e0 +Merge: e7788ac 734ca58 +Author: Ludovic Marcotte +Date: Mon Jul 27 22:30:11 2009 +0000 + + merge of '6b0d38e3817a056f1bb60d2484e9c2bc8bd02234' + and '9ff85942428355ba664fde2dedf6c8e3591248c3' + + Monotone-Parent: 6b0d38e3817a056f1bb60d2484e9c2bc8bd02234 + Monotone-Parent: 9ff85942428355ba664fde2dedf6c8e3591248c3 + Monotone-Revision: 0e5ecbd534de16df76709927dc37b1bc83801546 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-07-27T22:30:11 + Monotone-Branch: ca.inverse.sogo + commit e7788ac76ead7d679cbb1be73ab919ffe1f9b7d3 Author: Francis Lachapelle Date: Mon Jul 27 21:36:03 2009 +0000 @@ -68904,6 +81186,22 @@ Date: Thu Jul 23 18:21:11 2009 +0000 M SOPE/sope-patchset-r1660.diff +commit baf36979002b091e24a8dc2e9829c694132c2c5a +Merge: 178c887 b9e0d7c +Author: Wolfgang Sourdeau +Date: Thu Jul 23 17:43:31 2009 +0000 + + merge of '464a36a4cf8b5363c773454107f99d458238f9ad' + and '7a6e1fe27ab30ac91e4bde131ecca9500f2ddb87' + + Monotone-Parent: 464a36a4cf8b5363c773454107f99d458238f9ad + Monotone-Parent: 7a6e1fe27ab30ac91e4bde131ecca9500f2ddb87 + Monotone-Revision: 245edd2f1c6f124d2608cb323b7bf7660bb7583f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-07-23T17:43:31 + Monotone-Branch: ca.inverse.sogo + commit 178c887ca2a2f77c5291bf36b3ea2c8a68ab3471 Author: Wolfgang Sourdeau Date: Thu Jul 23 17:34:17 2009 +0000 @@ -68975,6 +81273,22 @@ Date: Thu Jul 23 13:57:35 2009 +0000 M UI/WebServerResources/SchedulerUI.css M UI/WebServerResources/SchedulerUI.js +commit 12580c442b2ddb327d7442153a0b8d2a838543d6 +Merge: c54dc99 350d187 +Author: C Robert +Date: Thu Jul 23 12:45:37 2009 +0000 + + merge of '40158dc91b545a299c42231ee687029a4bf2e718' + and 'a7b68a3656aaebe8e9a421997de4d311b04b9e13' + + Monotone-Parent: 40158dc91b545a299c42231ee687029a4bf2e718 + Monotone-Parent: a7b68a3656aaebe8e9a421997de4d311b04b9e13 + Monotone-Revision: ef30367c8b75538cf7607ce41aba7151c3667d37 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-23T12:45:37 + Monotone-Branch: ca.inverse.sogo + commit c54dc99d36f3d5a8a641761418a28da8bd3a195a Author: Wolfgang Sourdeau Date: Wed Jul 22 21:14:17 2009 +0000 @@ -69005,6 +81319,22 @@ M ChangeLog M UI/Scheduler/UIxCalListingActions.m M UI/WebServerResources/SchedulerUI.js +commit f3bc2e3259a99c86d5f5beb758bdb5dce68e64ec +Merge: f2e34f1 a0c1708 +Author: C Robert +Date: Wed Jul 22 19:33:04 2009 +0000 + + merge of '29a207ea9c97e43be0249c6ba94ebcb799650a1b' + and 'b601815254b395ef279eca302af8590015e1cc45' + + Monotone-Parent: 29a207ea9c97e43be0249c6ba94ebcb799650a1b + Monotone-Parent: b601815254b395ef279eca302af8590015e1cc45 + Monotone-Revision: 22cceb4aa0e1bdff4e6a5d3bae05737a180e6c86 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-22T19:33:04 + Monotone-Branch: ca.inverse.sogo + commit a2f64cb24799a9ff626735c0cf166d51d15895a9 Author: Wolfgang Sourdeau Date: Wed Jul 22 19:06:14 2009 +0000 @@ -69031,6 +81361,22 @@ Date: Wed Jul 22 18:47:46 2009 +0000 M UI/Scheduler/UIxCalListingActions.m +commit a0c170842ad7a53065f525bd3d0a062f94d7fc7a +Merge: 036496c 975cfe3 +Author: C Robert +Date: Wed Jul 22 18:47:43 2009 +0000 + + merge of '18a196ff2267018bcfe42ffec1c88757004fe621' + and 'd5c8f082c4cdd11904c2520fd1a85e71f588fa59' + + Monotone-Parent: 18a196ff2267018bcfe42ffec1c88757004fe621 + Monotone-Parent: d5c8f082c4cdd11904c2520fd1a85e71f588fa59 + Monotone-Revision: b601815254b395ef279eca302af8590015e1cc45 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-22T18:47:43 + Monotone-Branch: ca.inverse.sogo + commit 975cfe3c1c3c54b162fec78ec20b5731e0e6220a Author: Wolfgang Sourdeau Date: Wed Jul 22 18:47:27 2009 +0000 @@ -69086,6 +81432,22 @@ Date: Wed Jul 22 16:58:10 2009 +0000 M NEWS +commit 8abb6ab954102df76ccba34ef70ec52f8b66bad3 +Merge: 3e8763f 62ca340 +Author: Ludovic Marcotte +Date: Wed Jul 22 16:55:40 2009 +0000 + + merge of '6dd9533693c1be1bcf7cea4b6c567122206a4f91' + and 'a86e2373112b3d6f47fab17f20db32c0726842b7' + + Monotone-Parent: 6dd9533693c1be1bcf7cea4b6c567122206a4f91 + Monotone-Parent: a86e2373112b3d6f47fab17f20db32c0726842b7 + Monotone-Revision: cb8f10ad251afc331b0fd503e55e538ba1737d5a + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-07-22T16:55:40 + Monotone-Branch: ca.inverse.sogo + commit 3e8763fc46ac9533af3427bbdbcdd7f15ede0460 Author: C Robert Date: Wed Jul 22 17:14:14 2009 +0000 @@ -69116,6 +81478,22 @@ Date: Wed Jul 22 17:09:41 2009 +0000 M UI/WebServerResources/UIxPreferences.js +commit 9ce6b68cece22bf106bb6050f9dc3f3bb5f096aa +Merge: 81d6757 9540d47 +Author: C Robert +Date: Wed Jul 22 15:17:48 2009 +0000 + + merge of 'c0c3fcc36b231d74c76f51c0827795b0ac360f7c' + and 'ef4d1dca45f5b9bbb2bd53d9f0116baab9367c9d' + + Monotone-Parent: c0c3fcc36b231d74c76f51c0827795b0ac360f7c + Monotone-Parent: ef4d1dca45f5b9bbb2bd53d9f0116baab9367c9d + Monotone-Revision: 929c48879342ae7a0903a90d5d51d42a4913acb0 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-22T15:17:48 + Monotone-Branch: ca.inverse.sogo + commit 81d6757af5e40f0cca880aebd71d5db0a8a09464 Author: C Robert Date: Wed Jul 22 15:16:44 2009 +0000 @@ -69334,6 +81712,22 @@ Date: Mon Jul 20 23:00:44 2009 +0000 M ChangeLog M SoObjects/Mailer/SOGoMailBodyPart.m +commit 20f67bc34f1f8def456ec04cdf472e81fcf7924b +Merge: a364ab9 d6f2a42 +Author: Ludovic Marcotte +Date: Tue Jul 21 10:53:03 2009 +0000 + + merge of '2052b9dc077ae7af1e3a8d4929d79cfd202de6ad' + and 'd3ebcb6db8dee3d858871a8ba7d7566e5ffd5f3e' + + Monotone-Parent: 2052b9dc077ae7af1e3a8d4929d79cfd202de6ad + Monotone-Parent: d3ebcb6db8dee3d858871a8ba7d7566e5ffd5f3e + Monotone-Revision: 5921568bee00f491f2b94ec6398344393f1b38aa + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-07-21T10:53:03 + Monotone-Branch: ca.inverse.sogo + commit a364ab95a78cf20a0f7e7065226053499ef1a384 Author: Francis Lachapelle Date: Mon Jul 20 21:06:33 2009 +0000 @@ -69365,6 +81759,22 @@ M SOPE/NGCards/iCalPerson.m M SoObjects/Appointments/SOGoAppointmentFolder.m M SoObjects/Appointments/SOGoFreeBusyObject.m +commit f714fa42bccfd7b8c4dea87a05254f4fa2cc6806 +Merge: fea2893 86a694e +Author: C Robert +Date: Mon Jul 20 18:37:08 2009 +0000 + + merge of '283b85ceb3a2d749da436802a5bf6c9e26565d00' + and 'ff4ded519351216e33ec0fa734612c05b21917d1' + + Monotone-Parent: 283b85ceb3a2d749da436802a5bf6c9e26565d00 + Monotone-Parent: ff4ded519351216e33ec0fa734612c05b21917d1 + Monotone-Revision: 779f7c78a42d4b2a50a642ddf6b7977bc7e6d72d + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-20T18:37:08 + Monotone-Branch: ca.inverse.sogo + commit fea2893d6faaf1d471c3a13857906791d6b63b71 Author: Wolfgang Sourdeau Date: Mon Jul 20 18:29:09 2009 +0000 @@ -69445,6 +81855,22 @@ Date: Mon Jul 20 14:23:05 2009 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 22e14d946d22e59fde82b6b7b83bb00cdeb2605c +Merge: c3ae477 b0dd991 +Author: Francis Lachapelle +Date: Sun Jul 19 14:00:29 2009 +0000 + + merge of '6ccb3c8e1a50f88fbb322c6e2d3c04e736f48475' + and 'f0935fff2414656359bd160c4d90eb3f0e9d8598' + + Monotone-Parent: 6ccb3c8e1a50f88fbb322c6e2d3c04e736f48475 + Monotone-Parent: f0935fff2414656359bd160c4d90eb3f0e9d8598 + Monotone-Revision: 2ec2bb218c1f6876ffaba4bb7f29f652a1080446 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-19T14:00:29 + Monotone-Branch: ca.inverse.sogo + commit c3ae477008725d9de3e94ce9752436497884950e Author: Wolfgang Sourdeau Date: Sun Jul 19 17:22:54 2009 +0000 @@ -69513,6 +81939,22 @@ Date: Sun Jul 19 16:42:04 2009 +0000 M UI/WebServerResources/SchedulerUI.js +commit ebeda97b7447bcb8d408e0d18adc6c190e002daa +Merge: e1ad72a b89bcb1 +Author: Wolfgang Sourdeau +Date: Sun Jul 19 16:41:48 2009 +0000 + + merge of '084a7a5ec0ad85b0c967e9425da2b4b789029549' + and '5122dba2cf6d25cecc6935ab5313e950bc38b7a8' + + Monotone-Parent: 084a7a5ec0ad85b0c967e9425da2b4b789029549 + Monotone-Parent: 5122dba2cf6d25cecc6935ab5313e950bc38b7a8 + Monotone-Revision: 99f2e49deefdf8b448f9388104536c94d7581cbd + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-07-19T16:41:48 + Monotone-Branch: ca.inverse.sogo + commit b89bcb1a939d6e32c3442d712089fb38c276b8cc Author: Wolfgang Sourdeau Date: Sun Jul 19 16:41:42 2009 +0000 @@ -69619,6 +82061,22 @@ Date: Fri Jul 17 17:33:32 2009 +0000 M UI/WebServerResources/UIxComponentEditor.js +commit bc7f50e0b48df554b11b782cc375d5af64d9625c +Merge: 115616f 98eaf4b +Author: C Robert +Date: Thu Jul 16 18:09:12 2009 +0000 + + merge of '3bb4ab21fa8d95f3fb6ba36a32d7541726045fd9' + and 'e409f99e26e7a5e1d224123fb22a166248351319' + + Monotone-Parent: 3bb4ab21fa8d95f3fb6ba36a32d7541726045fd9 + Monotone-Parent: e409f99e26e7a5e1d224123fb22a166248351319 + Monotone-Revision: ae3345097f59fc699c864086217dff63e641ee3d + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-16T18:09:12 + Monotone-Branch: ca.inverse.sogo + commit 115616feebd42eddd5f1fb25c2715823adcb1df4 Author: C Robert Date: Thu Jul 16 18:08:59 2009 +0000 @@ -69698,6 +82156,22 @@ M UI/Templates/PreferencesUI/UIxPreferences.wox M UI/WebServerResources/UIxPreferences.css M UI/WebServerResources/UIxPreferences.js +commit d3e2bdf23a6f28569d1bebf318382e10a721d764 +Merge: 5cf62a7 2c28544 +Author: C Robert +Date: Thu Jul 16 15:57:56 2009 +0000 + + merge of '00f021939a59d6bcc0871dadde8fbc81c2d0b614' + and 'e723074f5d8219ca1c6d8a8a36e8c33c8e2ba0bf' + + Monotone-Parent: 00f021939a59d6bcc0871dadde8fbc81c2d0b614 + Monotone-Parent: e723074f5d8219ca1c6d8a8a36e8c33c8e2ba0bf + Monotone-Revision: b1fac1b458b718d0b80ecc77aa59220107cd9ef8 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-16T15:57:56 + Monotone-Branch: ca.inverse.sogo + commit 5cf62a74a9b6045dc5770a5ef97d30608a2dbc29 Author: C Robert Date: Thu Jul 16 15:57:31 2009 +0000 @@ -69729,6 +82203,38 @@ M UI/WebServerResources/UIxPreferences.css M UI/WebServerResources/UIxPreferences.js M UI/WebServerResources/generic.js +commit 2c2854427ed19293bdeb6c0f9078422f6ebffcc3 +Merge: b957556 a88f5d7 +Author: Ludovic Marcotte +Date: Thu Jul 16 14:25:11 2009 +0000 + + merge of '94da50397e51ef2f1bf7530b7a3c4b2e9e1594f6' + and 'e57c559e7f4acc6c125cef6398101fdf444f5d7b' + + Monotone-Parent: 94da50397e51ef2f1bf7530b7a3c4b2e9e1594f6 + Monotone-Parent: e57c559e7f4acc6c125cef6398101fdf444f5d7b + Monotone-Revision: e723074f5d8219ca1c6d8a8a36e8c33c8e2ba0bf + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-07-16T14:25:11 + Monotone-Branch: ca.inverse.sogo + +commit dced0f231d90e43a7fc86de58efc009162737d9e +Merge: 0ad1970 a88f5d7 +Author: C Robert +Date: Thu Jul 16 13:55:32 2009 +0000 + + merge of '3b129c3c362bac1e7fdf67d93f24a6e9be27fdc1' + and 'e57c559e7f4acc6c125cef6398101fdf444f5d7b' + + Monotone-Parent: 3b129c3c362bac1e7fdf67d93f24a6e9be27fdc1 + Monotone-Parent: e57c559e7f4acc6c125cef6398101fdf444f5d7b + Monotone-Revision: bb2d11200e5d8cbdc9a740b2a9e019efed65432b + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-16T13:55:32 + Monotone-Branch: ca.inverse.sogo + commit a88f5d7ad6197d03e212351fbf73b5b3a9fa4a82 Author: Wolfgang Sourdeau Date: Thu Jul 16 13:52:53 2009 +0000 @@ -69757,6 +82263,22 @@ M UI/Scheduler/UIxComponentEditor.m M UI/Scheduler/Welsh.lproj/Localizable.strings M UI/Templates/SchedulerUI/UIxComponentEditor.wox +commit 0ad1970ffb32fe752854819ee014133b8bd23cd9 +Merge: b957556 d6755b5 +Author: C Robert +Date: Thu Jul 16 13:20:52 2009 +0000 + + merge of '94da50397e51ef2f1bf7530b7a3c4b2e9e1594f6' + and 'd350e00bfd2567a3222879e516694b309523070e' + + Monotone-Parent: 94da50397e51ef2f1bf7530b7a3c4b2e9e1594f6 + Monotone-Parent: d350e00bfd2567a3222879e516694b309523070e + Monotone-Revision: 3b129c3c362bac1e7fdf67d93f24a6e9be27fdc1 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-16T13:20:52 + Monotone-Branch: ca.inverse.sogo + commit b957556a9cd08cef7257585aa0ccf975d59ef949 Author: Ludovic Marcotte Date: Thu Jul 16 02:18:24 2009 +0000 @@ -69772,6 +82294,22 @@ Date: Thu Jul 16 02:18:24 2009 +0000 M NEWS +commit f1cfbfa658756fe303caed25dbce4d0cbf0ce985 +Merge: 2978d0a 18afa2e +Author: Ludovic Marcotte +Date: Thu Jul 16 02:17:32 2009 +0000 + + merge of '6ea189a179012ff48f750e835f069abfdbe32c7c' + and 'e0d6a2d51589348dbe6602973f8a6ae6718f0991' + + Monotone-Parent: 6ea189a179012ff48f750e835f069abfdbe32c7c + Monotone-Parent: e0d6a2d51589348dbe6602973f8a6ae6718f0991 + Monotone-Revision: 3765f757435c9d9934d42b1af5d1fd32fe72631a + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-07-16T02:17:32 + Monotone-Branch: ca.inverse.sogo + commit 18afa2eecd29b0802de7b68b95994a7b1e29de7d Author: Wolfgang Sourdeau Date: Wed Jul 15 20:36:06 2009 +0000 @@ -69870,6 +82408,38 @@ Date: Wed Jul 15 18:24:53 2009 +0000 M UI/Templates/SchedulerUI/UIxComponentEditor.wox +commit 7d517ed5774935d1747a39d802573b15b61cc6a3 +Merge: e934420 ea65646 +Author: Francis Lachapelle +Date: Wed Jul 15 18:23:42 2009 +0000 + + merge of '2a9b87ed394af6e53bee4a43a3c95a337b9c7ecf' + and 'c1a2d381d8af27188d0704030b27985ca594d689' + + Monotone-Parent: 2a9b87ed394af6e53bee4a43a3c95a337b9c7ecf + Monotone-Parent: c1a2d381d8af27188d0704030b27985ca594d689 + Monotone-Revision: fc9f23ed8b7b90222cd132a38dbcf53498d4b56c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-15T18:23:42 + Monotone-Branch: ca.inverse.sogo + +commit e934420a09a0972e96c4e77767fa938223b9ae98 +Merge: 268aed2 dff649e +Author: Francis Lachapelle +Date: Wed Jul 15 18:23:05 2009 +0000 + + merge of 'cb8beedb8717b79c50ae6be14d74e57819f02a62' + and 'd9486921eb70cccd2f182f072819a3dd798840ad' + + Monotone-Parent: cb8beedb8717b79c50ae6be14d74e57819f02a62 + Monotone-Parent: d9486921eb70cccd2f182f072819a3dd798840ad + Monotone-Revision: 2a9b87ed394af6e53bee4a43a3c95a337b9c7ecf + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-15T18:23:05 + Monotone-Branch: ca.inverse.sogo + commit dff649ed078f4cbc569022db64efe7f98d0a0a5a Author: Francis Lachapelle Date: Wed Jul 15 18:21:35 2009 +0000 @@ -69913,6 +82483,22 @@ Date: Wed Jul 15 16:10:42 2009 +0000 M UI/Scheduler/Italian.lproj/Localizable.strings +commit d6755b508752edba5194d4f80af7e6d59c1df479 +Merge: bb6f27c 3c1b73a +Author: C Robert +Date: Wed Jul 15 15:19:50 2009 +0000 + + merge of '717a205cd03639045199ba0d192c6a7fba0ec751' + and 'a2229b5d48e906a42ce1d5dfc54dd55fbbbb0367' + + Monotone-Parent: 717a205cd03639045199ba0d192c6a7fba0ec751 + Monotone-Parent: a2229b5d48e906a42ce1d5dfc54dd55fbbbb0367 + Monotone-Revision: d350e00bfd2567a3222879e516694b309523070e + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-15T15:19:50 + Monotone-Branch: ca.inverse.sogo + commit bb6f27c270118a2485c2ed85f33b63e33a0b1c46 Author: Wolfgang Sourdeau Date: Wed Jul 15 14:05:49 2009 +0000 @@ -69964,6 +82550,22 @@ Date: Tue Jul 14 18:41:44 2009 +0000 M Documentation/SOGo Mozilla Thunderbird Configuration.odt +commit 3c1b73a2179873a3fb76486a0c92f2960cf01d58 +Merge: 2b4e8cb 98fd12e +Author: C Robert +Date: Tue Jul 14 18:05:04 2009 +0000 + + merge of '21391b18cfffeec760e8fb1ec2e36599374a1c48' + and 'd5700732397ebf4e67639bb33ff05a1c35349ff0' + + Monotone-Parent: 21391b18cfffeec760e8fb1ec2e36599374a1c48 + Monotone-Parent: d5700732397ebf4e67639bb33ff05a1c35349ff0 + Monotone-Revision: a2229b5d48e906a42ce1d5dfc54dd55fbbbb0367 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-14T18:05:04 + Monotone-Branch: ca.inverse.sogo + commit 98fd12e7412621f0fcc2d8c334a38cb124cfb402 Author: C Robert Date: Tue Jul 14 18:04:50 2009 +0000 @@ -70119,6 +82721,22 @@ Date: Tue Jul 14 15:01:21 2009 +0000 M ChangeLog +commit 858ee0656ab208570a997fb5f193da5527470483 +Merge: 99c0858 14b3ca1 +Author: Francis Lachapelle +Date: Tue Jul 14 14:58:45 2009 +0000 + + merge of '04613672d5bbddb489f5e265a0540411ae9b2fa3' + and '3e90781b75df157db7681cf0321f96486a923247' + + Monotone-Parent: 04613672d5bbddb489f5e265a0540411ae9b2fa3 + Monotone-Parent: 3e90781b75df157db7681cf0321f96486a923247 + Monotone-Revision: 560dcc0f72c18c937a44c51c6710da0835aae555 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-14T14:58:45 + Monotone-Branch: ca.inverse.sogo + commit 99c08584c537fd8fc8c1098fbb83d5566a590ecc Author: Francis Lachapelle Date: Tue Jul 14 14:55:59 2009 +0000 @@ -70252,6 +82870,22 @@ M SoObjects/Appointments/SOGoAptMailICalReply.m M SoObjects/Appointments/SOGoAptMailInvitation.m M SoObjects/Appointments/SOGoAptMailUpdate.m +commit 4813ac0e7562b895406f52c41bcd7f8e42b94c84 +Merge: c58c67e a4efa19 +Author: Wolfgang Sourdeau +Date: Fri Jul 10 13:22:43 2009 +0000 + + merge of '1e54cf58146b56dc11d3bc2fdb64130df606ac54' + and '6bacc3304f196f108a7aa25e27eff1ab2474e5e0' + + Monotone-Parent: 1e54cf58146b56dc11d3bc2fdb64130df606ac54 + Monotone-Parent: 6bacc3304f196f108a7aa25e27eff1ab2474e5e0 + Monotone-Revision: b252b3685dc5326f7b6ab92e19b6fec1e419fb2a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-07-10T13:22:43 + Monotone-Branch: ca.inverse.sogo + commit a4efa19e98250acaa470a8201913377d508698f1 Author: Wolfgang Sourdeau Date: Fri Jul 10 13:22:21 2009 +0000 @@ -70307,6 +82941,22 @@ A UI/MailPartViewers/BrazilianPortuguese.lproj/Localizable.strings A UI/MailPartViewers/Czech.lproj/Localizable.strings M UI/MailPartViewers/GNUmakefile +commit ce3abe4e86975f95f5f6461cfd6f4287d720635f +Merge: 4eb7fbc 9b86cb6 +Author: Francis Lachapelle +Date: Thu Jul 9 20:24:04 2009 +0000 + + merge of '3a355e79e6eee869bec77ad32e28a6640e81cd02' + and '3e5b0ae54eb9675e1505b56dcc06d9d447984efc' + + Monotone-Parent: 3a355e79e6eee869bec77ad32e28a6640e81cd02 + Monotone-Parent: 3e5b0ae54eb9675e1505b56dcc06d9d447984efc + Monotone-Revision: e62f727bf4e9634e88f005386ea6fef3bbc2b288 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-09T20:24:04 + Monotone-Branch: ca.inverse.sogo + commit 9b86cb601bd0118764258bd9223ebe0ade63ce88 Author: Francis Lachapelle Date: Thu Jul 9 20:22:38 2009 +0000 @@ -70430,6 +83080,22 @@ Date: Thu Jul 9 15:44:46 2009 +0000 M ChangeLog M UI/MailPartViewers/UIxMailRenderingContext.m +commit 4cfe7e417c1fe3c966f651b610cab59441da2791 +Merge: 9cf72ec 7c25c16 +Author: C Robert +Date: Thu Jul 9 15:44:36 2009 +0000 + + merge of '198fe6947014072d94cf42fd01ddad350fa6bd08' + and 'f6c80d5cb25bb1c9887983399ad7fa9954631ac1' + + Monotone-Parent: 198fe6947014072d94cf42fd01ddad350fa6bd08 + Monotone-Parent: f6c80d5cb25bb1c9887983399ad7fa9954631ac1 + Monotone-Revision: 130245b7479c6dceb4d9ebbf839fbab430101735 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-09T15:44:36 + Monotone-Branch: ca.inverse.sogo + commit 9cf72ec8d5f79efb9c6b9033d6f45e51d799cc9f Author: C Robert Date: Thu Jul 9 15:27:11 2009 +0000 @@ -70478,6 +83144,22 @@ M SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalRe M SoObjects/Appointments/SOGoAptMailWelshICalReply.wo/SOGoAptMailWelshICalReply.html M SoObjects/Appointments/SOGoCalendarComponent.m +commit 8c50019c3042364659fc87eeba2e25ebeb064da5 +Merge: b27e32a cf3fca0 +Author: Francis Lachapelle +Date: Wed Jul 8 22:52:40 2009 +0000 + + merge of '09e8d7e8a0e862b146d8d9bab41abd1661bb95b2' + and '72e05191b28fdea36565f18fc1803f1d197aee92' + + Monotone-Parent: 09e8d7e8a0e862b146d8d9bab41abd1661bb95b2 + Monotone-Parent: 72e05191b28fdea36565f18fc1803f1d197aee92 + Monotone-Revision: 41c1c5726230c10d450e8d6282dda4a8d0ce1de3 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-08T22:52:40 + Monotone-Branch: ca.inverse.sogo + commit b27e32a40268dcdefa8d0c189866e6bf69e34e10 Author: Francis Lachapelle Date: Wed Jul 8 21:13:06 2009 +0000 @@ -70575,6 +83257,22 @@ M UI/WebServerResources/UIxAppointmentEditor.css M UI/WebServerResources/UIxComponentEditor.css M UI/WebServerResources/UIxComponentEditor.js +commit 42eb08f9096f9d033734f528415c3c858bf7edd9 +Merge: 32387cd 5659a3b +Author: Francis Lachapelle +Date: Tue Jul 7 21:15:56 2009 +0000 + + merge of '266b8dcd5d7d2b3c6b6169c2f706feae1b725e7b' + and 'a1fec97888a28b21f11c4743a65a09fe028bf771' + + Monotone-Parent: 266b8dcd5d7d2b3c6b6169c2f706feae1b725e7b + Monotone-Parent: a1fec97888a28b21f11c4743a65a09fe028bf771 + Monotone-Revision: ab2ff65d5c716a5cd610c720b705af5e768a77c0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-07T21:15:56 + Monotone-Branch: ca.inverse.sogo + commit 5659a3b1cfcce42eeb62125f197e5e3a0703344f Author: Wolfgang Sourdeau Date: Tue Jul 7 20:57:00 2009 +0000 @@ -70603,6 +83301,22 @@ Date: Tue Jul 7 20:56:09 2009 +0000 M ChangeLog M SoObjects/SOGo/SOGoGCSFolder.m +commit 32387cd8c633b78f0e0e3b2a38a0325f8a37d504 +Merge: 02beac8 d0dc6b3 +Author: Francis Lachapelle +Date: Tue Jul 7 19:58:38 2009 +0000 + + merge of '05fea4e552871014f910088a53242e6012ab81b0' + and 'dac228428ffd40e2b5476fd88e5a0dd9513bc493' + + Monotone-Parent: 05fea4e552871014f910088a53242e6012ab81b0 + Monotone-Parent: dac228428ffd40e2b5476fd88e5a0dd9513bc493 + Monotone-Revision: 266b8dcd5d7d2b3c6b6169c2f706feae1b725e7b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-07T19:58:38 + Monotone-Branch: ca.inverse.sogo + commit 02beac87b71008a10d843c95f9e9a02e6d7be76c Author: Francis Lachapelle Date: Tue Jul 7 19:58:15 2009 +0000 @@ -70655,6 +83369,22 @@ Date: Tue Jul 7 19:20:25 2009 +0000 M UI/WebServerResources/message-copy.gif +commit b5f8741206023f6695fe4511138329d968f1b540 +Merge: 0444148 3b94160 +Author: Francis Lachapelle +Date: Tue Jul 7 19:18:58 2009 +0000 + + merge of 'a78e1d7bc5249205bb5472f1376465ca1d88e281' + and 'd205cf705c1c42fd1d48092e23c41087cdfce10a' + + Monotone-Parent: a78e1d7bc5249205bb5472f1376465ca1d88e281 + Monotone-Parent: d205cf705c1c42fd1d48092e23c41087cdfce10a + Monotone-Revision: 5445a1fde58efa8862fc96a605c39020c9ff0dfb + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-07T19:18:58 + Monotone-Branch: ca.inverse.sogo + commit 0444148ba905be9fede5b8babbff994c1c2f5c55 Author: C Robert Date: Tue Jul 7 19:16:22 2009 +0000 @@ -70713,6 +83443,22 @@ Date: Tue Jul 7 18:21:15 2009 +0000 M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 3b94160f38032f69edefc0ad5e756bc3ee812643 +Merge: b4c44e9 463752d +Author: Francis Lachapelle +Date: Tue Jul 7 17:46:18 2009 +0000 + + merge of 'a00b81f79363503679ee8113681198eb8b5de97e' + and 'eb759cedcd41f4bc822816acd58b93115f94f266' + + Monotone-Parent: a00b81f79363503679ee8113681198eb8b5de97e + Monotone-Parent: eb759cedcd41f4bc822816acd58b93115f94f266 + Monotone-Revision: d205cf705c1c42fd1d48092e23c41087cdfce10a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-07T17:46:18 + Monotone-Branch: ca.inverse.sogo + commit 463752df0d4e74394c7344de1bb9e057bdcd2453 Author: C Robert Date: Tue Jul 7 15:26:51 2009 +0000 @@ -70921,6 +83667,22 @@ M ChangeLog M UI/MailerUI/UIxMailListView.m M UI/WebServerResources/MailerUI.css +commit 5873cc3e1682a7efa48e89fad66677dc36104c66 +Merge: a2be336 2bfde9c +Author: Francis Lachapelle +Date: Thu Jul 2 21:07:38 2009 +0000 + + merge of '238ddfbd3f00e0fbad3b9312ebe0bd88fde3f646' + and 'a5d600790eb0a570287e3f58d9d92d701c3f4f3a' + + Monotone-Parent: 238ddfbd3f00e0fbad3b9312ebe0bd88fde3f646 + Monotone-Parent: a5d600790eb0a570287e3f58d9d92d701c3f4f3a + Monotone-Revision: 73574164255d79da1cea7be5a59a86a13386f75f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-02T21:07:38 + Monotone-Branch: ca.inverse.sogo + commit 2bfde9c350e0893a66f78e9917199c199431a69a Author: Ludovic Marcotte Date: Thu Jul 2 17:30:27 2009 +0000 @@ -71008,6 +83770,22 @@ Date: Thu Jul 2 17:06:21 2009 +0000 M UI/MailerUI/UIxMailFolderActions.m +commit e4d27f349bc46f220305ba10b5a38eb34f731b79 +Merge: 951389b b63050d +Author: C Robert +Date: Thu Jul 2 15:41:00 2009 +0000 + + merge of '7acfed7c7506c279e2946ae835c4ef8a1cf52114' + and 'ef38d39938984cb34954a23cdc1d54fecf577117' + + Monotone-Parent: 7acfed7c7506c279e2946ae835c4ef8a1cf52114 + Monotone-Parent: ef38d39938984cb34954a23cdc1d54fecf577117 + Monotone-Revision: d4edd90811440e920dfccfcb2c0e4305732b5cfc + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-02T15:41:00 + Monotone-Branch: ca.inverse.sogo + commit 951389b21696d3f50f908cf1c45e451ef25ca7ef Author: C Robert Date: Thu Jul 2 15:40:45 2009 +0000 @@ -71048,6 +83826,22 @@ Date: Thu Jul 2 14:14:57 2009 +0000 M NEWS +commit d3ab38ff3dc62d5438db9f0c6edaade49f9251c6 +Merge: 4695f1a aebc17e +Author: Francis Lachapelle +Date: Thu Jul 2 14:12:54 2009 +0000 + + merge of '366dd63bc8cb90bda841f039b5d9e177f4dc3bbc' + and 'bde131451e61cf9c2c9b12131c6ea839e28e3bf2' + + Monotone-Parent: 366dd63bc8cb90bda841f039b5d9e177f4dc3bbc + Monotone-Parent: bde131451e61cf9c2c9b12131c6ea839e28e3bf2 + Monotone-Revision: 200696af293fef0e2e6002c56a321834f165a2ec + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-02T14:12:54 + Monotone-Branch: ca.inverse.sogo + commit 4695f1a464cdedfb49a8ec91fd2f87dab2535f6e Author: Francis Lachapelle Date: Thu Jul 2 13:38:10 2009 +0000 @@ -71115,6 +83909,22 @@ Date: Wed Jul 1 20:23:10 2009 +0000 M UI/WebServerResources/ContactsUI.css +commit cdffc1736e2b4305bff4f91c7d0d515574cd3d02 +Merge: b57eb03 9506b6d +Author: Francis Lachapelle +Date: Wed Jul 1 20:22:39 2009 +0000 + + merge of '025dc837dc0929ee47957b2385959532807a1b9c' + and 'a6eb90bb705891f429bad2f9b15a3fc4f18c040c' + + Monotone-Parent: 025dc837dc0929ee47957b2385959532807a1b9c + Monotone-Parent: a6eb90bb705891f429bad2f9b15a3fc4f18c040c + Monotone-Revision: 1c444d4c347ea6897dc7ebdf7e4f2149271c5203 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-01T20:22:39 + Monotone-Branch: ca.inverse.sogo + commit b57eb03a2954c79ee985b755df813237357a0d4e Author: Francis Lachapelle Date: Wed Jul 1 20:22:32 2009 +0000 @@ -71128,6 +83938,38 @@ Date: Wed Jul 1 20:22:32 2009 +0000 M SoObjects/Mailer/SOGoMailFolder.m +commit 9506b6dadef52b9e608d0e16501332469c9d5ca0 +Merge: 71a0e0f 0da799f +Author: Francis Lachapelle +Date: Wed Jul 1 20:21:46 2009 +0000 + + merge of '27e4a971509238d8a77bcdbd70c00f4fc4202a00' + and '310656e43745cf03a754d629917e6024ec566244' + + Monotone-Parent: 27e4a971509238d8a77bcdbd70c00f4fc4202a00 + Monotone-Parent: 310656e43745cf03a754d629917e6024ec566244 + Monotone-Revision: a6eb90bb705891f429bad2f9b15a3fc4f18c040c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-01T20:21:46 + Monotone-Branch: ca.inverse.sogo + +commit 0da799fd8c0463b8ad35ba4bcf972fc4ff0c8e23 +Merge: ef8cee5 ae87e98 +Author: C Robert +Date: Wed Jul 1 20:09:38 2009 +0000 + + merge of '065f29d26993d0476f752244bc9a97e2e8c8dcaa' + and '198c312f6f50dd9e647df21a626b63d5737a368b' + + Monotone-Parent: 065f29d26993d0476f752244bc9a97e2e8c8dcaa + Monotone-Parent: 198c312f6f50dd9e647df21a626b63d5737a368b + Monotone-Revision: 310656e43745cf03a754d629917e6024ec566244 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-01T20:09:38 + Monotone-Branch: ca.inverse.sogo + commit ae87e98bf29ad43bd24ffd6ca405766ae16d55af Author: C Robert Date: Wed Jul 1 20:09:26 2009 +0000 @@ -71143,6 +83985,22 @@ M UI/WebServerResources/ContactsUI.js M UI/WebServerResources/MailerUI.js M UI/WebServerResources/scriptaculous/dragdrop.js +commit ef8cee52bd262fc994dadbc71866cbd8bb4ed3b1 +Merge: 8b51d07 0c2a455 +Author: Wolfgang Sourdeau +Date: Wed Jul 1 19:58:59 2009 +0000 + + merge of '5547fe230efee84f5079734d9e6dccd6e02bc161' + and '856583f8779d38a6978fe4db950c4067c8a38e9c' + + Monotone-Parent: 5547fe230efee84f5079734d9e6dccd6e02bc161 + Monotone-Parent: 856583f8779d38a6978fe4db950c4067c8a38e9c + Monotone-Revision: 065f29d26993d0476f752244bc9a97e2e8c8dcaa + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-07-01T19:58:59 + Monotone-Branch: ca.inverse.sogo + commit 8b51d0728f4a147affb295ead5437646eefdc7ea Author: Wolfgang Sourdeau Date: Wed Jul 1 19:58:44 2009 +0000 @@ -71156,6 +84014,22 @@ Date: Wed Jul 1 19:58:44 2009 +0000 M SOPE/sope-patchset-r1657.diff +commit 0c2a4556164069331bef6be4cdb628e149811da8 +Merge: 5a3163c 733cc4f +Author: C Robert +Date: Wed Jul 1 19:30:11 2009 +0000 + + merge of '4540bdac2b25e94022f859ccd01e9fd4f28ef349' + and 'cc4465af2bc376a873ae8e59faf33b86548f08b3' + + Monotone-Parent: 4540bdac2b25e94022f859ccd01e9fd4f28ef349 + Monotone-Parent: cc4465af2bc376a873ae8e59faf33b86548f08b3 + Monotone-Revision: 856583f8779d38a6978fe4db950c4067c8a38e9c + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-07-01T19:30:11 + Monotone-Branch: ca.inverse.sogo + commit 733cc4f9e7f2bdeb70d6378737acd3c7d0bf9d12 Author: C Robert Date: Wed Jul 1 19:28:44 2009 +0000 @@ -71211,6 +84085,22 @@ Date: Wed Jul 1 15:49:08 2009 +0000 M SOPE/sope-patchset-r1657.diff +commit 71a0e0f13e525e389637e02d6936457baf55cdc6 +Merge: f926ea4 a40feed +Author: Francis Lachapelle +Date: Wed Jul 1 15:40:08 2009 +0000 + + merge of '08ab1ea413a26cc68bc442788bec8b43e1f2dd07' + and '52e582748151e87bfde51bfd7c475d994270767b' + + Monotone-Parent: 08ab1ea413a26cc68bc442788bec8b43e1f2dd07 + Monotone-Parent: 52e582748151e87bfde51bfd7c475d994270767b + Monotone-Revision: 27e4a971509238d8a77bcdbd70c00f4fc4202a00 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-07-01T15:40:08 + Monotone-Branch: ca.inverse.sogo + commit a40feed75ca62027c505187311f213c18bf452ec Author: C Robert Date: Wed Jul 1 15:09:45 2009 +0000 @@ -71305,6 +84195,22 @@ Date: Tue Jun 30 21:21:50 2009 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit b91c48de4f5234fe2b08c7eef00bd02e760b464a +Merge: 9b5e7361 db2c2ed +Author: C Robert +Date: Tue Jun 30 20:10:21 2009 +0000 + + merge of '1487f5359ed75a8c1f5df8db9a25b561e7e5978c' + and '78e483b4fe68843e9833d79d7bde59ac5321291c' + + Monotone-Parent: 1487f5359ed75a8c1f5df8db9a25b561e7e5978c + Monotone-Parent: 78e483b4fe68843e9833d79d7bde59ac5321291c + Monotone-Revision: db6101745dbd661ce3278ea7f4c6bb9837382a4f + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-06-30T20:10:21 + Monotone-Branch: ca.inverse.sogo + commit 9b5e7361e38ccab6a8904d5eb12cd5de900d0b51 Author: C Robert Date: Tue Jun 30 20:10:09 2009 +0000 @@ -71383,6 +84289,22 @@ Date: Tue Jun 30 19:09:57 2009 +0000 M SoObjects/SOGo/NSArray+Utilities.m M SoObjects/SOGo/NSString+Utilities.m +commit e41d6dced557034151d2a54ed734c752090c57b7 +Merge: d6a1489 db2c2ed +Author: Francis Lachapelle +Date: Tue Jun 30 19:08:00 2009 +0000 + + merge of '2d256ad5de45712bf664154e503ef162f9780ce7' + and '78e483b4fe68843e9833d79d7bde59ac5321291c' + + Monotone-Parent: 2d256ad5de45712bf664154e503ef162f9780ce7 + Monotone-Parent: 78e483b4fe68843e9833d79d7bde59ac5321291c + Monotone-Revision: dac2c88734449dfb2523709ee6ad66d821245e35 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-06-30T19:08:00 + Monotone-Branch: ca.inverse.sogo + commit db2c2ed702b806cb7d2ed3413e51dbd4a4c2aa1a Author: Wolfgang Sourdeau Date: Tue Jun 30 18:49:53 2009 +0000 @@ -71431,6 +84353,86 @@ M UI/WebServerResources/ckeditor/config.js A UI/WebServerResources/message-copy.gif A UI/WebServerResources/message.gif +commit d6a148979802b28a7db83533575b4b2303544964 +Merge: 612322f 3a22099 +Author: Francis Lachapelle +Date: Tue Jun 30 14:54:23 2009 +0000 + + merge of '3c8f71698ed93ac4e9bac8ae36c7b17a9da18ca9' + and 'f0bf4f5e57bda2fe7cbbd558784c203b3fab4d36' + + Monotone-Parent: 3c8f71698ed93ac4e9bac8ae36c7b17a9da18ca9 + Monotone-Parent: f0bf4f5e57bda2fe7cbbd558784c203b3fab4d36 + Monotone-Revision: 2d256ad5de45712bf664154e503ef162f9780ce7 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-06-30T14:54:23 + Monotone-Branch: ca.inverse.sogo + +commit 3a22099b946dd7237b53fe200da5daec6608a40b +Merge: 148bd51 6c411d7 +Author: C Robert +Date: Tue Jun 30 14:52:45 2009 +0000 + + merge of '27ff1857cc937c28d83c101f077e83c119249cd6' + and 'f83500f2eb31440f37507e6dd73a3a5932b74c3d' + + Monotone-Parent: 27ff1857cc937c28d83c101f077e83c119249cd6 + Monotone-Parent: f83500f2eb31440f37507e6dd73a3a5932b74c3d + Monotone-Revision: f0bf4f5e57bda2fe7cbbd558784c203b3fab4d36 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-06-30T14:52:45 + Monotone-Branch: ca.inverse.sogo + +commit 6c411d76480959d7514b83833d42ec5810fbb684 +Merge: 1015153 6209543 +Author: Wolfgang Sourdeau +Date: Tue Jun 30 14:50:18 2009 +0000 + + merge of '8ec679acd7bba83b03f0f4bbf41999b1d7c4b065' + and 'eca223304213a13e4a7b9e29e6e5cc41c3b1cdb3' + + Monotone-Parent: 8ec679acd7bba83b03f0f4bbf41999b1d7c4b065 + Monotone-Parent: eca223304213a13e4a7b9e29e6e5cc41c3b1cdb3 + Monotone-Revision: f83500f2eb31440f37507e6dd73a3a5932b74c3d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-30T14:50:18 + Monotone-Branch: ca.inverse.sogo + +commit 612322fae0bd9f05c0df45a9c36e4fb3fa6b06c1 +Merge: 1015153 6209543 +Author: Francis Lachapelle +Date: Tue Jun 30 14:50:03 2009 +0000 + + merge of '8ec679acd7bba83b03f0f4bbf41999b1d7c4b065' + and 'eca223304213a13e4a7b9e29e6e5cc41c3b1cdb3' + + Monotone-Parent: 8ec679acd7bba83b03f0f4bbf41999b1d7c4b065 + Monotone-Parent: eca223304213a13e4a7b9e29e6e5cc41c3b1cdb3 + Monotone-Revision: 3c8f71698ed93ac4e9bac8ae36c7b17a9da18ca9 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-06-30T14:50:03 + Monotone-Branch: ca.inverse.sogo + +commit 148bd513b779bb1626a5d4585c05d8f15bc7bfb5 +Merge: 1015153 6209543 +Author: C Robert +Date: Tue Jun 30 13:15:34 2009 +0000 + + merge of '8ec679acd7bba83b03f0f4bbf41999b1d7c4b065' + and 'eca223304213a13e4a7b9e29e6e5cc41c3b1cdb3' + + Monotone-Parent: 8ec679acd7bba83b03f0f4bbf41999b1d7c4b065 + Monotone-Parent: eca223304213a13e4a7b9e29e6e5cc41c3b1cdb3 + Monotone-Revision: 27ff1857cc937c28d83c101f077e83c119249cd6 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-06-30T13:15:34 + Monotone-Branch: ca.inverse.sogo + commit 6209543ce046a76a170e7934d4283bf06862a703 Author: Francis Lachapelle Date: Tue Jun 30 01:41:27 2009 +0000 @@ -71462,6 +84464,22 @@ Date: Tue Jun 30 01:39:27 2009 +0000 M UI/WebServerResources/SchedulerUI.js +commit 1015153f5cda1f959f9f5b2a46ec6ca7717001ea +Merge: a2f6637 e3b2301 +Author: Wolfgang Sourdeau +Date: Mon Jun 29 21:39:59 2009 +0000 + + merge of '2ce9107c8b61b56e528bf47fbe9733bd95b13c83' + and '3d05f2005e93e45bcafb0ec4aff59c61d8e08631' + + Monotone-Parent: 2ce9107c8b61b56e528bf47fbe9733bd95b13c83 + Monotone-Parent: 3d05f2005e93e45bcafb0ec4aff59c61d8e08631 + Monotone-Revision: 8ec679acd7bba83b03f0f4bbf41999b1d7c4b065 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-29T21:39:59 + Monotone-Branch: ca.inverse.sogo + commit a2f663745dc2f3022cacc90a4ba82461dc4ab925 Author: Wolfgang Sourdeau Date: Mon Jun 29 21:38:56 2009 +0000 @@ -71490,6 +84508,22 @@ Date: Mon Jun 29 19:31:59 2009 +0000 M ChangeLog M UI/WebServerResources/ContactsUI.js +commit 6e69047f0c6bd9233d999cc2bc8c6bde7e2696f8 +Merge: f0282f6 109ca5a +Author: Francis Lachapelle +Date: Mon Jun 29 19:09:39 2009 +0000 + + merge of '71124a5805a6acd533a352015d2c6fe9c134f725' + and 'a57ac11c710e04e59d47cf12be270492f600a306' + + Monotone-Parent: 71124a5805a6acd533a352015d2c6fe9c134f725 + Monotone-Parent: a57ac11c710e04e59d47cf12be270492f600a306 + Monotone-Revision: f8f29401b79be9d6545414948b83cb353a55ae8d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-06-29T19:09:39 + Monotone-Branch: ca.inverse.sogo + commit 109ca5a129b12ad358aa6c90c3aee362abcd0923 Author: Francis Lachapelle Date: Mon Jun 29 19:08:29 2009 +0000 @@ -71628,6 +84662,22 @@ M UI/WebServerResources/MailerUI.css M UI/WebServerResources/MailerUI.js M UI/WebServerResources/iefixes.css +commit f30c282fc074201a069d14d75e01cc4f150dc76a +Merge: 5ddca0d b5b96a1 +Author: Wolfgang Sourdeau +Date: Fri Jun 26 17:31:12 2009 +0000 + + merge of '326cbf2748cd4309c0cacb9702c86cdb705dadfe' + and 'ba6d913f4f8a20f6769ab7fd45973e1fbdee1e68' + + Monotone-Parent: 326cbf2748cd4309c0cacb9702c86cdb705dadfe + Monotone-Parent: ba6d913f4f8a20f6769ab7fd45973e1fbdee1e68 + Monotone-Revision: 3c15622e01ba189cb753c80fb8cf4c1a57e85c29 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-26T17:31:12 + Monotone-Branch: ca.inverse.sogo + commit 5ddca0d0fff0eb813166ee47184184c288da659a Author: Wolfgang Sourdeau Date: Fri Jun 26 17:30:34 2009 +0000 @@ -74014,6 +87064,22 @@ Date: Fri Jun 19 15:17:12 2009 +0000 M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 980be2a0c6a00ce6b16997a4857c85f8150e8959 +Merge: 1a67a34 31b7bd4 +Author: Wolfgang Sourdeau +Date: Fri Jun 19 14:54:48 2009 +0000 + + merge of 'db5e568c7dc79c31416d0756d5275c3a7271ea61' + and 'dc9dc8d5f131b13fcd58dd6c796f3dfaa553a104' + + Monotone-Parent: db5e568c7dc79c31416d0756d5275c3a7271ea61 + Monotone-Parent: dc9dc8d5f131b13fcd58dd6c796f3dfaa553a104 + Monotone-Revision: 3a06415372a1a1f51b286861a4ab3a51dd7df886 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-19T14:54:48 + Monotone-Branch: ca.inverse.sogo + commit 1a67a3454be5e6da2903192a033aea22f86d2990 Author: Wolfgang Sourdeau Date: Fri Jun 19 14:49:47 2009 +0000 @@ -74146,6 +87212,22 @@ Date: Thu Jun 18 15:19:18 2009 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit f0b7e1b67d3e60be07b970b44b153bef06f2396e +Merge: 82234df 71fe9f8 +Author: Wolfgang Sourdeau +Date: Wed Jun 17 18:08:00 2009 +0000 + + merge of '1306f5dc489a510d74accc34d99229210cecdb1e' + and '3b018c57691598e10f6e73b0f7fc31137f869040' + + Monotone-Parent: 1306f5dc489a510d74accc34d99229210cecdb1e + Monotone-Parent: 3b018c57691598e10f6e73b0f7fc31137f869040 + Monotone-Revision: 79f18765fc6ea227b58f8314495f4ef856966585 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-17T18:08:00 + Monotone-Branch: ca.inverse.sogo + commit 71fe9f878bb18ba7afe1f0ec7ac7d997d98313bc Author: Wolfgang Sourdeau Date: Wed Jun 17 18:07:23 2009 +0000 @@ -74242,6 +87324,22 @@ Date: Wed Jun 17 15:19:19 2009 +0000 M SoObjects/SOGo/SOGoObject.m +commit fd399be4c0a81ff2c910a2597880a0753bf1a3c7 +Merge: b37c58e 3f3db8f +Author: Francis Lachapelle +Date: Wed Jun 17 14:40:41 2009 +0000 + + merge of '9995223a0452fd05c8a2bc29a4e75bddaa07438b' + and 'aa0162c14e4f909e63d3ee7b4d7c67aea973ddd2' + + Monotone-Parent: 9995223a0452fd05c8a2bc29a4e75bddaa07438b + Monotone-Parent: aa0162c14e4f909e63d3ee7b4d7c67aea973ddd2 + Monotone-Revision: 6df5fda5f5dd4cf08493fa5086b30a1bbf5c0b2d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-06-17T14:40:41 + Monotone-Branch: ca.inverse.sogo + commit b37c58e765bfd3eb95cd9b3fed5243e46e1ade74 Author: Wolfgang Sourdeau Date: Wed Jun 17 13:35:08 2009 +0000 @@ -74382,6 +87480,22 @@ Date: Tue Jun 16 01:18:37 2009 +0000 M UI/WebServerResources/dtree.js +commit f7df54e621932a95e716cfccdb94271fdf6abdd8 +Merge: f1b2286 831d177 +Author: Wolfgang Sourdeau +Date: Tue Jun 16 01:15:58 2009 +0000 + + merge of '6d931b60fff0152bef4accc444201620045a9d87' + and '914b4e262396efbb440644e500c6fa43e8d23a61' + + Monotone-Parent: 6d931b60fff0152bef4accc444201620045a9d87 + Monotone-Parent: 914b4e262396efbb440644e500c6fa43e8d23a61 + Monotone-Revision: 07531f86fd693076f1210ca5298d43ef1a2495bc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-16T01:15:58 + Monotone-Branch: ca.inverse.sogo + commit 831d177ce348245a8a59ea2ab868831f7131042d Author: Wolfgang Sourdeau Date: Tue Jun 16 01:15:39 2009 +0000 @@ -74513,6 +87627,22 @@ Date: Mon Jun 15 14:10:46 2009 +0000 M UI/WebServerResources/UIxMailEditor.css +commit 6b16baa457d9f7a8cdcf763cd82ad06f85bade9d +Merge: de8ca41 cd01ea7 +Author: Wolfgang Sourdeau +Date: Sat Jun 13 18:51:19 2009 +0000 + + merge of '4133aa51d99944a0881e6439951b7325553c5309' + and '787fab4426e6ea6fab09ccfcc61ecc658e06ed5e' + + Monotone-Parent: 4133aa51d99944a0881e6439951b7325553c5309 + Monotone-Parent: 787fab4426e6ea6fab09ccfcc61ecc658e06ed5e + Monotone-Revision: 075df52db5284515c4b7994dd7a105a4399e3e3d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-13T18:51:19 + Monotone-Branch: ca.inverse.sogo + commit de8ca4149cf334294107ddaa5477b2c232c38f14 Author: Wolfgang Sourdeau Date: Sat Jun 13 18:06:29 2009 +0000 @@ -74541,6 +87671,22 @@ Date: Fri Jun 12 23:39:02 2009 +0000 M UI/WebServerResources/UIxContactsUserFolders.js M UI/WebServerResources/dtree.js +commit cd01ea7aea35e90e5efcba42ffce8161b1842a83 +Merge: ab2883a 6b61cd8 +Author: Francis Lachapelle +Date: Fri Jun 12 15:56:10 2009 +0000 + + merge of '571d9bfb5bd40cb2435fe9c4ecec1069f13f7a7d' + and 'b8d56bd5a31be825cfe66b8fe9f9a15269a09fbc' + + Monotone-Parent: 571d9bfb5bd40cb2435fe9c4ecec1069f13f7a7d + Monotone-Parent: b8d56bd5a31be825cfe66b8fe9f9a15269a09fbc + Monotone-Revision: 787fab4426e6ea6fab09ccfcc61ecc658e06ed5e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-06-12T15:56:10 + Monotone-Branch: ca.inverse.sogo + commit ab2883af195fc8b816276b3b0e2f2f8d88c29e2c Author: Francis Lachapelle Date: Fri Jun 12 15:55:04 2009 +0000 @@ -74660,6 +87806,22 @@ M SoObjects/SOGo/NSArray+Utilities.h M SoObjects/SOGo/NSArray+Utilities.m M SoObjects/SOGo/NSString+Utilities.m +commit 7ef586be276b150d7010ae9236ffde6e9e9e25e2 +Merge: 52c6a2f 0136b1b +Author: Wolfgang Sourdeau +Date: Wed Jun 10 20:00:58 2009 +0000 + + merge of '273ee77d23dba034d893c56736e213fd1a33f824' + and '52fad13e2d8c7765e5b822c94adbb945e0636f00' + + Monotone-Parent: 273ee77d23dba034d893c56736e213fd1a33f824 + Monotone-Parent: 52fad13e2d8c7765e5b822c94adbb945e0636f00 + Monotone-Revision: 810ca1c510af3f2653d3478ccb575204bc309c5a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-10T20:00:58 + Monotone-Branch: ca.inverse.sogo + commit 0136b1b83d838354ddda805195fd27999a35dc39 Author: Wolfgang Sourdeau Date: Wed Jun 10 20:00:45 2009 +0000 @@ -74809,6 +87971,22 @@ M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m M SoObjects/SOGo/SOGoWebDAVValue.m +commit 0287e9f3bdbd963ebffc02ae25d83ea16a5662ec +Merge: a400f8b 6b81019 +Author: Wolfgang Sourdeau +Date: Tue Jun 9 19:34:56 2009 +0000 + + merge of '44f11e17b6ccb6efa08fd613a7d939a22240c5ec' + and 'efe6e4c8aa7fb9627b66f5f1fb961a5387549fcc' + + Monotone-Parent: 44f11e17b6ccb6efa08fd613a7d939a22240c5ec + Monotone-Parent: efe6e4c8aa7fb9627b66f5f1fb961a5387549fcc + Monotone-Revision: ec8493cddd76f24d59a41d1da4982d89ecab0001 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-09T19:34:56 + Monotone-Branch: ca.inverse.sogo + commit 6b8101963213a6000bc851373a077add4e47f129 Author: C Robert Date: Tue Jun 9 19:34:25 2009 +0000 @@ -74911,6 +88089,22 @@ Date: Mon Jun 8 21:13:51 2009 +0000 M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 740c70a799a9efd823b96d082b568f011624540d +Merge: c65b492 d4a8f31 +Author: Wolfgang Sourdeau +Date: Mon Jun 8 20:26:27 2009 +0000 + + merge of '9dc1c127f410eb6a2bcfa8e50929a9ab77e8c255' + and 'cff34552be80b43b382bf21a61aea5efb44ca8ab' + + Monotone-Parent: 9dc1c127f410eb6a2bcfa8e50929a9ab77e8c255 + Monotone-Parent: cff34552be80b43b382bf21a61aea5efb44ca8ab + Monotone-Revision: 39df276f7e7e9a64d5949f3075f98a71e913491d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-08T20:26:27 + Monotone-Branch: ca.inverse.sogo + commit d4a8f3198f9ddd34dbc34b8c7d7f94a57c97f915 Author: Francis Lachapelle Date: Mon Jun 8 19:24:28 2009 +0000 @@ -75081,6 +88275,22 @@ M UI/Templates/SchedulerUI/UIxAttendeesEditor.wox M UI/WebServerResources/UIxAttendeesEditor.css M UI/WebServerResources/UIxAttendeesEditor.js +commit 399f05cc77439e469ec105f58f9458ad7ebf6229 +Merge: 5249c99 b2073ed +Author: C Robert +Date: Thu Jun 4 21:00:15 2009 +0000 + + merge of '1aafadb0f219460ff7d8c59eeb924061abdea533' + and '6222d0ffffb65bf603b285c281887d1975d95e16' + + Monotone-Parent: 1aafadb0f219460ff7d8c59eeb924061abdea533 + Monotone-Parent: 6222d0ffffb65bf603b285c281887d1975d95e16 + Monotone-Revision: 4de8470166df292fcd9ceff9ebe9f6837f051a3e + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-06-04T21:00:15 + Monotone-Branch: ca.inverse.sogo + commit b2073ed833ab0be78e895a956b3f4b87b8492436 Author: C Robert Date: Thu Jun 4 20:59:48 2009 +0000 @@ -75096,6 +88306,22 @@ M ChangeLog M UI/Templates/SchedulerUI/UIxAttendeesEditor.wox M UI/WebServerResources/UIxAttendeesEditor.js +commit 5249c99a81faf6b80c436235459efd361b1c101c +Merge: 2005dc9 6d8fae0 +Author: Wolfgang Sourdeau +Date: Thu Jun 4 19:20:15 2009 +0000 + + merge of '6de0a98067b97567bbcbe8d9bf8d0a0add24b5fa' + and 'cc8f3eae095d7b17561debda2b36946509f78018' + + Monotone-Parent: 6de0a98067b97567bbcbe8d9bf8d0a0add24b5fa + Monotone-Parent: cc8f3eae095d7b17561debda2b36946509f78018 + Monotone-Revision: 1aafadb0f219460ff7d8c59eeb924061abdea533 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-04T19:20:15 + Monotone-Branch: ca.inverse.sogo + commit 2005dc93fd9af13518af7e4f4d6d7c4c32163cdc Author: Wolfgang Sourdeau Date: Thu Jun 4 19:19:56 2009 +0000 @@ -75136,6 +88362,38 @@ Date: Thu Jun 4 18:56:06 2009 +0000 M SoObjects/SOGo/SOGoCache.m +commit 6d8fae0dfc5821ac9db5ad5879713957642ce700 +Merge: 5b8ddf9 32ab285 +Author: C Robert +Date: Thu Jun 4 18:50:47 2009 +0000 + + merge of '356577bd6ef977cadd9399a0edb30ba742cbb425' + and 'ee14e86957da3fdf5320b2589b9d5fb65407d353' + + Monotone-Parent: 356577bd6ef977cadd9399a0edb30ba742cbb425 + Monotone-Parent: ee14e86957da3fdf5320b2589b9d5fb65407d353 + Monotone-Revision: cc8f3eae095d7b17561debda2b36946509f78018 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-06-04T18:50:47 + Monotone-Branch: ca.inverse.sogo + +commit 5b8ddf942bbb0e9d4b916f203718151be6e48cf8 +Merge: 1f0ac38 9306731 +Author: C Robert +Date: Thu Jun 4 18:50:46 2009 +0000 + + merge of '69bdee75f2d2b26ac2ca5a3bb53a6a43becfcb06' + and '7a455791a787acec10f4b9c8249a9f97a36998e0' + + Monotone-Parent: 69bdee75f2d2b26ac2ca5a3bb53a6a43becfcb06 + Monotone-Parent: 7a455791a787acec10f4b9c8249a9f97a36998e0 + Monotone-Revision: 356577bd6ef977cadd9399a0edb30ba742cbb425 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-06-04T18:50:46 + Monotone-Branch: ca.inverse.sogo + commit 93067312ec7008b7e69766c884afe5ca086790f2 Author: C Robert Date: Thu Jun 4 18:50:23 2009 +0000 @@ -75167,6 +88425,22 @@ Date: Thu Jun 4 15:49:08 2009 +0000 M UI/WebServerResources/iefixes.css +commit 1f0ac38a09d254561f5d48d85893c30ee2a31f07 +Merge: 962b296 52a4de6 +Author: Wolfgang Sourdeau +Date: Thu Jun 4 15:35:36 2009 +0000 + + merge of '4ea4003e94bffaaf5b684eeedc97c4f483ce3173' + and '4efc308e378492efdb95420253ab9f2c2b3ab674' + + Monotone-Parent: 4ea4003e94bffaaf5b684eeedc97c4f483ce3173 + Monotone-Parent: 4efc308e378492efdb95420253ab9f2c2b3ab674 + Monotone-Revision: 69bdee75f2d2b26ac2ca5a3bb53a6a43becfcb06 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-04T15:35:36 + Monotone-Branch: ca.inverse.sogo + commit 962b2966c6cb264f737711096cbb0101cf0dfec7 Author: Wolfgang Sourdeau Date: Thu Jun 4 15:34:52 2009 +0000 @@ -75308,6 +88582,22 @@ Date: Thu Jun 4 00:51:47 2009 +0000 M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 6b44861da7cc5b34b8fb8b4673787cda2e8d6235 +Merge: 4e98c44 5f6fb65 +Author: Wolfgang Sourdeau +Date: Thu Jun 4 00:41:08 2009 +0000 + + merge of '2e6ec6866313aade92a1bcb4405a7ef0ff26696c' + and '9b15232c558892eb4787b921845df76e7ed25b71' + + Monotone-Parent: 2e6ec6866313aade92a1bcb4405a7ef0ff26696c + Monotone-Parent: 9b15232c558892eb4787b921845df76e7ed25b71 + Monotone-Revision: f8795baa052d7d5b6da4d6c947c91e65a2da600a + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-04T00:41:08 + Monotone-Branch: ca.inverse.sogo + commit 4e98c44d6ff195b6fc252d107d6ede6f3d5d57c1 Author: Wolfgang Sourdeau Date: Thu Jun 4 00:40:21 2009 +0000 @@ -75432,6 +88722,22 @@ Date: Wed Jun 3 14:46:41 2009 +0000 M ChangeLog +commit 91004d10dd8363c460951e72a9619cd0d976b14d +Merge: e9a951e 69a125b +Author: Wolfgang Sourdeau +Date: Wed Jun 3 14:46:04 2009 +0000 + + merge of 'f5b2544b7b7565841ff64e184b65a5e1cfc12747' + and 'f84e8d517a23517ef7550171fec8fa0d26a53ef2' + + Monotone-Parent: f5b2544b7b7565841ff64e184b65a5e1cfc12747 + Monotone-Parent: f84e8d517a23517ef7550171fec8fa0d26a53ef2 + Monotone-Revision: ec3af19d29d0e15b51deef425f6198af7d672f18 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-06-03T14:46:04 + Monotone-Branch: ca.inverse.sogo + commit e9a951e0418753aaf1878e4ed80a6d4d9b429985 Author: Wolfgang Sourdeau Date: Wed Jun 3 14:34:15 2009 +0000 @@ -75490,6 +88796,22 @@ Date: Tue Jun 2 21:51:17 2009 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentObject.m +commit 0356de03badeb37b079dccd119a982f0c5466fbd +Merge: 5dde98e a366d91 +Author: Francis Lachapelle +Date: Tue Jun 2 19:45:28 2009 +0000 + + merge of '1847862dc21a428caed6adc657748916dc782418' + and '90cccbef5388ee00f07794b49092e47c6767a899' + + Monotone-Parent: 1847862dc21a428caed6adc657748916dc782418 + Monotone-Parent: 90cccbef5388ee00f07794b49092e47c6767a899 + Monotone-Revision: d0922ce075360a9cfb2cbf684f4b1552ebfdb435 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-06-02T19:45:28 + Monotone-Branch: ca.inverse.sogo + commit a366d9150a80736496a1872a8e10543417349348 Author: Francis Lachapelle Date: Tue Jun 2 19:45:07 2009 +0000 @@ -75516,6 +88838,22 @@ M UI/WebServerResources/dtree.js M UI/WebServerResources/generic.js M UI/WebServerResources/iefixes.css +commit 5dde98e2e63923bd3bba2aa9c75e7911986d7407 +Merge: 7c3da75 5a178e6 +Author: C Robert +Date: Tue Jun 2 19:44:28 2009 +0000 + + merge of '3556596e54bd1f81160e5c10120b46259ec240f8' + and 'ab7deac10b2e0f0a2db216131747b63c5f374160' + + Monotone-Parent: 3556596e54bd1f81160e5c10120b46259ec240f8 + Monotone-Parent: ab7deac10b2e0f0a2db216131747b63c5f374160 + Monotone-Revision: 1847862dc21a428caed6adc657748916dc782418 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-06-02T19:44:28 + Monotone-Branch: ca.inverse.sogo + commit 5a178e6392be7097bf8710992fc1891ed3186b12 Author: C Robert Date: Tue Jun 2 19:43:42 2009 +0000 @@ -75531,6 +88869,22 @@ M ChangeLog M UI/Templates/SchedulerUI/UIxAttendeesEditor.wox M UI/WebServerResources/UIxAttendeesEditor.js +commit 3f4b8376af4c36ebc268bf591b960b1e1ba8b3f0 +Merge: c65ca12 7c3da75 +Author: Francis Lachapelle +Date: Tue Jun 2 19:04:01 2009 +0000 + + merge of '1998a97de11b63460cd6ecf4448985e926b5d6d7' + and '3556596e54bd1f81160e5c10120b46259ec240f8' + + Monotone-Parent: 1998a97de11b63460cd6ecf4448985e926b5d6d7 + Monotone-Parent: 3556596e54bd1f81160e5c10120b46259ec240f8 + Monotone-Revision: ac5f8b237dc599527e40ae6ad5333633c8dfffe1 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-06-02T19:04:01 + Monotone-Branch: ca.inverse.sogo + commit 249ac42896ad6187abf6d8bd80f5c7d1bbed28c5 Author: C Robert Date: Tue Jun 2 19:01:58 2009 +0000 @@ -75574,6 +88928,22 @@ M SoObjects/Appointments/SOGoAppointmentFolder.m M SoObjects/SOGo/SOGoObject.m M SoObjects/SOGo/SOGoUser.m +commit 475dec16d0cbc9d5016e67b3c5d745eabb222fcc +Merge: 1f0b289 97ce7fd +Author: C Robert +Date: Tue Jun 2 17:10:58 2009 +0000 + + merge of '653a47a63f4f9fb59c7e85515dd7937dbaa2b23e' + and 'be1804befa03c2b271f09b1fa8f95c0d9877d056' + + Monotone-Parent: 653a47a63f4f9fb59c7e85515dd7937dbaa2b23e + Monotone-Parent: be1804befa03c2b271f09b1fa8f95c0d9877d056 + Monotone-Revision: 5f136163cb35bf4d930f90a158464f4eb5e1d55e + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-06-02T17:10:58 + Monotone-Branch: ca.inverse.sogo + commit 97ce7fd2058b1df5294269cabfc1be8028bfb5d7 Author: C Robert Date: Tue Jun 2 17:10:33 2009 +0000 @@ -75724,6 +89094,22 @@ Date: Tue Jun 2 12:25:11 2009 +0000 M ChangeLog +commit bd830dc011186027528b380295fb449bfdd0d653 +Merge: ac6b020 d6f1ee5 +Author: Ludovic Marcotte +Date: Tue Jun 2 12:24:41 2009 +0000 + + merge of '35bb8c54877a2413065ebbe25721294d096fa5e8' + and '4460dc88c76a37f4ac0d64f2247e8e155254ca11' + + Monotone-Parent: 35bb8c54877a2413065ebbe25721294d096fa5e8 + Monotone-Parent: 4460dc88c76a37f4ac0d64f2247e8e155254ca11 + Monotone-Revision: 1a4c87b6d951f04cfe7725514b38d62ac6e8238d + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-06-02T12:24:41 + Monotone-Branch: ca.inverse.sogo + commit ac6b0209a110b8e54bbd5755dc0540c56fc9f5cc Author: Wolfgang Sourdeau Date: Mon Jun 1 17:59:02 2009 +0000 @@ -75822,6 +89208,22 @@ M ChangeLog M NEWS M SoObjects/Appointments/SOGoCalendarComponent.m +commit 19c49015b3c739ef82d871d18fbe38108ef65850 +Merge: ee92e9b f53dcdd +Author: Francis Lachapelle +Date: Thu May 28 14:43:51 2009 +0000 + + merge of '921a9b22042e960f85ee461f7ad9c020af61974c' + and 'ef6a3721ce15e46898bf17beffc20e0a010566e8' + + Monotone-Parent: 921a9b22042e960f85ee461f7ad9c020af61974c + Monotone-Parent: ef6a3721ce15e46898bf17beffc20e0a010566e8 + Monotone-Revision: 42a3b4e08a22ce3456a4487fd4692b0670fde00f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-05-28T14:43:51 + Monotone-Branch: ca.inverse.sogo + commit ee92e9b29ac83d2c617dc7d71ffb943b4ec90e66 Author: Francis Lachapelle Date: Tue May 26 18:56:49 2009 +0000 @@ -76096,6 +89498,22 @@ M NEWS M SOPE/sope-patchset-r1657.diff M UI/MailPartViewers/UIxMailPartHTMLViewer.m +commit 08c235b4c3b8a3b9d59436138f16646a405d60a9 +Merge: cd49068 b338b36 +Author: Francis Lachapelle +Date: Thu May 21 15:37:21 2009 +0000 + + merge of '08072a021136a28a193b28ee306b59bc5fb87d73' + and '8d83618a18c319c1db3843f81574c79ee5d52430' + + Monotone-Parent: 08072a021136a28a193b28ee306b59bc5fb87d73 + Monotone-Parent: 8d83618a18c319c1db3843f81574c79ee5d52430 + Monotone-Revision: 09c2ef621ffaea633516a58bf226554a1147b8de + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-05-21T15:37:21 + Monotone-Branch: ca.inverse.sogo + commit b338b3696389d9fe32856e47c610598d9a300a4f Author: Francis Lachapelle Date: Thu May 21 15:37:00 2009 +0000 @@ -77003,6 +90421,22 @@ M SoObjects/Contacts/SOGoContactFolders.h M SoObjects/Contacts/SOGoContactGCSFolder.h M UI/SOGoUI/SOGoFolderAdvisory.h +commit b5939c2c8d35d1a6f2fd0fe12420ccdfa31a6a15 +Merge: 6cddea9 cb27add +Author: Wolfgang Sourdeau +Date: Thu Apr 2 18:44:55 2009 +0000 + + merge of '833eb53a6f748d1f0f16e7ff1f05e9c33fe3bad2' + and '9e49c487691fa9cd289dc4f2323bbb118705dfc4' + + Monotone-Parent: 833eb53a6f748d1f0f16e7ff1f05e9c33fe3bad2 + Monotone-Parent: 9e49c487691fa9cd289dc4f2323bbb118705dfc4 + Monotone-Revision: baae213f1298842f132a9ed6584f30ec04446e62 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-04-02T18:44:55 + Monotone-Branch: ca.inverse.sogo + commit cb27add2eb3f0ce98ee86008a60ae83e6f0bf27d Author: Ludovic Marcotte Date: Thu Apr 2 16:01:32 2009 +0000 @@ -77174,6 +90608,22 @@ Date: Tue Mar 31 20:54:59 2009 +0000 M ChangeLog M UI/Scheduler/UIxCalListingActions.m +commit 0bd8e0497ab4eccf49bee19f29618313a71894af +Merge: 09b8865 5daa4fc +Author: Francis Lachapelle +Date: Tue Mar 31 17:00:49 2009 +0000 + + merge of '422473c4584bc3a1c1f5da5b6682434c839478d8' + and 'cc63899386ceb379d80c6b79b929a81724db952b' + + Monotone-Parent: 422473c4584bc3a1c1f5da5b6682434c839478d8 + Monotone-Parent: cc63899386ceb379d80c6b79b929a81724db952b + Monotone-Revision: 7601a3a621aac781d52f82f859021f46513ada82 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-03-31T17:00:49 + Monotone-Branch: ca.inverse.sogo + commit 09b88651193a16622b8cf26c07ca075e45617d43 Author: Ludovic Marcotte Date: Tue Mar 31 14:41:02 2009 +0000 @@ -77266,6 +90716,22 @@ M Documentation/SOGo Installation Guide.odt M UI/Common/UIxPageFrame.m M UI/Templates/UIxPageFrame.wox +commit 56df95bbacc22af0bb827730acad1b6d45296c1e +Merge: e9b5476 7b3af7e +Author: C Robert +Date: Wed Mar 25 15:15:20 2009 +0000 + + merge of '36ced261cec8f0a229c4466b8b7c0a78dd1a408e' + and '9c818b369358da0b25cfcd319b9f6f2d319fb99d' + + Monotone-Parent: 36ced261cec8f0a229c4466b8b7c0a78dd1a408e + Monotone-Parent: 9c818b369358da0b25cfcd319b9f6f2d319fb99d + Monotone-Revision: 3351ea272262d02bca8c04d35cc8b34b0a42118e + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2009-03-25T15:15:20 + Monotone-Branch: ca.inverse.sogo + commit 7b3af7e7f89ddbe38c96aaf7334505e3593d140c Author: Francis Lachapelle Date: Wed Mar 25 14:38:19 2009 +0000 @@ -77308,6 +90774,28 @@ M SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wo M SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html M SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod +commit 279d87a2bd3922298b9e44b3613d5269b86eb2ab +Merge: 5443b78 fbd13eb +Author: Francis Lachapelle +Date: Tue Mar 24 20:51:43 2009 +0000 + + merge of 'c5a0687be6e6c2cb000143fcd5eeaaf90730097d' + and 'd9282e066f50fa8c916a17d4f28da3eb6ffc1411' + + Monotone-Parent: c5a0687be6e6c2cb000143fcd5eeaaf90730097d + Monotone-Parent: d9282e066f50fa8c916a17d4f28da3eb6ffc1411 + Monotone-Revision: 3e59e0c43d322ac5fbc4016256ca84d3ea3a48f4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: ludovic@Sophos.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-24T20:51:43 + Monotone-Date: 2009-03-24T20:52:59 + Monotone-Date: 2009-03-24T20:56:17 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit fbd13ebf7b6cde11f937949f79d27e8a516e3726 Author: Wolfgang Sourdeau Date: Tue Mar 24 20:50:31 2009 +0000 @@ -77339,6 +90827,22 @@ M ChangeLog M UI/MailPartViewers/UIxMailPartICalViewer.m M UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox +commit 011124b6cd6ef66f487f6d7e2988a64e75b8ad94 +Merge: 1508a89 cf3904b +Author: Wolfgang Sourdeau +Date: Tue Mar 24 20:44:50 2009 +0000 + + merge of '5d72cbe984ee92d95ab972816ac529dab70a9143' + and 'c2585f82f4d8e290b032bc65809c929cabaa8389' + + Monotone-Parent: 5d72cbe984ee92d95ab972816ac529dab70a9143 + Monotone-Parent: c2585f82f4d8e290b032bc65809c929cabaa8389 + Monotone-Revision: f2fe2bb08a995eb4ae8043ab64aef1f18a8b3823 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-24T20:44:50 + Monotone-Branch: ca.inverse.sogo + commit cf3904b74eabb7d03d311fb008e222c5d71b3406 Author: Wolfgang Sourdeau Date: Tue Mar 24 20:41:55 2009 +0000 @@ -77408,6 +90912,22 @@ Date: Tue Mar 24 20:11:18 2009 +0000 M UI/Scheduler/UIxComponentEditor.m +commit cb18bab0c688fbd36bd9a953e4a66110b7cc0024 +Merge: 91fb95c 912181b +Author: Wolfgang Sourdeau +Date: Tue Mar 24 20:10:52 2009 +0000 + + merge of '2383d3cfedbdc621439fd847ceb4bddeed43c93e' + and 'cae6414bdec9c9720651a6d880165e55830fd06d' + + Monotone-Parent: 2383d3cfedbdc621439fd847ceb4bddeed43c93e + Monotone-Parent: cae6414bdec9c9720651a6d880165e55830fd06d + Monotone-Revision: 343adae0f9aaa38141d7e8ecb879168e50fff1bf + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-24T20:10:52 + Monotone-Branch: ca.inverse.sogo + commit 912181b3e5796eed8f94c39c075e0c84a3507b89 Author: Wolfgang Sourdeau Date: Tue Mar 24 20:10:46 2009 +0000 @@ -77453,6 +90973,22 @@ M ChangeLog M SoObjects/SOGo/SOGoObject.m M UI/Scheduler/UIxCalMainView.m +commit 0475cc892a5f63468d1ee32e762c18802623019c +Merge: 90190dc cdb2de2 +Author: Wolfgang Sourdeau +Date: Tue Mar 24 16:34:20 2009 +0000 + + merge of '077cf05982d8b328c0c4db80c174a594d7195243' + and '8415886962e2854ead2dc46850882c17f3ddbba8' + + Monotone-Parent: 077cf05982d8b328c0c4db80c174a594d7195243 + Monotone-Parent: 8415886962e2854ead2dc46850882c17f3ddbba8 + Monotone-Revision: e862c091a9e60e7f16da927f0c0c174a7c80dd6f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-24T16:34:20 + Monotone-Branch: ca.inverse.sogo + commit 90190dcef67fc1ad6a28f7986e5cd3471ecb3b4d Author: Wolfgang Sourdeau Date: Tue Mar 24 16:34:03 2009 +0000 @@ -77496,6 +91032,22 @@ Date: Tue Mar 24 16:30:34 2009 +0000 A SOPE/sope-debugleaks.diff +commit cdb2de20a2de073ea81edf8e770992428bf96307 +Merge: 0091947 a94ecb2 +Author: Francis Lachapelle +Date: Tue Mar 24 16:12:34 2009 +0000 + + merge of '54e51821fc9582ce90552a56cae0129864703700' + and 'b30f1d5e86de6b4c8c520767677a2f76f818ce5a' + + Monotone-Parent: 54e51821fc9582ce90552a56cae0129864703700 + Monotone-Parent: b30f1d5e86de6b4c8c520767677a2f76f818ce5a + Monotone-Revision: 8415886962e2854ead2dc46850882c17f3ddbba8 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-03-24T16:12:34 + Monotone-Branch: ca.inverse.sogo + commit 0091947cb439843bebe867376f813ac11a6a0d09 Author: Francis Lachapelle Date: Tue Mar 24 16:12:09 2009 +0000 @@ -77509,6 +91061,22 @@ Date: Tue Mar 24 16:12:09 2009 +0000 M UI/WebServerResources/generic.js +commit a94ecb2e6bdcf98584c2655f2ae378e9d9c81363 +Merge: 4cb373b e1b16d5 +Author: Ludovic Marcotte +Date: Tue Mar 24 15:57:04 2009 +0000 + + merge of '08b58bc681ca962c1a5026adf892bb10e6f4375a' + and 'a25f4f4ec1c0c0f924bd34d29ef261e5fc7a995a' + + Monotone-Parent: 08b58bc681ca962c1a5026adf892bb10e6f4375a + Monotone-Parent: a25f4f4ec1c0c0f924bd34d29ef261e5fc7a995a + Monotone-Revision: b30f1d5e86de6b4c8c520767677a2f76f818ce5a + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-03-24T15:57:04 + Monotone-Branch: ca.inverse.sogo + commit e1b16d537a6dfd234a101b18cc24d680a9c47e62 Author: Ludovic Marcotte Date: Tue Mar 24 15:55:55 2009 +0000 @@ -77574,6 +91142,22 @@ M SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m D SOPE/NGCards/versitCardsSaxDriver/VSStringFormatter.h D SOPE/NGCards/versitCardsSaxDriver/VSStringFormatter.m +commit 2f93cdd60b8b0780c2ef63a42de8f5e7dccb4eb9 +Merge: 34d0f15 290c4c2 +Author: Wolfgang Sourdeau +Date: Tue Mar 24 15:14:36 2009 +0000 + + merge of '2dd0d99b9f9830e90d6186f0b7bd8f21625bdfd5' + and 'cb528ed9e72c06055c7fde882bedd15f7ef64451' + + Monotone-Parent: 2dd0d99b9f9830e90d6186f0b7bd8f21625bdfd5 + Monotone-Parent: cb528ed9e72c06055c7fde882bedd15f7ef64451 + Monotone-Revision: f88d99a5bcea75c289e4a86001d1d294d3dadb9e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-24T15:14:36 + Monotone-Branch: ca.inverse.sogo + commit 290c4c251713d979cd3855d60096a39c4306f218 Author: Wolfgang Sourdeau Date: Tue Mar 24 15:14:20 2009 +0000 @@ -77738,6 +91322,22 @@ Date: Tue Mar 24 00:07:21 2009 +0000 M Documentation/SOGo Mozilla Thunderbird Configuration.odt +commit 6a38a796a278fa443a47a95bdcf3ef6968863120 +Merge: 71d4126 28e34ba +Author: Wolfgang Sourdeau +Date: Mon Mar 23 21:22:11 2009 +0000 + + merge of 'ab9ae63478f08b1ff94c2872ca40ff73a041a9a7' + and 'bf1f76a700dd5013f40d490b2329d5c127f21fbf' + + Monotone-Parent: ab9ae63478f08b1ff94c2872ca40ff73a041a9a7 + Monotone-Parent: bf1f76a700dd5013f40d490b2329d5c127f21fbf + Monotone-Revision: cb528516476836d7575692fe4e1cd2380c58f2d9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-23T21:22:11 + Monotone-Branch: ca.inverse.sogo + commit 71d412614913463c56d6510d64b90a66738eb787 Author: Francis Lachapelle Date: Mon Mar 23 21:19:55 2009 +0000 @@ -77862,6 +91462,22 @@ M SoObjects/SOGo/SOGoUser.h M SoObjects/SOGo/SOGoUser.m M SoObjects/SOGo/SOGoUserDefaults.m +commit a30758a22e6d70bd1de2461707a0891cec9f7f23 +Merge: ab5fa75 da51be0 +Author: Wolfgang Sourdeau +Date: Sun Mar 22 15:00:41 2009 +0000 + + merge of '84411b8b6fbff010342ea44749d83a4f521e3ad7' + and 'ed796ed4ba5a6027433e3f18b4431d54833aeef8' + + Monotone-Parent: 84411b8b6fbff010342ea44749d83a4f521e3ad7 + Monotone-Parent: ed796ed4ba5a6027433e3f18b4431d54833aeef8 + Monotone-Revision: 461db977780298f484dd530f71ae963e7dde1fc4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-22T15:00:41 + Monotone-Branch: ca.inverse.sogo + commit da51be06192a0fe83b8c00ecc87dfca308b35308 Author: Ludovic Marcotte Date: Sun Mar 22 14:40:50 2009 +0000 @@ -77877,6 +91493,22 @@ Date: Sun Mar 22 14:40:50 2009 +0000 M SoObjects/SOGo/SOGoUserDefaults.m +commit ab5fa758107020ba29a259fbdadcc2813e5a5f5d +Merge: 1cf57b6 0c72f5a +Author: Wolfgang Sourdeau +Date: Sun Mar 22 14:24:12 2009 +0000 + + merge of 'c026420c830a2e21becf544b4e0b5d713023a37c' + and 'f7a4e6329dc23e00a3a0de99cd95bb15d432656d' + + Monotone-Parent: c026420c830a2e21becf544b4e0b5d713023a37c + Monotone-Parent: f7a4e6329dc23e00a3a0de99cd95bb15d432656d + Monotone-Revision: 84411b8b6fbff010342ea44749d83a4f521e3ad7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-22T14:24:12 + Monotone-Branch: ca.inverse.sogo + commit 10417c241d3aefd43c5797c82386b2dd046774ce Author: Ludovic Marcotte Date: Sun Mar 22 14:20:50 2009 +0000 @@ -78130,6 +91762,22 @@ Date: Thu Mar 19 19:53:02 2009 +0000 M UI/MainUI/Version +commit a4394cb489c4956b842eece7577587547cb44e1a +Merge: 4cfb2b0 ed59785 +Author: Wolfgang Sourdeau +Date: Thu Mar 19 19:07:54 2009 +0000 + + merge of '2c52bc9062d09379395dae99d6c685de6c8157c9' + and '8dcf465d8b7d8d1213dcce13303ce7aba65a10ff' + + Monotone-Parent: 2c52bc9062d09379395dae99d6c685de6c8157c9 + Monotone-Parent: 8dcf465d8b7d8d1213dcce13303ce7aba65a10ff + Monotone-Revision: 548d3cca58e3fec9bc3c888112b856a577978bec + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-19T19:07:54 + Monotone-Branch: ca.inverse.sogo + commit 4cfb2b0ccd91becfa7816660b70e419ae9019452 Author: Wolfgang Sourdeau Date: Thu Mar 19 19:07:39 2009 +0000 @@ -78301,6 +91949,25 @@ M UI/WebServerResources/SOGoRootPage.css M UI/WebServerResources/SOGoRootPage.js M UI/WebServerResources/iefixes.css +commit ceecaa65639f3e42ac73407a841253f3e5109499 +Merge: aabd65e 1775c0f +Author: Francis Lachapelle +Date: Thu Mar 19 02:15:38 2009 +0000 + + merge of '75e3cd2469a9c4627a182aa0bef3750b8d65a99e' + and 'c94dcb16868ca60cb633c8c91ff225e1f3b84329' + + Monotone-Parent: 75e3cd2469a9c4627a182aa0bef3750b8d65a99e + Monotone-Parent: c94dcb16868ca60cb633c8c91ff225e1f3b84329 + Monotone-Revision: bb83e15abbaa6a9134aefc67b7bb671c74735ea4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-03-19T02:15:38 + Monotone-Date: 2009-03-19T02:38:55 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit 1775c0f11a3d86b123a88dfb45af9cd839c5a8c7 Author: Wolfgang Sourdeau Date: Thu Mar 19 01:48:58 2009 +0000 @@ -78336,6 +92003,22 @@ M Scripts/updates.php M UI/Common/UIxPageFrame.m M UI/WebServerResources/generic.js +commit 744bd14527b0f3a8017d07019ec5388e758d26c6 +Merge: e347f36 7e01998 +Author: Wolfgang Sourdeau +Date: Thu Mar 19 01:22:28 2009 +0000 + + merge of 'a1701b3f7bd858b1fc0810b5313e8648bfcb42f6' + and 'e63db11744055769ff757def864e9770499ad057' + + Monotone-Parent: a1701b3f7bd858b1fc0810b5313e8648bfcb42f6 + Monotone-Parent: e63db11744055769ff757def864e9770499ad057 + Monotone-Revision: b17886dc9b84e4662186fb632398245956c8d684 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-19T01:22:28 + Monotone-Branch: ca.inverse.sogo + commit e347f36a5b578b4bc497561f18373db2ab734af0 Author: Wolfgang Sourdeau Date: Thu Mar 19 01:22:09 2009 +0000 @@ -78506,6 +92189,22 @@ Date: Tue Mar 17 19:46:46 2009 +0000 M UI/WebServerResources/SOGoDragHandles.js +commit fce6da51b23c841c0810723264a54f296c478de8 +Merge: d8fa403 70c0c0d +Author: Francis Lachapelle +Date: Tue Mar 17 19:40:38 2009 +0000 + + merge of '29e166422a510e7b1ca9fef597f49aa7ffed17d6' + and 'b516b07191501368df1dfb16f25aee4b4fba7941' + + Monotone-Parent: 29e166422a510e7b1ca9fef597f49aa7ffed17d6 + Monotone-Parent: b516b07191501368df1dfb16f25aee4b4fba7941 + Monotone-Revision: cc6154915db42f1f14c162c6819d08d12c31b6c3 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-03-17T19:40:38 + Monotone-Branch: ca.inverse.sogo + commit 70c0c0d919dae45acd247eb3f4aa85311c60de03 Author: Francis Lachapelle Date: Tue Mar 17 19:38:05 2009 +0000 @@ -78663,6 +92362,22 @@ Date: Mon Mar 16 18:26:08 2009 +0000 M ChangeLog M SoObjects/SOGo/LDAPSource.m +commit 5faf904b4a3fc574731d400ade8d475983dc9f59 +Merge: 8cd55ea c3bc74e +Author: Wolfgang Sourdeau +Date: Fri Mar 13 22:55:00 2009 +0000 + + merge of '0bd8de88352206932cbf2a15ae603a90b79e6e44' + and 'b4cdf2c0fe2ace70d873c007f3fd15f64aa0f91a' + + Monotone-Parent: 0bd8de88352206932cbf2a15ae603a90b79e6e44 + Monotone-Parent: b4cdf2c0fe2ace70d873c007f3fd15f64aa0f91a + Monotone-Revision: 0a9ebb81d46a0321c166273fb763ad39c233cc50 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-13T22:55:00 + Monotone-Branch: ca.inverse.sogo + commit c3bc74e1165aee3bfa2e201b14ed04c8701feedf Author: Ludovic Marcotte Date: Fri Mar 13 19:48:15 2009 +0000 @@ -78712,6 +92427,22 @@ Date: Thu Mar 12 21:52:56 2009 +0000 M ChangeLog +commit a4c353f7b24e41aafd9f538b75b0750113c9940e +Merge: a799603 cf47f74 +Author: Francis Lachapelle +Date: Thu Mar 12 21:51:57 2009 +0000 + + merge of '070042ab40f01de7dd4a39f28e1a9a445232baf0' + and 'be9bb27ba55086a4f9fcfffba7d8a0df9a6cdde2' + + Monotone-Parent: 070042ab40f01de7dd4a39f28e1a9a445232baf0 + Monotone-Parent: be9bb27ba55086a4f9fcfffba7d8a0df9a6cdde2 + Monotone-Revision: 7b1b22a765a78529ec87496fb491debd695fa9a4 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-03-12T21:51:57 + Monotone-Branch: ca.inverse.sogo + commit a7996034ed95b5ba68c00fe53553d9a3943765fd Author: Francis Lachapelle Date: Thu Mar 12 21:49:15 2009 +0000 @@ -78727,6 +92458,22 @@ Date: Thu Mar 12 21:49:15 2009 +0000 M UI/WebServerResources/SOGoDragHandles.js +commit 8cd55ea9ab79da146c5019bc8dcf92a6c24a8fe8 +Merge: 74bc491 cf47f74 +Author: Wolfgang Sourdeau +Date: Thu Mar 12 21:26:46 2009 +0000 + + merge of '59c4b0746cb2313cef5fff230f8824a9d48a2ee1' + and 'be9bb27ba55086a4f9fcfffba7d8a0df9a6cdde2' + + Monotone-Parent: 59c4b0746cb2313cef5fff230f8824a9d48a2ee1 + Monotone-Parent: be9bb27ba55086a4f9fcfffba7d8a0df9a6cdde2 + Monotone-Revision: 0bd8de88352206932cbf2a15ae603a90b79e6e44 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-12T21:26:46 + Monotone-Branch: ca.inverse.sogo + commit 74bc491e8eb70c27c9f71d9d9e90bee15c5b9d7d Author: Francis Lachapelle Date: Thu Mar 12 21:11:22 2009 +0000 @@ -78828,6 +92575,22 @@ Date: Thu Mar 12 16:30:32 2009 +0000 M ChangeLog M SOPE/sope-patchset-r1630.diff +commit 78aa8621f3cfa48b4e5c87796ff1b7705300ebc8 +Merge: 38bb5c8 6a9b459 +Author: Francis Lachapelle +Date: Thu Mar 12 14:30:28 2009 +0000 + + merge of '3055240bcbfdf1f126dd4c98383756015fe19b9f' + and '55e9652c81aeb3099b52fdacfebe185b63106ee9' + + Monotone-Parent: 3055240bcbfdf1f126dd4c98383756015fe19b9f + Monotone-Parent: 55e9652c81aeb3099b52fdacfebe185b63106ee9 + Monotone-Revision: 1493f36a1d4949d61e2af0b02cdc11d672b14313 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-03-12T14:30:28 + Monotone-Branch: ca.inverse.sogo + commit 38bb5c88c242dbe791887cd7ce89e87e2a83d4b5 Author: Ludovic Marcotte Date: Wed Mar 11 17:59:49 2009 +0000 @@ -78859,6 +92622,22 @@ Date: Wed Mar 11 14:59:24 2009 +0000 M Scripts/sogo-init.d-debian +commit b8f49dbbcff133ffe1b1cf502bb98d88553b9a79 +Merge: 208d480 a7f2ace +Author: Francis Lachapelle +Date: Wed Mar 11 14:33:12 2009 +0000 + + merge of '28c05bb78bef144b921bd396d723df3160a6cd68' + and '86480ce562df131383c834ebb7c0a2f353871e18' + + Monotone-Parent: 28c05bb78bef144b921bd396d723df3160a6cd68 + Monotone-Parent: 86480ce562df131383c834ebb7c0a2f353871e18 + Monotone-Revision: 1928b52441789ad4d83520e6d27fb7faa2f30d88 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-03-11T14:33:12 + Monotone-Branch: ca.inverse.sogo + commit 7664654e4200aafc803c35f861fa1e8edfdc06fd Author: Ludovic Marcotte Date: Wed Mar 11 13:39:20 2009 +0000 @@ -78923,6 +92702,22 @@ Date: Sun Mar 8 18:51:48 2009 +0000 M ChangeLog M Documentation/SOGo Mozilla Thunderbird Configuration.odt +commit a7f2ace5696a777a09a17e600ced89a250ce36ed +Merge: 3fc8b43 c809594 +Author: Francis Lachapelle +Date: Sat Mar 7 05:07:34 2009 +0000 + + merge of '0bc570e01ac30760257738a29e0d780e964f4a8a' + and '59c71248aa4b7df383ccdc570db26b7c829d9378' + + Monotone-Parent: 0bc570e01ac30760257738a29e0d780e964f4a8a + Monotone-Parent: 59c71248aa4b7df383ccdc570db26b7c829d9378 + Monotone-Revision: 86480ce562df131383c834ebb7c0a2f353871e18 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-03-07T05:07:34 + Monotone-Branch: ca.inverse.sogo + commit 0837840ee8256c0f83236cdeb0e4edb139c3d52c Author: Ludovic Marcotte Date: Fri Mar 6 21:12:42 2009 +0000 @@ -79055,6 +92850,38 @@ Date: Mon Mar 2 21:47:38 2009 +0000 M UI/WebServerResources/SOGoRootPage.js +commit c809594f0d499774acfb3b64e81c8884f57f38b2 +Merge: b63d4f2 2b685ae +Author: Francis Lachapelle +Date: Mon Mar 2 21:07:14 2009 +0000 + + merge of '8c77afb1abc1cfa1e4e6fdd86195aca95b508f1a' + and 'b3a500aa833d95b94e57f01645279aeda5ad3587' + + Monotone-Parent: 8c77afb1abc1cfa1e4e6fdd86195aca95b508f1a + Monotone-Parent: b3a500aa833d95b94e57f01645279aeda5ad3587 + Monotone-Revision: 59c71248aa4b7df383ccdc570db26b7c829d9378 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-03-02T21:07:14 + Monotone-Branch: ca.inverse.sogo + +commit ccaa70b407eb929dc07e4d763b6eb604cc238e7b +Merge: 9e7ed29 f8c711f +Author: Wolfgang Sourdeau +Date: Mon Mar 2 21:04:10 2009 +0000 + + merge of '6810c56ec0938b566b7b3956334cdf42acad581b' + and 'faae591447bb2bc51c88baef80263d6f3c92e155' + + Monotone-Parent: 6810c56ec0938b566b7b3956334cdf42acad581b + Monotone-Parent: faae591447bb2bc51c88baef80263d6f3c92e155 + Monotone-Revision: 85f1f53db7cb67b3254c177bab77b5c13ab8a76f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-03-02T21:04:10 + Monotone-Branch: ca.inverse.sogo + commit f8c711f79928c4c70d02328e5afeeb51dd96a4e1 Author: Wolfgang Sourdeau Date: Mon Mar 2 21:04:05 2009 +0000 @@ -79406,6 +93233,22 @@ Date: Tue Feb 17 15:45:11 2009 +0000 M UI/MainUI/Dutch.lproj/Localizable.strings +commit e083b172a59184c628d52b3e7609df2ebca44348 +Merge: b61af0d 7259259 +Author: Francis Lachapelle +Date: Tue Feb 17 14:32:01 2009 +0000 + + merge of '2f7a28daecee683c728795ff5c395625b556ef41' + and 'b1fef274eded93af1afedb293db6a9921fadf828' + + Monotone-Parent: 2f7a28daecee683c728795ff5c395625b556ef41 + Monotone-Parent: b1fef274eded93af1afedb293db6a9921fadf828 + Monotone-Revision: 8eeffcb9ea4f7a73e85cdf5a8beb099d10547947 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-02-17T14:32:01 + Monotone-Branch: ca.inverse.sogo + commit 72592597ca9dd0237d9ab727a94cb922ae435d9c Author: Francis Lachapelle Date: Tue Feb 17 14:30:49 2009 +0000 @@ -79445,6 +93288,22 @@ M UI/MainUI/Dutch.lproj/Localizable.strings M UI/PreferencesUI/Dutch.lproj/Localizable.strings M UI/Scheduler/Dutch.lproj/Localizable.strings +commit 9af71076f99df467153f29877dedf033ec668f8d +Merge: 9dcdca5 9d9e5c0 +Author: Wolfgang Sourdeau +Date: Mon Feb 9 21:17:12 2009 +0000 + + merge of '06def9332cbc52ec43917206f7800e487623419f' + and '4716c9e3a88b72ca631ad4d08c69388764bf28d5' + + Monotone-Parent: 06def9332cbc52ec43917206f7800e487623419f + Monotone-Parent: 4716c9e3a88b72ca631ad4d08c69388764bf28d5 + Monotone-Revision: d964b6374c8b995e67d8bce06f4be5855ceb1428 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-02-09T21:17:12 + Monotone-Branch: ca.inverse.sogo + commit 9dcdca57cd3763bfbb555f3a2307f2df225ca239 Author: Wolfgang Sourdeau Date: Mon Feb 9 21:16:36 2009 +0000 @@ -79459,6 +93318,22 @@ Date: Mon Feb 9 21:16:36 2009 +0000 M ChangeLog M SoObjects/Contacts/SOGoContactLDAPFolder.m +commit 9d9e5c0e55dd1074ef5b34ab3c057cf9e9282f8c +Merge: 2a7d8ee ba0c3d7 +Author: Francis Lachapelle +Date: Sat Feb 7 00:20:02 2009 +0000 + + merge of 'be11ede9b39c76d3a71c05143a448ab27a83a818' + and 'f0542255e31c3d8ac8c2d9b48083294de7e0308c' + + Monotone-Parent: be11ede9b39c76d3a71c05143a448ab27a83a818 + Monotone-Parent: f0542255e31c3d8ac8c2d9b48083294de7e0308c + Monotone-Revision: 4716c9e3a88b72ca631ad4d08c69388764bf28d5 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-02-07T00:20:02 + Monotone-Branch: ca.inverse.sogo + commit 2a7d8eec6527242281b690af5fafd018f40a750e Author: Francis Lachapelle Date: Sat Feb 7 00:18:34 2009 +0000 @@ -79593,6 +93468,22 @@ M UI/Contacts/UIxContactsListView.m M UI/Templates/ContactsUI/UIxContactsListView.wox M UI/WebServerResources/ContactsUI.js +commit c2635c9eba5af816c7aeac51381f0110a4305bba +Merge: 268f98e 6b7a5ad +Author: Wolfgang Sourdeau +Date: Fri Feb 6 20:08:32 2009 +0000 + + merge of '911b87d5ac8f4df7258d042280cb3980cc12fe69' + and 'af42841d84124923cafdae4a868fe032b8f07d79' + + Monotone-Parent: 911b87d5ac8f4df7258d042280cb3980cc12fe69 + Monotone-Parent: af42841d84124923cafdae4a868fe032b8f07d79 + Monotone-Revision: efd9926cc2f7cfa8385ca79896abdf82e8b16d59 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-02-06T20:08:32 + Monotone-Branch: ca.inverse.sogo + commit 6b7a5ad682e3ca30c103681d1e4a166f5df30600 Author: Wolfgang Sourdeau Date: Fri Feb 6 20:04:50 2009 +0000 @@ -79706,6 +93597,38 @@ Date: Fri Jan 30 18:58:03 2009 +0000 A Documentation/sogo.png +commit de540c17c3f657cf60e9a4693a2027a1e098561d +Merge: 885e9ca 03d1ec8 +Author: Francis Lachapelle +Date: Fri Jan 30 18:41:46 2009 +0000 + + merge of '61e9cb8576de573c854c03bbed61f9f0833b714a' + and '9cdec2953442f16223c2835dd7f7487efbc08e64' + + Monotone-Parent: 61e9cb8576de573c854c03bbed61f9f0833b714a + Monotone-Parent: 9cdec2953442f16223c2835dd7f7487efbc08e64 + Monotone-Revision: 9ca40f8edea449c724ab6a94b878dd7987baa893 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-01-30T18:41:46 + Monotone-Branch: ca.inverse.sogo + +commit 885e9ca83e79113961391ce7566c843dc051691d +Merge: b6dbad4 186c928 +Author: Francis Lachapelle +Date: Fri Jan 30 18:36:37 2009 +0000 + + merge of '82087f596ce21e5f1429ebdcd23716275fd27ae6' + and 'd0b65904d35c40a58f8bf4f778436dba5d1706dd' + + Monotone-Parent: 82087f596ce21e5f1429ebdcd23716275fd27ae6 + Monotone-Parent: d0b65904d35c40a58f8bf4f778436dba5d1706dd + Monotone-Revision: 61e9cb8576de573c854c03bbed61f9f0833b714a + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-01-30T18:36:37 + Monotone-Branch: ca.inverse.sogo + commit 03d1ec86dbc1ecf0fc2033ac943be39725e8be0e Author: Ludovic Marcotte Date: Fri Jan 30 18:34:31 2009 +0000 @@ -79832,6 +93755,22 @@ M ChangeLog M SoObjects/SOGo/SOGoGCSFolder.m M UI/Common/WODirectAction+SOGo.m +commit 5df65bd7828a960c3b47e75e826461f3940a232d +Merge: 5828611 cb170b3 +Author: Francis Lachapelle +Date: Tue Jan 20 23:18:27 2009 +0000 + + merge of '3010ebbe1277877fbfa6abfb4321d877aab63b77' + and '6771ebf82f86870516a9141b516edcd3538741ba' + + Monotone-Parent: 3010ebbe1277877fbfa6abfb4321d877aab63b77 + Monotone-Parent: 6771ebf82f86870516a9141b516edcd3538741ba + Monotone-Revision: 21911317257c6ad395e78e56a3d125fc4be404e6 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-01-20T23:18:27 + Monotone-Branch: ca.inverse.sogo + commit cb170b3c35efbead62eacb5c1818cb4e067fbb85 Author: Francis Lachapelle Date: Tue Jan 20 20:50:47 2009 +0000 @@ -79864,6 +93803,22 @@ Date: Tue Jan 20 19:57:56 2009 +0000 M Documentation/SOGo Installation Guide.odt +commit 5828611a09c32762c5cdc799c996ca91d738247d +Merge: 70ad540 97ec5fd +Author: Ludovic Marcotte +Date: Tue Jan 20 19:24:28 2009 +0000 + + merge of 'cedb7ff755d548fba20667453e2f57687b9f0c69' + and 'd9c6f196efed8f1e880b51537ffdc6f0cfd54fe5' + + Monotone-Parent: cedb7ff755d548fba20667453e2f57687b9f0c69 + Monotone-Parent: d9c6f196efed8f1e880b51537ffdc6f0cfd54fe5 + Monotone-Revision: 3010ebbe1277877fbfa6abfb4321d877aab63b77 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2009-01-20T19:24:28 + Monotone-Branch: ca.inverse.sogo + commit 97ec5fd8cecff7e498bc2616961bf8e2697c1268 Author: Ludovic Marcotte Date: Tue Jan 20 19:23:09 2009 +0000 @@ -79938,6 +93893,22 @@ M SoObjects/SOGo/NSString+Utilities.h M SoObjects/SOGo/NSString+Utilities.m M UI/WebServerResources/JavascriptAPIExtensions.js +commit d2f68c3b48c0aaf3bd49a59a9131529f1c7700a0 +Merge: a55cb99 ee00e63 +Author: Wolfgang Sourdeau +Date: Tue Jan 13 20:41:38 2009 +0000 + + merge of '8f10a117c2f432bdcc1ea03aecbe4854d53449ee' + and 'af789fd2e2a4e534fd7125c5adc6956afb527781' + + Monotone-Parent: 8f10a117c2f432bdcc1ea03aecbe4854d53449ee + Monotone-Parent: af789fd2e2a4e534fd7125c5adc6956afb527781 + Monotone-Revision: 62e39c3bdb32b49561def293946775b53c6ec7a8 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-01-13T20:41:38 + Monotone-Branch: ca.inverse.sogo + commit ee00e635ee34309789ea9934f147a69d50e6a04a Author: Wolfgang Sourdeau Date: Tue Jan 13 20:39:56 2009 +0000 @@ -80016,6 +93987,22 @@ Date: Tue Jan 13 00:08:16 2009 +0000 M UI/Scheduler/French.lproj/Localizable.strings +commit a7afca257eca139c02c147206f03826d39ca5cc3 +Merge: 1076f87 4176730 +Author: Francis Lachapelle +Date: Mon Jan 12 23:58:46 2009 +0000 + + merge of '8ba8b3fa9da7cc4d1b86cc06f7f6907b8f8e56f7' + and 'b3bd45e420720798687eac0aee6758ecefab1487' + + Monotone-Parent: 8ba8b3fa9da7cc4d1b86cc06f7f6907b8f8e56f7 + Monotone-Parent: b3bd45e420720798687eac0aee6758ecefab1487 + Monotone-Revision: 7d318403d9fb30ae3156447d2ba6eb707f654fce + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-01-12T23:58:46 + Monotone-Branch: ca.inverse.sogo + commit 1076f87b0773da29ca3dc18722437b9e8fe3b7b6 Author: Francis Lachapelle Date: Mon Jan 12 23:58:39 2009 +0000 @@ -80091,6 +94078,22 @@ Date: Wed Jan 7 22:57:27 2009 +0000 M ChangeLog A Documentation/SOGo Mozilla Thunderbird Configuration.odt +commit c8982ea65aa71a76b9bb977c0a50e8091ba1d189 +Merge: 440b119 bf41202 +Author: Francis Lachapelle +Date: Wed Jan 7 21:02:17 2009 +0000 + + merge of '4810e3862e96fcf14dc360590c88655b590f0bfb' + and '6f223777cd797453d0eec5b1c41883e2dcef69f4' + + Monotone-Parent: 4810e3862e96fcf14dc360590c88655b590f0bfb + Monotone-Parent: 6f223777cd797453d0eec5b1c41883e2dcef69f4 + Monotone-Revision: f9a39419cc4da040f8e1136267280dfec67710b9 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2009-01-07T21:02:17 + Monotone-Branch: ca.inverse.sogo + commit 440b11984559b9db699847a1baa92beb953b3329 Author: Francis Lachapelle Date: Wed Jan 7 21:01:16 2009 +0000 @@ -80171,6 +94174,25 @@ M ChangeLog M UI/Scheduler/UIxAppointmentEditor.m M UI/Scheduler/UIxComponentEditor.m +commit 79d2eb30dd3192ffcbacf498964fbb17523ee5c9 +Merge: 97cedb6 4deba12 +Author: Francis Lachapelle +Date: Wed Jan 7 16:46:25 2009 +0000 + + merge of '7dbd8709dbd0912d12d3ffd82df6d64d900a28b6' + and 'bab2062ac2f3f3078377ef0d19e780ee5ea5e068' + + Monotone-Parent: 7dbd8709dbd0912d12d3ffd82df6d64d900a28b6 + Monotone-Parent: bab2062ac2f3f3078377ef0d19e780ee5ea5e068 + Monotone-Revision: 886f71d2861cb6d59b81ebbddad0f7edee83e3c7 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2009-01-07T16:46:25 + Monotone-Date: 2009-01-07T16:48:02 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit 4deba12358b4108b178688e9b35e610a4edb91b8 Author: Wolfgang Sourdeau Date: Wed Jan 7 16:45:15 2009 +0000 @@ -80283,6 +94305,22 @@ Date: Wed Dec 31 17:43:20 2008 +0000 M UI/Scheduler/UIxCalListingActions.m +commit 965857ad8042a739cb3eaf44894af3bc4d789fd0 +Merge: 0fe7a9d 024a567 +Author: Wolfgang Sourdeau +Date: Wed Dec 31 04:10:26 2008 +0000 + + merge of '08c3123324ab89795cc2faa5f26bd5427cd30786' + and 'be94621e6c7d7ae0610925c213a0fc8f46eb30e9' + + Monotone-Parent: 08c3123324ab89795cc2faa5f26bd5427cd30786 + Monotone-Parent: be94621e6c7d7ae0610925c213a0fc8f46eb30e9 + Monotone-Revision: 7d16f254344611b08352a256acdce727a91c6718 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-12-31T04:10:26 + Monotone-Branch: ca.inverse.sogo + commit 024a567d1af5e154cb00be795f4179afdcf9245a Author: Wolfgang Sourdeau Date: Wed Dec 31 02:57:54 2008 +0000 @@ -80587,6 +94625,22 @@ M SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wo M SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html M SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod +commit fbbccbe99569cb681d77c0f1aad6c9d2c84fc9d3 +Merge: a621eae 6ffc48d +Author: Ludovic Marcotte +Date: Fri Dec 19 23:09:25 2008 +0000 + + merge of '04f60742d08acd7e35bf71da06a72013e783118c' + and '594291b61ba62cd40f6c3250f748a5fe7b2514a3' + + Monotone-Parent: 04f60742d08acd7e35bf71da06a72013e783118c + Monotone-Parent: 594291b61ba62cd40f6c3250f748a5fe7b2514a3 + Monotone-Revision: 85bab6959b5681b31089aa2b3aec261a5e8b505f + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-12-19T23:09:25 + Monotone-Branch: ca.inverse.sogo + commit 6ffc48d2793c41d8db6496504e3e2c5d4fcac7d1 Author: Ludovic Marcotte Date: Fri Dec 19 23:04:26 2008 +0000 @@ -80602,6 +94656,22 @@ Date: Fri Dec 19 23:04:26 2008 +0000 M SoObjects/Appointments/SOGoAppointmentObject.m +commit a621eae38f2dfc0fedb9de7c644ab5c662d1d356 +Merge: 7f602d5 e7f3926 +Author: Francis Lachapelle +Date: Fri Dec 19 22:14:37 2008 +0000 + + merge of '792193186b20895dc235fa98dc63de1a0ece0a8f' + and 'bac00846545ecbaa355017083f8a425f751077c7' + + Monotone-Parent: 792193186b20895dc235fa98dc63de1a0ece0a8f + Monotone-Parent: bac00846545ecbaa355017083f8a425f751077c7 + Monotone-Revision: 04f60742d08acd7e35bf71da06a72013e783118c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-12-19T22:14:37 + Monotone-Branch: ca.inverse.sogo + commit 7f602d5dbaa98539e5b3a0b730509466164337bf Author: Francis Lachapelle Date: Fri Dec 19 22:14:02 2008 +0000 @@ -80794,6 +94864,38 @@ Date: Fri Dec 19 16:13:29 2008 +0000 M SOPE/GDLContentStore/GCSChannelManager.m +commit 3504c9f9f09145182c6c4d824964102351c590b6 +Merge: 64eb68a 6bcb367 +Author: Wolfgang Sourdeau +Date: Fri Dec 19 16:10:01 2008 +0000 + + merge of 'bc6abe537500d635cea12c3c4f611e68d4c2d725' + and 'e867a018c3076e9e2cf662e96d7cac3352bb8789' + + Monotone-Parent: bc6abe537500d635cea12c3c4f611e68d4c2d725 + Monotone-Parent: e867a018c3076e9e2cf662e96d7cac3352bb8789 + Monotone-Revision: 0e2919955b47e1a2673f50f4effe7af1a813db59 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-12-19T16:10:01 + Monotone-Branch: ca.inverse.sogo + +commit 64eb68a085776a3a7cc376613ad1880323873865 +Merge: a0b81f4 60c96ee +Author: Francis Lachapelle +Date: Fri Dec 19 02:41:46 2008 +0000 + + merge of '0187913e6e236a3a8a3a4cf66bf61a25d3cde321' + and '9b0d550ad7ecf3304e02f47b720a4aed7b1b3ce0' + + Monotone-Parent: 0187913e6e236a3a8a3a4cf66bf61a25d3cde321 + Monotone-Parent: 9b0d550ad7ecf3304e02f47b720a4aed7b1b3ce0 + Monotone-Revision: bc6abe537500d635cea12c3c4f611e68d4c2d725 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-12-19T02:41:46 + Monotone-Branch: ca.inverse.sogo + commit 60c96ee1051b4ba82e6727150cb6a803312a0edc Author: Francis Lachapelle Date: Fri Dec 19 02:40:24 2008 +0000 @@ -80944,6 +95046,22 @@ M ChangeLog M UI/Scheduler/UIxAppointmentEditor.m M UI/Scheduler/UIxComponentEditor.m +commit d1835209f73aa8e1afc938c2f16784b6d0c79562 +Merge: ad6d40b e8346b5 +Author: Wolfgang Sourdeau +Date: Wed Dec 17 13:45:53 2008 +0000 + + merge of '2f965a12f5d7a6534d7420384246c30f0c8a4bda' + and 'e485b1c09e36d4173f7845bec12d40de808f3c3b' + + Monotone-Parent: 2f965a12f5d7a6534d7420384246c30f0c8a4bda + Monotone-Parent: e485b1c09e36d4173f7845bec12d40de808f3c3b + Monotone-Revision: 56159df9717624adf99da2f21377b40d435b1db7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-12-17T13:45:53 + Monotone-Branch: ca.inverse.sogo + commit ad6d40bd15b61eccadb8785ca484c2285d882c7a Author: Wolfgang Sourdeau Date: Mon Dec 15 23:03:04 2008 +0000 @@ -80958,6 +95076,22 @@ Date: Mon Dec 15 23:03:04 2008 +0000 M ChangeLog M SoObjects/SOGo/SOGoObject.m +commit 4a43370a9143f572682bc191a376bb206b9c9155 +Merge: 030e229 084a17d +Author: Wolfgang Sourdeau +Date: Mon Dec 15 22:28:32 2008 +0000 + + merge of 'c8d084db03459d614e6031f3b3996696f8a588b4' + and 'e3d03c71b23436eb1ba6f15cfccc6c59a06df891' + + Monotone-Parent: c8d084db03459d614e6031f3b3996696f8a588b4 + Monotone-Parent: e3d03c71b23436eb1ba6f15cfccc6c59a06df891 + Monotone-Revision: b1078ea4dae02277bdf66ea5ad2e7fcdb26dc259 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-12-15T22:28:32 + Monotone-Branch: ca.inverse.sogo + commit 084a17d3bc940ce6f220c6a734d5aac8851c53dd Author: Wolfgang Sourdeau Date: Mon Dec 15 22:27:45 2008 +0000 @@ -81128,6 +95262,22 @@ Date: Sun Dec 14 15:47:01 2008 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 5cb08d85b1b31b47c1e6424ae3a23084070d5645 +Merge: 4f18914 72efdaa +Author: Ludovic Marcotte +Date: Sun Dec 14 15:37:55 2008 +0000 + + merge of '795ed6a3f28d9a8fa693fa6e21822111e70c29e7' + and '8373ee4a182606382fcb3aea7864b142db4aaa95' + + Monotone-Parent: 795ed6a3f28d9a8fa693fa6e21822111e70c29e7 + Monotone-Parent: 8373ee4a182606382fcb3aea7864b142db4aaa95 + Monotone-Revision: a1b75d2a857673c942b21ee08d20b78d221c52df + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-12-14T15:37:55 + Monotone-Branch: ca.inverse.sogo + commit 72efdaa9a10dba5518c9b8537d029400abed3e1c Author: Wolfgang Sourdeau Date: Fri Dec 12 18:55:12 2008 +0000 @@ -81145,6 +95295,22 @@ M SoObjects/SOGo/LDAPUserManager.m M SoObjects/SOGo/SOGoCache.m M configure +commit 4f18914a644235617e2106fc3067f93f178486b6 +Merge: 8a0a73b 5f04a77 +Author: Francis Lachapelle +Date: Fri Dec 12 18:44:44 2008 +0000 + + merge of 'fd79ef01a0501707aa8528f31eb9128418310ceb' + and 'ff27cb5c0c118c485e7cf9d8e62d4428edafdb32' + + Monotone-Parent: fd79ef01a0501707aa8528f31eb9128418310ceb + Monotone-Parent: ff27cb5c0c118c485e7cf9d8e62d4428edafdb32 + Monotone-Revision: 795ed6a3f28d9a8fa693fa6e21822111e70c29e7 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-12-12T18:44:44 + Monotone-Branch: ca.inverse.sogo + commit 8a0a73be964abeaba293637fbba184eae18e9a9e Author: Francis Lachapelle Date: Fri Dec 12 18:44:07 2008 +0000 @@ -81259,6 +95425,22 @@ Date: Thu Dec 11 17:25:19 2008 +0000 M UI/WebServerResources/SchedulerUI.js +commit 6d59731fe2da2cee776ed0986bb5c5236ead45d1 +Merge: f37eeac e40e82c +Author: Wolfgang Sourdeau +Date: Thu Dec 11 16:45:53 2008 +0000 + + merge of '894fc668494f3ff87fbd4e784b35d68564b8d482' + and 'f6a2b7a59b97cc24c9e22e0a5b0e131bdcf23204' + + Monotone-Parent: 894fc668494f3ff87fbd4e784b35d68564b8d482 + Monotone-Parent: f6a2b7a59b97cc24c9e22e0a5b0e131bdcf23204 + Monotone-Revision: 9b6f0c65763b57f4f4f3198f2400f943060f7bb4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-12-11T16:45:53 + Monotone-Branch: ca.inverse.sogo + commit f37eeac57396645c951472304b730b853ffbbb7c Author: Wolfgang Sourdeau Date: Thu Dec 11 16:45:39 2008 +0000 @@ -81564,6 +95746,25 @@ Date: Wed Dec 3 01:36:57 2008 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit a9f94fbfbd3b92edd88e44316a12bcda8bf04498 +Merge: 6d826be fdabc48 +Author: Francis Lachapelle +Date: Tue Dec 2 20:13:44 2008 +0000 + + merge of '67d8b9dd5560b0fe74b28e933a26f5555a9cad04' + and '8a7076e816120408558e4add54151b80aeeb69d8' + + Monotone-Parent: 67d8b9dd5560b0fe74b28e933a26f5555a9cad04 + Monotone-Parent: 8a7076e816120408558e4add54151b80aeeb69d8 + Monotone-Revision: ca77b33237a4a7e175057093f4f695d8170e5f1c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-12-02T20:13:44 + Monotone-Date: 2008-12-02T21:04:23 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit fdabc48820ff07676c9eacfecd79f1ea520cd490 Author: Ludovic Marcotte Date: Tue Dec 2 12:27:41 2008 +0000 @@ -81670,6 +95871,22 @@ Date: Mon Dec 1 21:34:04 2008 +0000 M ChangeLog +commit 2556db1887f861d9b369e608d5c1e47e72923897 +Merge: e95d7fa 2582979 +Author: Francis Lachapelle +Date: Mon Dec 1 21:15:29 2008 +0000 + + merge of '1306bcb572d16a67199e32e625572c3430d39626' + and 'c44d651c982e7aefb1a028f246dcc968eeefaa79' + + Monotone-Parent: 1306bcb572d16a67199e32e625572c3430d39626 + Monotone-Parent: c44d651c982e7aefb1a028f246dcc968eeefaa79 + Monotone-Revision: be3a69319a721514c55dc1723be3091485efcaa6 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-12-01T21:15:29 + Monotone-Branch: ca.inverse.sogo + commit 2582979066452a4bdc0cb9624b7387a15fb8ab1c Author: Francis Lachapelle Date: Mon Dec 1 21:15:07 2008 +0000 @@ -81742,6 +95959,22 @@ Date: Sat Nov 29 17:46:33 2008 +0000 M SoObjects/SOGo/SOGoContentObject.m +commit b678b11e9ea0a1011ac7a108af7bc6557f968d3f +Merge: 7c7cd2a 6e33a6e +Author: Wolfgang Sourdeau +Date: Sat Nov 29 17:20:54 2008 +0000 + + merge of 'a19b3dadb613f792f2b5d328cba633f92a37f444' + and 'b9edf052394d895a535d32fccecba31ed057fd61' + + Monotone-Parent: a19b3dadb613f792f2b5d328cba633f92a37f444 + Monotone-Parent: b9edf052394d895a535d32fccecba31ed057fd61 + Monotone-Revision: 162dd535bb3f333402e6c71f49cd3dc84644980c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-11-29T17:20:54 + Monotone-Branch: ca.inverse.sogo + commit 6e33a6eaa1b24a6868013f9d3f6b36c7a013f5bd Author: Ludovic Marcotte Date: Sat Nov 29 13:17:52 2008 +0000 @@ -82076,6 +96309,22 @@ Date: Mon Nov 24 04:10:23 2008 +0000 M SoObjects/SOGo/SOGoUserFolder.m +commit 2b3b9463733686830ce7ad04027038f703ab37f8 +Merge: cdaba0e cb1677d +Author: Wolfgang Sourdeau +Date: Mon Nov 24 01:54:23 2008 +0000 + + merge of '834fb725cc2c056023365e8279ac4c8fd1d4a94c' + and '954bbdf61ee55d8e6a99433cfdb3a5c432584796' + + Monotone-Parent: 834fb725cc2c056023365e8279ac4c8fd1d4a94c + Monotone-Parent: 954bbdf61ee55d8e6a99433cfdb3a5c432584796 + Monotone-Revision: 7c7c9b116a1f28737cae823a0f0dac6a60894f7e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-11-24T01:54:23 + Monotone-Branch: ca.inverse.sogo + commit cb1677d3a9fca67bdbcb8f82050ff82951365ac9 Author: Wolfgang Sourdeau Date: Mon Nov 24 01:54:12 2008 +0000 @@ -82146,6 +96395,22 @@ Date: Sun Nov 23 08:31:05 2008 +0000 M SoObjects/SOGo/LDAPSource.m +commit 433f77b3f9f17ffec71d44821f2c358e7ee42758 +Merge: 42f3b1a ff9a299 +Author: Wolfgang Sourdeau +Date: Sun Nov 23 04:41:53 2008 +0000 + + merge of 'd5b97dd613695b722316f9c4bf4e5d35241a832e' + and 'fe15a52bbb65b7147dfd596fd4f0791b716d1b26' + + Monotone-Parent: d5b97dd613695b722316f9c4bf4e5d35241a832e + Monotone-Parent: fe15a52bbb65b7147dfd596fd4f0791b716d1b26 + Monotone-Revision: 8da6944da23a276437481d8c96d487e4866d9634 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-11-23T04:41:53 + Monotone-Branch: ca.inverse.sogo + commit 42f3b1af8001fe89393f3fc407cafabb09c6ad7d Author: Ludovic Marcotte Date: Sat Nov 22 21:52:40 2008 +0000 @@ -82381,6 +96646,22 @@ Date: Wed Nov 12 16:12:23 2008 +0000 M SoObjects/Appointments/SOGoAppointmentFolder.m M SoObjects/Appointments/iCalEvent+SOGo.m +commit 5580d545372ca54f32d47af12bcda2f804565a14 +Merge: 4941275 16663f7 +Author: Francis Lachapelle +Date: Wed Nov 12 16:11:16 2008 +0000 + + merge of 'afb54e0e3680201763787e929aeb5bdb376b0543' + and 'f4de6456480257d599ff854178e02cb6bb3aea4e' + + Monotone-Parent: afb54e0e3680201763787e929aeb5bdb376b0543 + Monotone-Parent: f4de6456480257d599ff854178e02cb6bb3aea4e + Monotone-Revision: aadd417d36fb0c041ee85a89145a87cc634d7aeb + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-11-12T16:11:16 + Monotone-Branch: ca.inverse.sogo + commit 49412759b835519b4db6760557a00bbf915d7bf0 Author: Ludovic Marcotte Date: Wed Nov 12 03:30:13 2008 +0000 @@ -82418,6 +96699,22 @@ M ChangeLog M SoObjects/SOGo/SOGoCache.m M SoObjects/SOGo/SOGoUser.m +commit 16663f79ebe0c16231956200333f9be479609e8c +Merge: 9c57907 79a3ff7 +Author: Francis Lachapelle +Date: Tue Nov 11 19:44:54 2008 +0000 + + merge of '467ec5f1f0997ec12a4adbf6bc501ee81735cbdb' + and '790b33ceff613dad77f7fc62c8319beafc6bf5ad' + + Monotone-Parent: 467ec5f1f0997ec12a4adbf6bc501ee81735cbdb + Monotone-Parent: 790b33ceff613dad77f7fc62c8319beafc6bf5ad + Monotone-Revision: f4de6456480257d599ff854178e02cb6bb3aea4e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-11-11T19:44:54 + Monotone-Branch: ca.inverse.sogo + commit 9c57907bcf73f4e2656904343ccc91fbaa7f2307 Author: Ludovic Marcotte Date: Tue Nov 11 03:04:22 2008 +0000 @@ -82499,6 +96796,22 @@ D SoObjects/SOGo/SOGoUserManager.h D SoObjects/SOGo/SOGoUserManager.m M SoObjects/SOGo/SOGoWebAuthenticator.m +commit 79a3ff7dff5eaa6607cb65e82ffe381f7ef4fe56 +Merge: 75e7e92 be4e239 +Author: Francis Lachapelle +Date: Mon Nov 10 19:45:45 2008 +0000 + + merge of '21357db79071c6bb6bb16eb3c8570464c85cbea9' + and 'f570fda8096334f1267b8f01d59732c4fa9943c6' + + Monotone-Parent: 21357db79071c6bb6bb16eb3c8570464c85cbea9 + Monotone-Parent: f570fda8096334f1267b8f01d59732c4fa9943c6 + Monotone-Revision: 790b33ceff613dad77f7fc62c8319beafc6bf5ad + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-11-10T19:45:45 + Monotone-Branch: ca.inverse.sogo + commit be4e239537d0095b42fcd7c43fd20b934edc5d77 Author: Ludovic Marcotte Date: Mon Nov 10 16:32:24 2008 +0000 @@ -82514,6 +96827,22 @@ Date: Mon Nov 10 16:32:24 2008 +0000 M SoObjects/SOGo/SOGoUserDefaults.m +commit 6c711923f8520e481dd9f73b337b416516f51e74 +Merge: ce7a04c 4abe791 +Author: Ludovic Marcotte +Date: Mon Nov 10 16:04:52 2008 +0000 + + merge of '3788093156db6417b60bcf6e46c839e8ce8781a8' + and 'ee7adf911df75af83b62839ef6965b5e4ed7cc8b' + + Monotone-Parent: 3788093156db6417b60bcf6e46c839e8ce8781a8 + Monotone-Parent: ee7adf911df75af83b62839ef6965b5e4ed7cc8b + Monotone-Revision: c5b69aa2e99f9ed31beb8040542e5ebcf91bc2f6 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-11-10T16:04:52 + Monotone-Branch: ca.inverse.sogo + commit 4abe7913449adc3e1893a268151e7e230d2030e3 Author: Ludovic Marcotte Date: Mon Nov 10 16:01:35 2008 +0000 @@ -83046,6 +97375,22 @@ M SoObjects/Appointments/SOGoAppointmentFolder.m M SoObjects/Contacts/SOGoFolder+CardDAV.m M SoObjects/SOGo/SOGoUserFolder.m +commit ddfba84ebe00abb1f0a71e2e7c7d3f001d205b36 +Merge: c99479e 6d1aa93 +Author: Francis Lachapelle +Date: Tue Oct 21 21:59:43 2008 +0000 + + merge of '5f7a29adfa72a5c2257226be59358d6ef7642557' + and 'add28d9d67adcd6d59ae80bdec669e2794e55fc3' + + Monotone-Parent: 5f7a29adfa72a5c2257226be59358d6ef7642557 + Monotone-Parent: add28d9d67adcd6d59ae80bdec669e2794e55fc3 + Monotone-Revision: f14f194e02808a128112c1844ba759925e48c6e7 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-10-21T21:59:43 + Monotone-Branch: ca.inverse.sogo + commit c99479eece1d5189d190fea7ed963db285b04eae Author: Francis Lachapelle Date: Tue Oct 21 21:58:59 2008 +0000 @@ -83134,6 +97479,22 @@ M SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalRe M SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html M SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html +commit 01550ab6bb74911a315f00026f3c9487731be967 +Merge: 39af916 d6f7a53 +Author: Francis Lachapelle +Date: Mon Oct 20 15:24:51 2008 +0000 + + merge of '7b8ed9c4b20f7511d8c8423f497d9006d548729d' + and 'c188de330d668938c84bba685aabd793abbfbe6a' + + Monotone-Parent: 7b8ed9c4b20f7511d8c8423f497d9006d548729d + Monotone-Parent: c188de330d668938c84bba685aabd793abbfbe6a + Monotone-Revision: ad935d05acb272f749720110ffa0a03bb52d220d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-10-20T15:24:51 + Monotone-Branch: ca.inverse.sogo + commit 39af916d688b351c10aed3b2b8321c31e06f08db Author: Ludovic Marcotte Date: Mon Oct 20 14:04:09 2008 +0000 @@ -83325,6 +97686,22 @@ M ChangeLog M OGoContentStore/OCSContactFieldExtractor.m M UI/Contacts/UIxContactEditor.m +commit 2a28f07821fb14c84c513116b71fa22ddbb78a8e +Merge: 993fc69 98c3449 +Author: Francis Lachapelle +Date: Wed Oct 15 15:08:12 2008 +0000 + + merge of '77c8b4de9ced789f1bc229519470e879b316a239' + and 'e831b47e5e76168e9bb7b9172e518e7d8c871173' + + Monotone-Parent: 77c8b4de9ced789f1bc229519470e879b316a239 + Monotone-Parent: e831b47e5e76168e9bb7b9172e518e7d8c871173 + Monotone-Revision: b32a3736b939af117ea6ccc7b8ce477cdc8c0b90 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-10-15T15:08:12 + Monotone-Branch: ca.inverse.sogo + commit 993fc69f8110c5c96d6ae96335ccf5c8cf85ec6b Author: Francis Lachapelle Date: Wed Oct 15 15:07:17 2008 +0000 @@ -83381,6 +97758,31 @@ Date: Wed Oct 15 14:40:40 2008 +0000 M UI/WebServerResources/prototype.js +commit cfbdbbc60463d7cc027dac8d419ec5ad3a69e4d0 +Merge: 2a5fd5f eb400fd +Author: C Robert +Date: Tue Oct 14 21:21:09 2008 +0000 + + merge of 'addd7d5e87d3a58601c005b2b25baaecc4ac4ece' + and 'f47bc809420338973f9f0d1ab2dabcacc7019252' + + Monotone-Parent: addd7d5e87d3a58601c005b2b25baaecc4ac4ece + Monotone-Parent: f47bc809420338973f9f0d1ab2dabcacc7019252 + Monotone-Revision: 35aeb39a4ff1d311050f0ab6cc5002f6896f9572 + + Monotone-Author: crobert@inverse.ca + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: ludovic@Sophos.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-10-14T21:21:09 + Monotone-Date: 2008-10-14T23:00:25 + Monotone-Date: 2008-10-15T04:02:54 + Monotone-Date: 2008-10-15T14:21:17 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit eb400fd2e5311f5be9ec950ff0a9a48957a9e175 Author: C Robert Date: Tue Oct 14 21:18:52 2008 +0000 @@ -83515,6 +97917,22 @@ Date: Thu Oct 9 20:38:43 2008 +0000 M UI/WebServerResources/MailerUI.js +commit 5b119cf5d2e8bd01f0b9fad7ef457c75d26fae20 +Merge: dbfd64e 6e4e8ce +Author: C Robert +Date: Thu Oct 9 19:59:45 2008 +0000 + + merge of 'ae19f5b80b87d9f63b4068d2a027a9fdb3190efb' + and 'c5a2fc082a5c244225c25cf41b83bbc018f79a6d' + + Monotone-Parent: ae19f5b80b87d9f63b4068d2a027a9fdb3190efb + Monotone-Parent: c5a2fc082a5c244225c25cf41b83bbc018f79a6d + Monotone-Revision: 6c373f0d20463d992f29e12a75b931b08f890301 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2008-10-09T19:59:45 + Monotone-Branch: ca.inverse.sogo + commit 6e4e8cea2d0bab4ac1d895c4ea786e3322dc3f69 Author: C Robert Date: Thu Oct 9 19:59:05 2008 +0000 @@ -83561,6 +97979,22 @@ Date: Thu Oct 9 18:45:09 2008 +0000 M UI/WebServerResources/generic.css +commit ae51dbe6ea3d4c98ac20264bfdf586153f32d4b0 +Merge: fdd7a36 9ec8e8c +Author: Francis Lachapelle +Date: Thu Oct 9 18:44:02 2008 +0000 + + merge of '2294f2d1071cb09dc3b530c8183183338ceee302' + and '8abd92fe532be14683eafa92d990c2fce38a7365' + + Monotone-Parent: 2294f2d1071cb09dc3b530c8183183338ceee302 + Monotone-Parent: 8abd92fe532be14683eafa92d990c2fce38a7365 + Monotone-Revision: ca39f4c4b9b67b5d8fd268ec4322f18de2d255ca + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-10-09T18:44:02 + Monotone-Branch: ca.inverse.sogo + commit 9ec8e8c4fc7217396d3efd9384f0d56ceab190ba Author: Wolfgang Sourdeau Date: Thu Oct 9 18:39:03 2008 +0000 @@ -83576,6 +98010,22 @@ M UI/Templates/MailerUI/UIxMailMainFrame.wox D UI/WebServerResources/MailerUI+dTree.js A UI/WebServerResources/MailerUIdTree.js +commit fdd7a365f2c398ec553fb610bef0e787bf666df4 +Merge: 1378a58 6ab5cfa +Author: Francis Lachapelle +Date: Thu Oct 9 18:37:16 2008 +0000 + + merge of '32ab392d3b7d226db707f5c0a95d358eb0d5d4de' + and 'a1a0f6f62f6d3e023e2fadcfe803aad3abadef82' + + Monotone-Parent: 32ab392d3b7d226db707f5c0a95d358eb0d5d4de + Monotone-Parent: a1a0f6f62f6d3e023e2fadcfe803aad3abadef82 + Monotone-Revision: 2294f2d1071cb09dc3b530c8183183338ceee302 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-10-09T18:37:16 + Monotone-Branch: ca.inverse.sogo + commit 1378a588a34f91767971cbf32a6f128f5e4ea7fb Author: Francis Lachapelle Date: Thu Oct 9 17:53:57 2008 +0000 @@ -83633,6 +98083,22 @@ M UI/MailerUI/UIxMailListView.h M UI/MailerUI/UIxMailListView.m M UI/Templates/MailerUI/UIxMailListView.wox +commit 2e96324ecd06f803f6be453beb5856fb84613957 +Merge: aecb5ac 9e86043 +Author: Ludovic Marcotte +Date: Wed Oct 8 17:05:18 2008 +0000 + + merge of '3550dd70ecbb9d12c44ec69561f97a455b714c93' + and 'ac68ed83f444da4e4bab62959d53aad8ed53ff55' + + Monotone-Parent: 3550dd70ecbb9d12c44ec69561f97a455b714c93 + Monotone-Parent: ac68ed83f444da4e4bab62959d53aad8ed53ff55 + Monotone-Revision: 4b5ba0c0b794837c553c64a3c5e55717bd636b7b + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-10-08T17:05:18 + Monotone-Branch: ca.inverse.sogo + commit 9e860430f45924d49e05f36dcabb94f8cfe85251 Author: Ludovic Marcotte Date: Wed Oct 8 16:25:30 2008 +0000 @@ -83753,6 +98219,22 @@ Date: Fri Oct 3 20:26:26 2008 +0000 M UI/WebServerResources/MailerUI.js +commit ca7db145047b0853f13189cf2c45c3039f4b2e10 +Merge: 95c83d6 5205349 +Author: C Robert +Date: Fri Oct 3 19:02:21 2008 +0000 + + merge of '32554661a85cc9243d30ced4dbf571eab59b4ea3' + and 'ca98d833495a056f00e1887f18b6cd51c1d538ae' + + Monotone-Parent: 32554661a85cc9243d30ced4dbf571eab59b4ea3 + Monotone-Parent: ca98d833495a056f00e1887f18b6cd51c1d538ae + Monotone-Revision: df09cb53adc84e0b77ac22ce38dfb6e89498ea33 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2008-10-03T19:02:21 + Monotone-Branch: ca.inverse.sogo + commit 95c83d64e70e9c888b023d74d2cf42448659d9ea Author: C Robert Date: Fri Oct 3 19:01:29 2008 +0000 @@ -83775,6 +98257,22 @@ M UI/MailerUI/product.plist M UI/WebServerResources/MailerUI.js M UI/WebServerResources/generic.css +commit 5205349cc5dccb69c947c256dbfa59d6f4096d73 +Merge: 4109cf5 86ee245 +Author: Wolfgang Sourdeau +Date: Fri Oct 3 15:59:18 2008 +0000 + + merge of '22a0204fbcb44500dd41a225b263a8be90401353' + and 'd23ffdb26b88012981424a2080e8ef01316372e0' + + Monotone-Parent: 22a0204fbcb44500dd41a225b263a8be90401353 + Monotone-Parent: d23ffdb26b88012981424a2080e8ef01316372e0 + Monotone-Revision: ca98d833495a056f00e1887f18b6cd51c1d538ae + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-10-03T15:59:18 + Monotone-Branch: ca.inverse.sogo + commit 86ee24564d62087f4e4333dc2637ab69fd3b06ce Author: Wolfgang Sourdeau Date: Fri Oct 3 15:59:05 2008 +0000 @@ -84179,6 +98677,22 @@ D SoObjects/Appointments/SOGoAptMailUpdate.m M SoObjects/Appointments/SOGoCalendarComponent.h M SoObjects/Appointments/SOGoCalendarComponent.m +commit 2c519a90e38d0e8fbb355ca25fa0258065308aeb +Merge: e09eec8 8c7462d +Author: Wolfgang Sourdeau +Date: Wed Oct 1 19:28:52 2008 +0000 + + merge of 'b84ca21f54ec505423ddc672466227a9afdc3cba' + and 'bfae2ff43f2db27d9a48b21e22064193cb575260' + + Monotone-Parent: b84ca21f54ec505423ddc672466227a9afdc3cba + Monotone-Parent: bfae2ff43f2db27d9a48b21e22064193cb575260 + Monotone-Revision: eb4066dbb2d4884ebc2bc331edf7b31b88a6a893 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-10-01T19:28:52 + Monotone-Branch: ca.inverse.sogo + commit 8c7462d0bff29833587c260aa343dd4de45d9e2d Author: Ludovic Marcotte Date: Wed Oct 1 16:24:45 2008 +0000 @@ -84316,6 +98830,22 @@ Date: Tue Sep 30 16:51:13 2008 +0000 M NEWS +commit 95ee964274a38a011fb095aced3be262d85edb53 +Merge: fddcee9 9e96291 +Author: Wolfgang Sourdeau +Date: Tue Sep 30 16:50:07 2008 +0000 + + merge of 'c31687d1f15f8f1be580514cd252776e204a1b65' + and 'd44c77e73da2480ce01afa441c8a2705f220ae25' + + Monotone-Parent: c31687d1f15f8f1be580514cd252776e204a1b65 + Monotone-Parent: d44c77e73da2480ce01afa441c8a2705f220ae25 + Monotone-Revision: 701785bc094e6e0cc71468721c162b7ddd82fda5 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-09-30T16:50:07 + Monotone-Branch: ca.inverse.sogo + commit fddcee9a48db5f5dee8617e8e1abc64348c61554 Author: Wolfgang Sourdeau Date: Tue Sep 30 16:46:53 2008 +0000 @@ -84431,6 +98961,41 @@ M SoObjects/Mailer/SOGoMailItalianReply.wo/SOGoMailItalianReply.wod M SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.html M SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.wod +commit 78493a07f34f863cc3cac0ae2bc1499d187bbe89 +Merge: 342a039 bc1b2a4 +Author: C Robert +Date: Mon Sep 29 19:45:42 2008 +0000 + + merge of 'a91fdc0311ce32c507f4f0c447904b80ca61e876' + and 'd378eb61291cd07a2168a877719d71f7f92f3a38' + + Monotone-Parent: a91fdc0311ce32c507f4f0c447904b80ca61e876 + Monotone-Parent: d378eb61291cd07a2168a877719d71f7f92f3a38 + Monotone-Revision: e8f4e2f61f45b6dd1478f6cd53e4f2528bf7c047 + + Monotone-Author: crobert@inverse.ca + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-29T19:45:42 + Monotone-Date: 2008-09-29T20:45:53 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + +commit 342a039ee77ecdbbbfb876b5ad2fb0813827b967 +Merge: 08ff142 e69d7b4 +Author: Francis Lachapelle +Date: Mon Sep 29 14:36:59 2008 +0000 + + merge of 'b5081fb240f719d3a1ce2583dff3738a9ceb9d93' + and 'f3553f7157471c92e062fbcc05707ec8f12c2df5' + + Monotone-Parent: b5081fb240f719d3a1ce2583dff3738a9ceb9d93 + Monotone-Parent: f3553f7157471c92e062fbcc05707ec8f12c2df5 + Monotone-Revision: a91fdc0311ce32c507f4f0c447904b80ca61e876 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-09-29T14:36:59 + Monotone-Branch: ca.inverse.sogo + commit e69d7b412512a97b03e3312bb073a6f87da5f239 Author: Francis Lachapelle Date: Mon Sep 29 14:36:18 2008 +0000 @@ -84459,6 +99024,22 @@ Date: Sun Sep 28 22:39:41 2008 +0000 M UI/PreferencesUI/French.lproj/Localizable.strings +commit 08ff1428cc7aa6ba83d2edb5c0a77f35b0175209 +Merge: a828b04 6d10c61 +Author: C Robert +Date: Sun Sep 28 19:49:39 2008 +0000 + + merge of '1d1c945ea058db7070c9b83c4c2bb60689c52f92' + and '74d6ae3bf39677a7d5083301f1c29c74b97b84dd' + + Monotone-Parent: 1d1c945ea058db7070c9b83c4c2bb60689c52f92 + Monotone-Parent: 74d6ae3bf39677a7d5083301f1c29c74b97b84dd + Monotone-Revision: b5081fb240f719d3a1ce2583dff3738a9ceb9d93 + + Monotone-Author: crobert@inverse.ca + Monotone-Date: 2008-09-28T19:49:39 + Monotone-Branch: ca.inverse.sogo + commit a828b049de898e814b420ec04134fa357a3daf18 Author: C Robert Date: Sun Sep 28 19:49:17 2008 +0000 @@ -85105,6 +99686,22 @@ Date: Thu Sep 18 18:20:26 2008 +0000 M UI/WebServerResources/SchedulerUI.css +commit c14e055d55db681575748e3d6e9e26aabb09cfe0 +Merge: effcc61 8c1813b +Author: Wolfgang Sourdeau +Date: Thu Sep 18 18:06:27 2008 +0000 + + merge of '131c53568d20b4a69d219487e3b929e8eb85c659' + and '4a4fbde667da9c301d01687c66ff392bca9d1658' + + Monotone-Parent: 131c53568d20b4a69d219487e3b929e8eb85c659 + Monotone-Parent: 4a4fbde667da9c301d01687c66ff392bca9d1658 + Monotone-Revision: bf32f1aad764cf9906d8a6a4eeecba627f4991dc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-09-18T18:06:27 + Monotone-Branch: ca.inverse.sogo + commit effcc61416a579350a1583325a20a1750fff1c63 Author: Wolfgang Sourdeau Date: Thu Sep 18 18:05:27 2008 +0000 @@ -85131,6 +99728,22 @@ Date: Thu Sep 18 18:05:18 2008 +0000 M SOPE/sope-patchset-r1626.diff +commit 8c1813b019f9f34437cfa78c6dc1ff921601095f +Merge: fcfb2c3 1d455ff +Author: Francis Lachapelle +Date: Thu Sep 18 18:04:16 2008 +0000 + + merge of '6fed1c4d16e6a86a4b38ab7174119068a10f5ede' + and 'd3036531db8d8c0e298e79e7bba85298dba88acd' + + Monotone-Parent: 6fed1c4d16e6a86a4b38ab7174119068a10f5ede + Monotone-Parent: d3036531db8d8c0e298e79e7bba85298dba88acd + Monotone-Revision: 4a4fbde667da9c301d01687c66ff392bca9d1658 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-09-18T18:04:16 + Monotone-Branch: ca.inverse.sogo + commit fcfb2c32004dc9dae4c55a40d6498d56a2f8c188 Author: Francis Lachapelle Date: Thu Sep 18 18:03:59 2008 +0000 @@ -85510,6 +100123,22 @@ M UI/MailerUI/product.plist M UI/WebServerResources/MailerUI.css M UI/WebServerResources/MailerUI.js +commit ee8570423a216085e0b9c83b167b58d246626970 +Merge: 22c8a20 32fb01d +Author: Ludovic Marcotte +Date: Fri Sep 5 18:00:24 2008 +0000 + + merge of '117181687b89cc111fa7c80b6e0a5fb5d9e8a5af' + and '38c27767c4a6419b76e05bfc2eefc158b009bf28' + + Monotone-Parent: 117181687b89cc111fa7c80b6e0a5fb5d9e8a5af + Monotone-Parent: 38c27767c4a6419b76e05bfc2eefc158b009bf28 + Monotone-Revision: 55136d300cf8d13c53cb1e7978c4915fba81f463 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-05T18:00:24 + Monotone-Branch: ca.inverse.sogo + commit 32fb01df552235771158db2df4de11e3a5ffdcdc Author: Wolfgang Sourdeau Date: Fri Sep 5 17:06:21 2008 +0000 @@ -85628,6 +100257,22 @@ Date: Fri Sep 5 15:29:42 2008 +0000 M ChangeLog M SoObjects/Mailer/SOGoMailObject+Draft.m +commit 1e66ea9912f0b187c60b88c35f96d3dd50291a1d +Merge: 2e51a1d 818055d +Author: Ludovic Marcotte +Date: Fri Sep 5 15:12:44 2008 +0000 + + merge of '7a60f4a9ba785405e4cc33bb708c1870090f6691' + and 'c9c5d4c2459dece2bf7417926d244b1088f86576' + + Monotone-Parent: 7a60f4a9ba785405e4cc33bb708c1870090f6691 + Monotone-Parent: c9c5d4c2459dece2bf7417926d244b1088f86576 + Monotone-Revision: 2073217aff674fdde9b98866ce5d367033d6a51e + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-05T15:12:44 + Monotone-Branch: ca.inverse.sogo + commit 6978ea95c5597e2fb477d1933d1680c5722c69ed Author: Wolfgang Sourdeau Date: Fri Sep 5 15:10:39 2008 +0000 @@ -85668,6 +100313,54 @@ Date: Fri Sep 5 15:07:24 2008 +0000 M ChangeLog M SoObjects/Mailer/SOGoMailObject+Draft.m +commit 818055dc0b41dd2665afac8b40c5c732c799e154 +Merge: 32c6ff0 2ed9162 +Author: Ludovic Marcotte +Date: Fri Sep 5 15:03:02 2008 +0000 + + merge of '465796f786a1b25ed73a3ba4064f4a51bf6f3a62' + and '64aa83e8cd0a166c047f31a255fba032c405fbf9' + + Monotone-Parent: 465796f786a1b25ed73a3ba4064f4a51bf6f3a62 + Monotone-Parent: 64aa83e8cd0a166c047f31a255fba032c405fbf9 + Monotone-Revision: c9c5d4c2459dece2bf7417926d244b1088f86576 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-05T15:03:02 + Monotone-Branch: ca.inverse.sogo + +commit 32c6ff0179aea5bc599f2e8200a3c3ad55ac5da2 +Merge: 0e15044 85c5069 +Author: Ludovic Marcotte +Date: Fri Sep 5 13:40:42 2008 +0000 + + merge of '2b06dc463d88e9e0940158ceccab067e7cc497f7' + and '78183d1c12a5cd7f7980683cdf75c55d9cc453c6' + + Monotone-Parent: 2b06dc463d88e9e0940158ceccab067e7cc497f7 + Monotone-Parent: 78183d1c12a5cd7f7980683cdf75c55d9cc453c6 + Monotone-Revision: 465796f786a1b25ed73a3ba4064f4a51bf6f3a62 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-05T13:40:42 + Monotone-Branch: ca.inverse.sogo + +commit 85c50693ab1421d4f7b500b3f9e689fb4b793f14 +Merge: 6978ea9 f31c9e5 +Author: Ludovic Marcotte +Date: Fri Sep 5 13:26:55 2008 +0000 + + merge of '054094f9b080f4f9f4cda29e0be81cf14681bb8e' + and '5a3756ce927fd4f5ebc0d146f6dd71d1c08f81b9' + + Monotone-Parent: 054094f9b080f4f9f4cda29e0be81cf14681bb8e + Monotone-Parent: 5a3756ce927fd4f5ebc0d146f6dd71d1c08f81b9 + Monotone-Revision: 78183d1c12a5cd7f7980683cdf75c55d9cc453c6 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-05T13:26:55 + Monotone-Branch: ca.inverse.sogo + commit 3bf2abab41c7178f5ea34be2cb10de1836ea6be2 Author: Wolfgang Sourdeau Date: Fri Sep 5 13:12:58 2008 +0000 @@ -85695,6 +100388,38 @@ Date: Fri Sep 5 11:43:32 2008 +0000 M UI/WebServerResources/SOGoDragHandles.js +commit f31c9e54bd40a805db82696b3393f74154d394de +Merge: 3bf2aba 3782d28 +Author: Ludovic Marcotte +Date: Fri Sep 5 11:26:37 2008 +0000 + + merge of 'd0dc408cde2d2c26295711b91f59760222260c54' + and 'dbb95940faf0aead19daf176f22e0cd18debcef3' + + Monotone-Parent: d0dc408cde2d2c26295711b91f59760222260c54 + Monotone-Parent: dbb95940faf0aead19daf176f22e0cd18debcef3 + Monotone-Revision: 5a3756ce927fd4f5ebc0d146f6dd71d1c08f81b9 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-05T11:26:37 + Monotone-Branch: ca.inverse.sogo + +commit 3782d2871cdcd97d5cab684c11cc0ecaa4f2987b +Merge: 9a32abe 721d3fc +Author: Ludovic Marcotte +Date: Fri Sep 5 09:41:03 2008 +0000 + + merge of '0d9ecc5eae4ad9933bd54376cd8a7db508e6e0cb' + and '2c72d8da724d85fd836b547156f6c653ebb44991' + + Monotone-Parent: 0d9ecc5eae4ad9933bd54376cd8a7db508e6e0cb + Monotone-Parent: 2c72d8da724d85fd836b547156f6c653ebb44991 + Monotone-Revision: dbb95940faf0aead19daf176f22e0cd18debcef3 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-05T09:41:03 + Monotone-Branch: ca.inverse.sogo + commit 721d3fc61bbc50935dc76e825713c316424c285e Author: Wolfgang Sourdeau Date: Fri Sep 5 03:00:10 2008 +0000 @@ -85708,6 +100433,22 @@ Date: Fri Sep 5 03:00:10 2008 +0000 M UI/Templates/MailerUI/UIxMailListView.wox +commit a34edc3169c5848f4572836dae718208aa91851b +Merge: 4eac9ac b6ac93a +Author: Wolfgang Sourdeau +Date: Fri Sep 5 02:39:04 2008 +0000 + + merge of '721baf81426a46990c5c456d170347f03f502d1f' + and 'c4c5e180ad8506d04424626e6382fcd5b2b6a073' + + Monotone-Parent: 721baf81426a46990c5c456d170347f03f502d1f + Monotone-Parent: c4c5e180ad8506d04424626e6382fcd5b2b6a073 + Monotone-Revision: b68bf00d72134acbc6e4d38e8249c1c370f4da8d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-09-05T02:39:04 + Monotone-Branch: ca.inverse.sogo + commit 4eac9ac1e39bbbc8f96a654513594c1a9141d6bf Author: Wolfgang Sourdeau Date: Fri Sep 5 02:38:51 2008 +0000 @@ -85784,6 +100525,22 @@ Date: Fri Sep 5 00:19:21 2008 +0000 M ChangeLog M UI/MailPartViewers/UIxMailRenderingContext.m +commit 9a32abead52d17167854bfee23e68ecfe3cee6f8 +Merge: 76b90c0 32046a6 +Author: Ludovic Marcotte +Date: Thu Sep 4 18:46:49 2008 +0000 + + merge of '1360315b4068f2b44ac3bf8d5c6a78084349c0bb' + and '485f88abf48cd4cfca19756b2d50e4d01f48ed95' + + Monotone-Parent: 1360315b4068f2b44ac3bf8d5c6a78084349c0bb + Monotone-Parent: 485f88abf48cd4cfca19756b2d50e4d01f48ed95 + Monotone-Revision: 0d9ecc5eae4ad9933bd54376cd8a7db508e6e0cb + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-04T18:46:49 + Monotone-Branch: ca.inverse.sogo + commit 32046a6d2e338a94b6a59183fe3431ff27daf81a Author: Wolfgang Sourdeau Date: Thu Sep 4 05:49:39 2008 +0000 @@ -85824,6 +100581,22 @@ Date: Thu Sep 4 04:31:59 2008 +0000 M UI/MailerUI/UIxMailView.m +commit 76b90c0eee888a4ed730e127159dae344cb4425f +Merge: fd6598a 5e55bde +Author: Ludovic Marcotte +Date: Wed Sep 3 19:29:16 2008 +0000 + + merge of '34eb92128b8ce40ea590eedcbe2b203f173bb8f9' + and '350058ff37111e646407d97db552b5f4c9e96f90' + + Monotone-Parent: 34eb92128b8ce40ea590eedcbe2b203f173bb8f9 + Monotone-Parent: 350058ff37111e646407d97db552b5f4c9e96f90 + Monotone-Revision: 1360315b4068f2b44ac3bf8d5c6a78084349c0bb + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-03T19:29:16 + Monotone-Branch: ca.inverse.sogo + commit fd6598a238fb7bbf033df9051c311315800ec0f4 Author: Wolfgang Sourdeau Date: Wed Sep 3 18:45:37 2008 +0000 @@ -85876,6 +100649,22 @@ Date: Wed Sep 3 12:50:51 2008 +0000 M UI/WebServerResources/MailerUI.js +commit 31208282adf20062411122322a3548fc52ce9934 +Merge: 6eab653 d7bc373 +Author: Francis Lachapelle +Date: Wed Sep 3 00:59:38 2008 +0000 + + merge of '99cc1bb593f4002d820b712345f3e8c1c9ba44ba' + and 'f3e67d9e89a56392eda98a27376616f0434cdfc3' + + Monotone-Parent: 99cc1bb593f4002d820b712345f3e8c1c9ba44ba + Monotone-Parent: f3e67d9e89a56392eda98a27376616f0434cdfc3 + Monotone-Revision: 745a249bd7392c99ed5da0cfe7038be08a2cd714 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-09-03T00:59:38 + Monotone-Branch: ca.inverse.sogo + commit d7bc3736a20bdce5b1bc13f95e6cebcff0ee1aa2 Author: Francis Lachapelle Date: Wed Sep 3 00:59:16 2008 +0000 @@ -85891,6 +100680,22 @@ Date: Wed Sep 3 00:59:16 2008 +0000 M UI/WebServerResources/MailerUI.js +commit 5e55bdea7da875f5effd3d66fbb25b8371a2909a +Merge: 94891d3 6eab653 +Author: Ludovic Marcotte +Date: Tue Sep 2 22:25:01 2008 +0000 + + merge of '2b69d044a61bdcebe73dd14659a3edfec3fd3530' + and '99cc1bb593f4002d820b712345f3e8c1c9ba44ba' + + Monotone-Parent: 2b69d044a61bdcebe73dd14659a3edfec3fd3530 + Monotone-Parent: 99cc1bb593f4002d820b712345f3e8c1c9ba44ba + Monotone-Revision: 350058ff37111e646407d97db552b5f4c9e96f90 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-09-02T22:25:01 + Monotone-Branch: ca.inverse.sogo + commit 55573ae613a83e346b42c6d34af9833da9986c23 Author: Francis Lachapelle Date: Tue Sep 2 21:16:35 2008 +0000 @@ -86157,6 +100962,22 @@ M UI/Contacts/UIxContactsListViewContainer.m M UI/MailerUI/UIxMailMainFrame.m M UI/Scheduler/UIxCalMainView.m +commit 94891d3e3f9de463e3590e58aea12a2a48642909 +Merge: d1a0696 344d0e0 +Author: Ludovic Marcotte +Date: Fri Aug 29 22:39:11 2008 +0000 + + merge of '68efb362b1c9c00b393ee099cf802bf8e59899b3' + and 'e273e1fc79bb27da2ab8838b78616c5fb161fd58' + + Monotone-Parent: 68efb362b1c9c00b393ee099cf802bf8e59899b3 + Monotone-Parent: e273e1fc79bb27da2ab8838b78616c5fb161fd58 + Monotone-Revision: 2b69d044a61bdcebe73dd14659a3edfec3fd3530 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-29T22:39:11 + Monotone-Branch: ca.inverse.sogo + commit 89deab41e71ee335b6707032c43f74a1cb0aa10e Author: Wolfgang Sourdeau Date: Fri Aug 29 21:20:09 2008 +0000 @@ -86184,6 +101005,22 @@ Date: Fri Aug 29 21:19:11 2008 +0000 M SOPE/sope-patchset-r1626.diff +commit d1a0696644c80b402b3ef636f48789501410f8e0 +Merge: f735b12 89deab4 +Author: Ludovic Marcotte +Date: Fri Aug 29 20:04:31 2008 +0000 + + merge of '2104587fdbf1ef7f22f0a0075957fc03091bfc19' + and '82068f0557914f395561a92071bea0e6791ac884' + + Monotone-Parent: 2104587fdbf1ef7f22f0a0075957fc03091bfc19 + Monotone-Parent: 82068f0557914f395561a92071bea0e6791ac884 + Monotone-Revision: 68efb362b1c9c00b393ee099cf802bf8e59899b3 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-29T20:04:31 + Monotone-Branch: ca.inverse.sogo + commit 86b052485259ebb66991c7e2b144f3bf96a2ac38 Author: Wolfgang Sourdeau Date: Fri Aug 29 19:25:36 2008 +0000 @@ -86197,6 +101034,22 @@ Date: Fri Aug 29 19:25:36 2008 +0000 M SOPE/sope-patchset-r1626.diff +commit f735b12109ad28a0262636f77223047581392263 +Merge: 7d558b6 86b0524 +Author: Ludovic Marcotte +Date: Fri Aug 29 18:11:50 2008 +0000 + + merge of '5189e429732909b3a5158c8920960d28c48e7129' + and 'dfc94cc52c59379dedd9711f5b27a4bb2429a045' + + Monotone-Parent: 5189e429732909b3a5158c8920960d28c48e7129 + Monotone-Parent: dfc94cc52c59379dedd9711f5b27a4bb2429a045 + Monotone-Revision: 2104587fdbf1ef7f22f0a0075957fc03091bfc19 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-29T18:11:50 + Monotone-Branch: ca.inverse.sogo + commit 81e9c338a07af1dfba89239f2f6cc137be5a123c Author: Wolfgang Sourdeau Date: Fri Aug 29 17:33:19 2008 +0000 @@ -86238,6 +101091,22 @@ Date: Fri Aug 29 02:27:14 2008 +0000 M SOPE/sope-patchset-r1626.diff +commit 7d558b6014f7f591b73baa81c1de5e5fbc666d9b +Merge: 8e9e8fc 9340137 +Author: Ludovic Marcotte +Date: Fri Aug 29 01:31:12 2008 +0000 + + merge of '24c2f8206b434e2894e6aa447358893a06cc7dc7' + and 'db14b32273f5bbb7059d1ab709579782acd5d82c' + + Monotone-Parent: 24c2f8206b434e2894e6aa447358893a06cc7dc7 + Monotone-Parent: db14b32273f5bbb7059d1ab709579782acd5d82c + Monotone-Revision: 5189e429732909b3a5158c8920960d28c48e7129 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-29T01:31:12 + Monotone-Branch: ca.inverse.sogo + commit 8bcb73ad75bac170cfe651330be45c6279c7bfa0 Author: Wolfgang Sourdeau Date: Fri Aug 29 01:28:43 2008 +0000 @@ -86251,6 +101120,22 @@ Date: Fri Aug 29 01:28:43 2008 +0000 M SOPE/sope-patchset-r1626.diff +commit 9340137d9ae664ae34aa5e99fba33e759ae689a4 +Merge: 33ebc24 943b77d +Author: Ludovic Marcotte +Date: Fri Aug 29 01:13:22 2008 +0000 + + merge of '1cd838ed13a348bd50dcdf6b2b52e78181132984' + and 'b3b6f425c01979bb9afdf39c7034dfd2131f4dd3' + + Monotone-Parent: 1cd838ed13a348bd50dcdf6b2b52e78181132984 + Monotone-Parent: b3b6f425c01979bb9afdf39c7034dfd2131f4dd3 + Monotone-Revision: db14b32273f5bbb7059d1ab709579782acd5d82c + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-29T01:13:22 + Monotone-Branch: ca.inverse.sogo + commit 15856820e6925efa10b93c8a581f7793ceffe758 Author: Wolfgang Sourdeau Date: Fri Aug 29 00:31:27 2008 +0000 @@ -86268,6 +101153,22 @@ M SoObjects/SOGo/LDAPUserManager.m M SoObjects/SOGo/SOGoUser.h M SoObjects/SOGo/SOGoUser.m +commit 33ebc2464e0c212a67671a622c7d330ddba62759 +Merge: 1585682 7479f03 +Author: Ludovic Marcotte +Date: Thu Aug 28 23:17:08 2008 +0000 + + merge of '1449e2ebb5ab61c8fe437cc2f486e1eea6a6f851' + and '41dc6a577f2466142d95218b1e0d9d242689638b' + + Monotone-Parent: 1449e2ebb5ab61c8fe437cc2f486e1eea6a6f851 + Monotone-Parent: 41dc6a577f2466142d95218b1e0d9d242689638b + Monotone-Revision: 1cd838ed13a348bd50dcdf6b2b52e78181132984 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-28T23:17:08 + Monotone-Branch: ca.inverse.sogo + commit c34dcbd1b3d093c0d824c3a81b8acb4a6e2e9ec4 Author: Wolfgang Sourdeau Date: Thu Aug 28 21:44:49 2008 +0000 @@ -86312,6 +101213,22 @@ Date: Thu Aug 28 20:42:55 2008 +0000 M UI/WebServerResources/generic.js +commit 7479f03d1e1ffe5b270a3274de9fa4a276cc3744 +Merge: c34dcbd c96a047 +Author: Ludovic Marcotte +Date: Thu Aug 28 20:39:45 2008 +0000 + + merge of '2f0d42cca69230479f5caefd8f858f7923b64337' + and 'b23bdab0a580470a6bfc7c0c9434bf9cf10b3df9' + + Monotone-Parent: 2f0d42cca69230479f5caefd8f858f7923b64337 + Monotone-Parent: b23bdab0a580470a6bfc7c0c9434bf9cf10b3df9 + Monotone-Revision: 41dc6a577f2466142d95218b1e0d9d242689638b + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-28T20:39:45 + Monotone-Branch: ca.inverse.sogo + commit beae1ffdb43259695b0ef989114285898b603db4 Author: Wolfgang Sourdeau Date: Thu Aug 28 17:22:36 2008 +0000 @@ -86340,6 +101257,22 @@ Date: Thu Aug 28 15:53:33 2008 +0000 M UI/WebServerResources/MailerUI.js +commit c96a047534da58efd9a9aa1d06329ac7e6f5f217 +Merge: 8a6ce84 7c2fd6b +Author: Ludovic Marcotte +Date: Thu Aug 28 15:07:27 2008 +0000 + + merge of '649a1187cf216e088818ea020c5b497e84dd0fa4' + and 'c0371b2cf247262cea5e1c8f66d234a0da8d2a51' + + Monotone-Parent: 649a1187cf216e088818ea020c5b497e84dd0fa4 + Monotone-Parent: c0371b2cf247262cea5e1c8f66d234a0da8d2a51 + Monotone-Revision: b23bdab0a580470a6bfc7c0c9434bf9cf10b3df9 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-28T15:07:27 + Monotone-Branch: ca.inverse.sogo + commit fcb174bdfd2544dee9d64b2cb1291fe23daa99d6 Author: Wolfgang Sourdeau Date: Thu Aug 28 14:48:45 2008 +0000 @@ -86399,6 +101332,22 @@ M UI/Templates/ContactsUI/UIxContactsUserFolders.wox M UI/WebServerResources/UIxContactsUserFolders.css M UI/WebServerResources/UIxContactsUserFolders.js +commit c654755f16797905924dcb9c73170d09f6fbfe2c +Merge: 4082b90 a4b9255 +Author: Wolfgang Sourdeau +Date: Wed Aug 27 22:59:47 2008 +0000 + + merge of '600e156688324637e9fcc6c445ab1c78a04e29ae' + and 'c13cadeadceb489f749246b2df80fd3f06819f1a' + + Monotone-Parent: 600e156688324637e9fcc6c445ab1c78a04e29ae + Monotone-Parent: c13cadeadceb489f749246b2df80fd3f06819f1a + Monotone-Revision: 7a41e9cfb146659d0f2177efca2b6e9bccc71dbc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-27T22:59:47 + Monotone-Branch: ca.inverse.sogo + commit 4082b90b53c8ca6521c5b8ddb25c0df55ea60330 Author: Wolfgang Sourdeau Date: Wed Aug 27 22:50:12 2008 +0000 @@ -86451,6 +101400,22 @@ Date: Wed Aug 27 21:51:50 2008 +0000 M SOPE/sope-patchset-r1626.diff +commit 7c2fd6b6e0dd630cdcd5f4f52dc350f2bd19adff +Merge: 4082b90 1a9b37a +Author: Ludovic Marcotte +Date: Wed Aug 27 21:39:26 2008 +0000 + + merge of '600e156688324637e9fcc6c445ab1c78a04e29ae' + and '9374fb611edb5c2d40dd2bd56bf78e3094c7ca16' + + Monotone-Parent: 600e156688324637e9fcc6c445ab1c78a04e29ae + Monotone-Parent: 9374fb611edb5c2d40dd2bd56bf78e3094c7ca16 + Monotone-Revision: c0371b2cf247262cea5e1c8f66d234a0da8d2a51 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-27T21:39:26 + Monotone-Branch: ca.inverse.sogo + commit a4b9255232cf24024c64b960a61e0b15a48423cb Author: Francis Lachapelle Date: Wed Aug 27 20:57:18 2008 +0000 @@ -86464,6 +101429,22 @@ Date: Wed Aug 27 20:57:18 2008 +0000 M UI/MailerUI/French.lproj/Localizable.strings +commit 1a9b37a04830a9774f2013b9a4b563dcc55f6fc3 +Merge: 627c6dd a4b9255 +Author: Ludovic Marcotte +Date: Wed Aug 27 20:42:21 2008 +0000 + + merge of '3ef512531577e1fefe46485057610ae57aade728' + and 'c13cadeadceb489f749246b2df80fd3f06819f1a' + + Monotone-Parent: 3ef512531577e1fefe46485057610ae57aade728 + Monotone-Parent: c13cadeadceb489f749246b2df80fd3f06819f1a + Monotone-Revision: 9374fb611edb5c2d40dd2bd56bf78e3094c7ca16 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-27T20:42:21 + Monotone-Branch: ca.inverse.sogo + commit b10614de5218927a64d85aafdf13abbcf965232c Author: Francis Lachapelle Date: Wed Aug 27 20:40:01 2008 +0000 @@ -86637,6 +101618,22 @@ Date: Tue Aug 26 18:40:48 2008 +0000 M SoObjects/Mailer/SOGoMailFolder.m +commit c2e7a5ae986a4170e580bc497459458030875f2b +Merge: 674e436 5876989 +Author: Wolfgang Sourdeau +Date: Tue Aug 26 17:42:24 2008 +0000 + + merge of '41b11d3b1b18c4d1c7da8ba97062c553d70d8596' + and 'b4d23e0ff0b98727a952a0a09a9cb7e312f3562a' + + Monotone-Parent: 41b11d3b1b18c4d1c7da8ba97062c553d70d8596 + Monotone-Parent: b4d23e0ff0b98727a952a0a09a9cb7e312f3562a + Monotone-Revision: 53112c079fc1cf21b6b08a3036256c983f01c96e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-26T17:42:24 + Monotone-Branch: ca.inverse.sogo + commit 5876989e1d8c88c53bec812ebe8e9ddf28cfbb3a Author: Wolfgang Sourdeau Date: Tue Aug 26 17:42:03 2008 +0000 @@ -86724,6 +101721,22 @@ Date: Tue Aug 26 13:16:51 2008 +0000 M NEWS +commit 2c7b0ea81769f6267a984af645d47baa7bdc21c6 +Merge: 2197646 1c41385 +Author: Ludovic Marcotte +Date: Tue Aug 26 10:55:00 2008 +0000 + + merge of '47c3ff1522958a2650c7b2b3d9d4407ed0d21510' + and '6c2ef11e5e4b49c1d4625ae51b0c61645dfeaed5' + + Monotone-Parent: 47c3ff1522958a2650c7b2b3d9d4407ed0d21510 + Monotone-Parent: 6c2ef11e5e4b49c1d4625ae51b0c61645dfeaed5 + Monotone-Revision: 0cce1c8355516f6fd78c9fc7bebd2d918235f6dd + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-26T10:55:00 + Monotone-Branch: ca.inverse.sogo + commit 21976460d90540adf6246a3ca72f5fdbebf8f917 Author: Wolfgang Sourdeau Date: Tue Aug 26 03:26:42 2008 +0000 @@ -86738,6 +101751,22 @@ Date: Tue Aug 26 03:26:42 2008 +0000 M UI/Contacts/English.lproj/Localizable.strings M UI/Contacts/French.lproj/Localizable.strings +commit bb479b63d0ecf03ef074c9723059c9fe4bb5bf39 +Merge: f8ec753 6985721 +Author: Wolfgang Sourdeau +Date: Tue Aug 26 03:23:11 2008 +0000 + + merge of 'bbbcd22c1bfa8a23c1a03e53be92046ecec2a3b3' + and 'd2e102506b6eee11a573475e7277568977b959a5' + + Monotone-Parent: bbbcd22c1bfa8a23c1a03e53be92046ecec2a3b3 + Monotone-Parent: d2e102506b6eee11a573475e7277568977b959a5 + Monotone-Revision: 8c852e4b9e947a653debd71411c75952266f7034 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-26T03:23:11 + Monotone-Branch: ca.inverse.sogo + commit 6985721debe8681389ccba24501c7ceb419b3855 Author: Wolfgang Sourdeau Date: Tue Aug 26 03:15:35 2008 +0000 @@ -86772,6 +101801,22 @@ M UI/Contacts/English.lproj/Localizable.strings M UI/Contacts/French.lproj/Localizable.strings M UI/WebServerResources/ContactsUI.js +commit 493bfd9594fc4627d0ebb68df63affc4d4e32ebe +Merge: e1c8f3f d8c42dc +Author: Wolfgang Sourdeau +Date: Mon Aug 25 20:54:06 2008 +0000 + + merge of 'a1c1eacbf93b1c77a04e617675b261da87d45947' + and 'b5081e44c9a03ab4fd5987c45fd8bf518f9c773f' + + Monotone-Parent: a1c1eacbf93b1c77a04e617675b261da87d45947 + Monotone-Parent: b5081e44c9a03ab4fd5987c45fd8bf518f9c773f + Monotone-Revision: 4996dd3cf01c2faa951ae04e44de3eb31194a326 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-25T20:54:06 + Monotone-Branch: ca.inverse.sogo + commit fd0d28191e1cab1e6de0d3a0102e99368f569722 Author: Francis Lachapelle Date: Mon Aug 25 20:52:48 2008 +0000 @@ -86800,6 +101845,38 @@ Date: Mon Aug 25 20:45:42 2008 +0000 M UI/WebServerResources/MailerUI.js +commit 1c413857607eef71fd0e16cd86222cc1b9705747 +Merge: 493bfd9 19b96c4 +Author: Ludovic Marcotte +Date: Mon Aug 25 19:49:37 2008 +0000 + + merge of '4996dd3cf01c2faa951ae04e44de3eb31194a326' + and '80545770d33420a47df77acb284ef0203c16cd94' + + Monotone-Parent: 4996dd3cf01c2faa951ae04e44de3eb31194a326 + Monotone-Parent: 80545770d33420a47df77acb284ef0203c16cd94 + Monotone-Revision: 6c2ef11e5e4b49c1d4625ae51b0c61645dfeaed5 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-25T19:49:37 + Monotone-Branch: ca.inverse.sogo + +commit 19b96c43710719815dce140babcbf97b90ad7c7a +Merge: a36f003 e1c8f3f +Author: Ludovic Marcotte +Date: Mon Aug 25 19:48:00 2008 +0000 + + merge of '4b1cae6ed7b8c58f9cf2e2df5162ad6ed6ea12c0' + and 'a1c1eacbf93b1c77a04e617675b261da87d45947' + + Monotone-Parent: 4b1cae6ed7b8c58f9cf2e2df5162ad6ed6ea12c0 + Monotone-Parent: a1c1eacbf93b1c77a04e617675b261da87d45947 + Monotone-Revision: 80545770d33420a47df77acb284ef0203c16cd94 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-25T19:48:00 + Monotone-Branch: ca.inverse.sogo + commit 7903686fe952797d774d7b67630a1bb2ad7f7000 Author: Wolfgang Sourdeau Date: Mon Aug 25 19:22:59 2008 +0000 @@ -86826,6 +101903,22 @@ Date: Mon Aug 25 19:22:00 2008 +0000 M UI/Contacts/UIxContactEditor.m +commit a36f0030c79944bb7b621115cd80c92cab6722f4 +Merge: 7903686 d8c42dc +Author: Ludovic Marcotte +Date: Mon Aug 25 19:18:29 2008 +0000 + + merge of '39a02584d6f552b43a783fc48bc54d99f63c12d0' + and 'b5081e44c9a03ab4fd5987c45fd8bf518f9c773f' + + Monotone-Parent: 39a02584d6f552b43a783fc48bc54d99f63c12d0 + Monotone-Parent: b5081e44c9a03ab4fd5987c45fd8bf518f9c773f + Monotone-Revision: 4b1cae6ed7b8c58f9cf2e2df5162ad6ed6ea12c0 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2008-08-25T19:18:29 + Monotone-Branch: ca.inverse.sogo + commit acdce07ee0c69904b29d8ce2f4ac7d57aae20ae9 Author: Francis Lachapelle Date: Mon Aug 25 19:13:18 2008 +0000 @@ -86921,6 +102014,22 @@ Date: Mon Aug 25 12:58:58 2008 +0000 D SOPE/sope-mime-nosort.diff +commit e8de776baadfa467dcb0bb14c33000cbf0c82d4b +Merge: a1bda98 f573dc5 +Author: Wolfgang Sourdeau +Date: Sat Aug 23 03:24:41 2008 +0000 + + merge of '3ea5e4c3ab43c68fb675c5144a1c3378da620a48' + and '8bc0eb7c9fd973f77be1c3e110b5c04007734d45' + + Monotone-Parent: 3ea5e4c3ab43c68fb675c5144a1c3378da620a48 + Monotone-Parent: 8bc0eb7c9fd973f77be1c3e110b5c04007734d45 + Monotone-Revision: 7f553366431940f24edc82f10721c69c1a91a3c0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-23T03:24:41 + Monotone-Branch: ca.inverse.sogo + commit f573dc5d0e0e39cf4cabd35cf93781d66d059358 Author: Wolfgang Sourdeau Date: Sat Aug 23 03:24:24 2008 +0000 @@ -86948,6 +102057,22 @@ Date: Fri Aug 22 21:49:37 2008 +0000 M ChangeLog M UI/MailPartViewers/UIxMailRenderingContext.m +commit a6731b0cbf25354689fbea42fe012a8bd4ed15a7 +Merge: 01f9a83 17ee845 +Author: Wolfgang Sourdeau +Date: Fri Aug 22 21:25:24 2008 +0000 + + merge of '7add241a803ae2c2ee7ea4c1c708f60ef7e6498b' + and 'cf1274250eeb2ccd93241a351a17123c4a95cd31' + + Monotone-Parent: 7add241a803ae2c2ee7ea4c1c708f60ef7e6498b + Monotone-Parent: cf1274250eeb2ccd93241a351a17123c4a95cd31 + Monotone-Revision: 7e1e7d720fbae9469e69ee665a26293d48382280 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-22T21:25:24 + Monotone-Branch: ca.inverse.sogo + commit 01f9a83bcaca3a18439ae0bab27379c9a5ce96e2 Author: Wolfgang Sourdeau Date: Fri Aug 22 21:25:01 2008 +0000 @@ -87024,6 +102149,22 @@ Date: Fri Aug 22 18:50:29 2008 +0000 M NEWS +commit 7f03974b4f2fa109d7b2ebdd8dd8e5bfe2c8cc9b +Merge: 8fd3833 514ca96 +Author: Wolfgang Sourdeau +Date: Fri Aug 22 18:44:10 2008 +0000 + + merge of 'd5bcd77c68cb679b5a1b9a23a4cc86038b0e615e' + and 'ed0cae805a538abfe1c738e426b04f59baa43949' + + Monotone-Parent: d5bcd77c68cb679b5a1b9a23a4cc86038b0e615e + Monotone-Parent: ed0cae805a538abfe1c738e426b04f59baa43949 + Monotone-Revision: b1d9b0e8b48341b65d5f440bceeee81fb590bb3e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-22T18:44:10 + Monotone-Branch: ca.inverse.sogo + commit 8fd3833dd6a70edebb463a4d27fa2da1e3272641 Author: Wolfgang Sourdeau Date: Fri Aug 22 18:43:08 2008 +0000 @@ -87060,6 +102201,22 @@ Date: Fri Aug 22 15:02:56 2008 +0000 M SOPE/sope-patchset-r1625.diff +commit ee13e8f792cf49171d3ac977d2686ff3c2e0dee0 +Merge: e547ab3 4e8a929 +Author: Wolfgang Sourdeau +Date: Fri Aug 22 14:57:36 2008 +0000 + + merge of '1f97aa49aa118c4b104e4fc4fa9c4f6a320435e9' + and '81291ebd761827191a007b02ee603cd1f31fc8a3' + + Monotone-Parent: 1f97aa49aa118c4b104e4fc4fa9c4f6a320435e9 + Monotone-Parent: 81291ebd761827191a007b02ee603cd1f31fc8a3 + Monotone-Revision: 579be7a198049057f8c207da8274dadf1702c593 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-22T14:57:36 + Monotone-Branch: ca.inverse.sogo + commit e547ab346bbb2293700cabe277eff19943519db6 Author: Wolfgang Sourdeau Date: Fri Aug 22 14:57:23 2008 +0000 @@ -87141,6 +102298,25 @@ M SoObjects/SOGo/NSArray+Utilities.h M SoObjects/SOGo/NSArray+Utilities.m M SoObjects/SOGo/NSString+Utilities.m +commit c10afe743cb04ea9aae00b19a4c280736955afc5 +Merge: cbb99dc 4af9904 +Author: Ludovic Marcotte +Date: Thu Aug 21 22:01:23 2008 +0000 + + merge of '5115a135492e7714cb2a621cfb35a30ce246f20d' + and 'e61122c5a0ba3f7e5dfada968f88f155fc08bb40' + + Monotone-Parent: 5115a135492e7714cb2a621cfb35a30ce246f20d + Monotone-Parent: e61122c5a0ba3f7e5dfada968f88f155fc08bb40 + Monotone-Revision: a9323afc29bd494143d2c78639e7a02f3d3804cb + + Monotone-Author: ludovic@Sophos.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-21T22:01:23 + Monotone-Date: 2008-08-22T14:42:00 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit cbb99dc201ca0ca83f7930a654d3e842b387c888 Author: Francis Lachapelle Date: Thu Aug 21 21:46:11 2008 +0000 @@ -87311,6 +102487,22 @@ M UI/WebServerResources/week-view.png M UI/WebServerResources/write-message.png M UI/WebServerResources/write.png +commit 658eb1ee87c79c90296c7d108d43235e4912bfda +Merge: 23486d0 dd7412c +Author: Francis Lachapelle +Date: Thu Aug 21 17:42:51 2008 +0000 + + merge of '4ecd3497cd5054a2a36581280fa018f7c4d761de' + and 'd3e2768d395c5117bc0c0e5ce9913f9cea531223' + + Monotone-Parent: 4ecd3497cd5054a2a36581280fa018f7c4d761de + Monotone-Parent: d3e2768d395c5117bc0c0e5ce9913f9cea531223 + Monotone-Revision: f6a08c3b1afc336cd35006c90d8dbf33e7f88bf1 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-08-21T17:42:51 + Monotone-Branch: ca.inverse.sogo + commit dd7412cbf18023936c7f627f6d12582450a9330f Author: Francis Lachapelle Date: Thu Aug 21 17:42:31 2008 +0000 @@ -87342,6 +102534,22 @@ D UI/WebServerResources/corner_right.gif D UI/WebServerResources/invisible_space_2.gif D UI/WebServerResources/tbtb_anais.png +commit 4215ddc817f20aca6b6c37903d2b345c3451e5df +Merge: 4cec73a 6665b3c +Author: Wolfgang Sourdeau +Date: Thu Aug 21 15:56:11 2008 +0000 + + merge of '521ea089e2f431d8a0e1e6c022b351e76fbe5621' + and 'f0e213596b61da3ea457a1a0a14230911c3b4fe6' + + Monotone-Parent: 521ea089e2f431d8a0e1e6c022b351e76fbe5621 + Monotone-Parent: f0e213596b61da3ea457a1a0a14230911c3b4fe6 + Monotone-Revision: bef1f662e1701b836a89ce52809aac40d4c7a964 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-21T15:56:11 + Monotone-Branch: ca.inverse.sogo + commit 4cec73a91334e7723d815d5ac18f589dc12d2c16 Author: Wolfgang Sourdeau Date: Thu Aug 21 15:55:42 2008 +0000 @@ -87624,6 +102832,22 @@ M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/UIxCalendarProperties.css M UI/WebServerResources/iefixes.css +commit a708bdf8843c3905c47d4b23a571c6dc8e328fad +Merge: 0c0468b 3426625 +Author: Wolfgang Sourdeau +Date: Wed Aug 20 03:21:56 2008 +0000 + + merge of 'cded9d054f382c35639adc8d80f8c14c45e362fa' + and 'da8c27f53557345f2f6856fdca0d8fabd1d3bdef' + + Monotone-Parent: cded9d054f382c35639adc8d80f8c14c45e362fa + Monotone-Parent: da8c27f53557345f2f6856fdca0d8fabd1d3bdef + Monotone-Revision: 269157ada9f8016d29a05a36bd61e71ac035ae88 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-20T03:21:56 + Monotone-Branch: ca.inverse.sogo + commit 342662549e7b2f05e28af86423aac89b208f538e Author: Wolfgang Sourdeau Date: Wed Aug 20 03:21:33 2008 +0000 @@ -87761,6 +102985,22 @@ Date: Mon Aug 18 15:40:56 2008 +0000 M SOPE/sope-patchset-r1625.diff +commit eb1cda981d5ac515ea7bf2a58d2a17a4190b0512 +Merge: b324d37 cd938f4 +Author: Wolfgang Sourdeau +Date: Mon Aug 18 15:28:25 2008 +0000 + + merge of 'a397d47aaaa09ccee4cc162b91cfb9882522aaae' + and 'ca86ebb874f81019a9e4dfc6bc2ab4782b5b814b' + + Monotone-Parent: a397d47aaaa09ccee4cc162b91cfb9882522aaae + Monotone-Parent: ca86ebb874f81019a9e4dfc6bc2ab4782b5b814b + Monotone-Revision: 36bfad24a9f6d85105ba025b145af0fb3916b004 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-18T15:28:25 + Monotone-Branch: ca.inverse.sogo + commit cd938f4654271a8417571e703e9b35f4875ab2b8 Author: Wolfgang Sourdeau Date: Mon Aug 18 15:23:30 2008 +0000 @@ -87817,6 +103057,22 @@ Date: Mon Aug 18 15:18:10 2008 +0000 M SOPE/sope-patchset-r1625.diff +commit 9325ae4909596b6cd12fedd4a20531256949f7aa +Merge: 128d5bb 8478bc2 +Author: Wolfgang Sourdeau +Date: Fri Aug 15 15:00:44 2008 +0000 + + merge of '5aaf09a46fc504e57187524d01cb8ccb8d9c8e1e' + and '7b387d165ebb8390cda766a1c2730b608923acbb' + + Monotone-Parent: 5aaf09a46fc504e57187524d01cb8ccb8d9c8e1e + Monotone-Parent: 7b387d165ebb8390cda766a1c2730b608923acbb + Monotone-Revision: 4670a90c9e9ff683de9c0300911f03d344608d48 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-15T15:00:44 + Monotone-Branch: ca.inverse.sogo + commit 8478bc27dec17e382aaf58730a0fb8bcab3adbf8 Author: Wolfgang Sourdeau Date: Fri Aug 15 14:59:41 2008 +0000 @@ -87957,6 +103213,22 @@ M SoObjects/Appointments/SOGoAppointmentObject.m M SoObjects/Appointments/iCalEventChanges+SOGo.m M SoObjects/Appointments/product.plist +commit 326fce5029979c9d92daebe90a404b328903e483 +Merge: 42bd3f5 0e52813 +Author: Wolfgang Sourdeau +Date: Wed Aug 13 21:30:12 2008 +0000 + + merge of '6446b9b2f85e41554b2841ae494d4cd03f7e3d0f' + and 'ecfd588ececc0cf909752cbf7561c097b6533867' + + Monotone-Parent: 6446b9b2f85e41554b2841ae494d4cd03f7e3d0f + Monotone-Parent: ecfd588ececc0cf909752cbf7561c097b6533867 + Monotone-Revision: 75fcb06d679aeaa2164c930b62aab2d44c31ff16 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-13T21:30:12 + Monotone-Branch: ca.inverse.sogo + commit 0e52813fc15d44b0f8e486de058b53ba38602e6e Author: Wolfgang Sourdeau Date: Wed Aug 13 21:29:49 2008 +0000 @@ -87998,6 +103270,22 @@ Date: Tue Aug 12 19:16:05 2008 +0000 M UI/Templates/UIxAclEditor.wox M UI/WebServerResources/UIxAclEditor.css +commit ced39ae72dbd9fa68941e3dc56eb5f4901b66068 +Merge: 68f08f5 180f6bb +Author: Wolfgang Sourdeau +Date: Tue Aug 12 18:58:46 2008 +0000 + + merge of '498058170a280ae890f83fe6a844882a2e050746' + and '66f5bf2b1f0082b3e316b8859f467f9d93b22cda' + + Monotone-Parent: 498058170a280ae890f83fe6a844882a2e050746 + Monotone-Parent: 66f5bf2b1f0082b3e316b8859f467f9d93b22cda + Monotone-Revision: 365602b463a8b9735fa4920922f94dd73b3481e4 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-12T18:58:46 + Monotone-Branch: ca.inverse.sogo + commit 68f08f55c8a6acba00842f3fb7b0db2d6746e303 Author: Francis Lachapelle Date: Tue Aug 12 18:13:48 2008 +0000 @@ -88014,6 +103302,22 @@ M UI/WebServerResources/UIxAppointmentEditor.css M UI/WebServerResources/UIxComponentEditor.css M UI/WebServerResources/UIxTaskEditor.css +commit 180f6bbef8523598f165db9398820285a272574c +Merge: 337b92b 81904fb +Author: Wolfgang Sourdeau +Date: Tue Aug 12 12:42:56 2008 +0000 + + merge of '843c4e4ab4023026b0fff697ba521c27e151872d' + and 'a225193926236b0f6640bace3c33305ab1184832' + + Monotone-Parent: 843c4e4ab4023026b0fff697ba521c27e151872d + Monotone-Parent: a225193926236b0f6640bace3c33305ab1184832 + Monotone-Revision: 66f5bf2b1f0082b3e316b8859f467f9d93b22cda + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-12T12:42:56 + Monotone-Branch: ca.inverse.sogo + commit 81904fb8964b086b0dead0a29c2b49db7a321742 Author: Wolfgang Sourdeau Date: Mon Aug 11 19:21:56 2008 +0000 @@ -88128,6 +103432,22 @@ M UI/WebServerResources/UIxMailToSelection.js M UI/WebServerResources/UIxRecurrenceEditor.css M UI/WebServerResources/iefixes.css +commit 7a8b8c5ead6c547e44a0555e27f80853c725da38 +Merge: ac468ed 8134c4a +Author: Wolfgang Sourdeau +Date: Sun Aug 10 21:45:22 2008 +0000 + + merge of 'a1294497e9f6ed0ee90d2f695f0735f2eb1ced11' + and 'a90e12f6968fb98c4da6b0054a945da493c88d0d' + + Monotone-Parent: a1294497e9f6ed0ee90d2f695f0735f2eb1ced11 + Monotone-Parent: a90e12f6968fb98c4da6b0054a945da493c88d0d + Monotone-Revision: 3628a0085e52c1990e5edce1cb09d581bc96f966 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-08-10T21:45:22 + Monotone-Branch: ca.inverse.sogo + commit ac468edb0ab6e8d8e76ba565efa27d00af3abb80 Author: Wolfgang Sourdeau Date: Sun Aug 10 21:44:25 2008 +0000 @@ -89036,6 +104356,22 @@ M UI/Scheduler/UIxCalMonthView.h M UI/Scheduler/UIxCalMonthView.m M UI/Templates/SchedulerUI/UIxCalMonthView.wox +commit 5b4734d079eed813e4b3304c2ee7d786099f9ce9 +Merge: bdc02c2 bf5f1c5 +Author: Wolfgang Sourdeau +Date: Thu Jul 17 21:14:33 2008 +0000 + + merge of '99d14630f5294d40da6680a39d69b6f1b7853938' + and 'fdf84b187a0e3bf4322d63a4694fb2c4cf8a16fc' + + Monotone-Parent: 99d14630f5294d40da6680a39d69b6f1b7853938 + Monotone-Parent: fdf84b187a0e3bf4322d63a4694fb2c4cf8a16fc + Monotone-Revision: 993d2c6913677d2f4479038c7c4a266d4eb3b349 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-07-17T21:14:33 + Monotone-Branch: ca.inverse.sogo + commit bdc02c26abb5916636e912804b815c1e3cb9ad64 Author: Wolfgang Sourdeau Date: Thu Jul 17 21:12:43 2008 +0000 @@ -89113,6 +104449,22 @@ M SOPE/NGCards/iCalRecurrenceCalculator.m M SOPE/NGCards/iCalRepeatableEntityObject.h M SOPE/NGCards/iCalRepeatableEntityObject.m +commit 4a9c837741741f445aa02d0fc8324f0f18604e0b +Merge: 453211a f0d7546 +Author: Wolfgang Sourdeau +Date: Wed Jul 16 21:49:36 2008 +0000 + + merge of '968d106fbab318497571d45998864ccefcc20480' + and 'f633654a120834c13835a3ef41a1418e31efffe3' + + Monotone-Parent: 968d106fbab318497571d45998864ccefcc20480 + Monotone-Parent: f633654a120834c13835a3ef41a1418e31efffe3 + Monotone-Revision: 8491f20b4bac3508e0839201c1e6756c5df21835 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-07-16T21:49:36 + Monotone-Branch: ca.inverse.sogo + commit f0d7546b8b159bb3ea607036a14144886bed6340 Author: Wolfgang Sourdeau Date: Wed Jul 16 21:48:54 2008 +0000 @@ -89229,6 +104581,22 @@ Date: Wed Jul 16 02:17:39 2008 +0000 M NEWS +commit 10bfeb07688744d8e65c4fcef940a2272061c888 +Merge: 7512f5d b1f67c4 +Author: Wolfgang Sourdeau +Date: Wed Jul 16 02:14:50 2008 +0000 + + merge of '2609687767884b123c1ff765253fde7c75ef81b3' + and '6a69a9438cda177d7f4ada9b069b92023777399b' + + Monotone-Parent: 2609687767884b123c1ff765253fde7c75ef81b3 + Monotone-Parent: 6a69a9438cda177d7f4ada9b069b92023777399b + Monotone-Revision: 0a5eab06f5b8551e1e9b88968eb183d42fe76a95 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-07-16T02:14:50 + Monotone-Branch: ca.inverse.sogo + commit 7512f5d512afb446f80d26087048a5ea9de0fe67 Author: Wolfgang Sourdeau Date: Wed Jul 16 02:12:18 2008 +0000 @@ -89470,6 +104838,38 @@ M UI/Contacts/product.plist M UI/WebServerResources/ContactsUI.js M UI/WebServerResources/generic.js +commit 812c7c535e12850ed98a6aaec746a2e87866ef26 +Merge: eb7acf4 b624151 +Author: Francis Lachapelle +Date: Wed Jul 9 11:15:27 2008 +0000 + + merge of '2cc61994b1fd18611f88fb4a7bd881ef6c12c05c' + and 'bf7b6e86d357e58b2060b9ab18910bae0bbae64c' + + Monotone-Parent: 2cc61994b1fd18611f88fb4a7bd881ef6c12c05c + Monotone-Parent: bf7b6e86d357e58b2060b9ab18910bae0bbae64c + Monotone-Revision: 5652b12a99be3b69adbf207347b951ec2e5f6c89 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-07-09T11:15:27 + Monotone-Branch: ca.inverse.sogo + +commit b624151eb0ab6a5a951b2b2f9419dd0e624b604c +Merge: 6c5003d 4f6a5be +Author: Francis Lachapelle +Date: Wed Jul 9 07:35:31 2008 +0000 + + merge of '1a5434f30282a4932bf29227da4cf2da44ef5783' + and '90684f202c7c2bf2307dd9c9c94961ea8c28c823' + + Monotone-Parent: 1a5434f30282a4932bf29227da4cf2da44ef5783 + Monotone-Parent: 90684f202c7c2bf2307dd9c9c94961ea8c28c823 + Monotone-Revision: bf7b6e86d357e58b2060b9ab18910bae0bbae64c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-07-09T07:35:31 + Monotone-Branch: ca.inverse.sogo + commit 4f6a5bec4fc6334aa183297abe64951d94f0f26a Author: Francis Lachapelle Date: Wed Jul 9 07:35:10 2008 +0000 @@ -89525,6 +104925,22 @@ Date: Fri Jul 11 18:59:04 2008 +0000 M SoObjects/Contacts/SOGoContactGCSFolder.m +commit a4837c56111733d7ec9635176ad83a0e18afd9ec +Merge: 8a69b86 b6f3db9 +Author: Wolfgang Sourdeau +Date: Fri Jul 11 18:40:38 2008 +0000 + + merge of 'bded46ecbec55dcfe4c434982eb0a1d07a5ce436' + and 'fe2f63c6432b82528c17fb060e145ead69df40d3' + + Monotone-Parent: bded46ecbec55dcfe4c434982eb0a1d07a5ce436 + Monotone-Parent: fe2f63c6432b82528c17fb060e145ead69df40d3 + Monotone-Revision: 82fc330b5d4b9a01f4015dd01dcccb5316336a01 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-07-11T18:40:38 + Monotone-Branch: ca.inverse.sogo + commit b6f3db9b3bcf539eb12daa3d430991815fc93bc2 Author: Wolfgang Sourdeau Date: Fri Jul 11 17:33:31 2008 +0000 @@ -89726,6 +105142,22 @@ Date: Thu Jul 10 14:57:51 2008 +0000 M UI/Scheduler/product.plist +commit 0b16129d0a4718c4020b6f9b9a2ac81ea39365eb +Merge: a8a1cfb 5e1fb58 +Author: Wolfgang Sourdeau +Date: Wed Jul 9 21:09:59 2008 +0000 + + merge of '546031563b555a3095688a4ec17eeb5902aea9a1' + and 'dcb58071ad12a3e87d2a061647e9558e70bb9775' + + Monotone-Parent: 546031563b555a3095688a4ec17eeb5902aea9a1 + Monotone-Parent: dcb58071ad12a3e87d2a061647e9558e70bb9775 + Monotone-Revision: 77ae5931198ed270924efe912f3a0be9fe7a7a62 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-07-09T21:09:59 + Monotone-Branch: ca.inverse.sogo + commit 5e1fb58ab9707c43c04733f21ffff67a2e001b6c Author: Wolfgang Sourdeau Date: Wed Jul 9 21:09:08 2008 +0000 @@ -89866,6 +105298,38 @@ A UI/WebServerResources/addrbook.png M UI/WebServerResources/generic.css A UI/WebServerResources/remote-addrbook.png +commit 2fc24595c53f4811d97e544626e990cd1e419c6c +Merge: a5838d6 d910fc8 +Author: Francis Lachapelle +Date: Tue Jul 8 23:06:08 2008 +0000 + + merge of '16bafd35c923b43175977acf723114a90f37d677' + and 'c38113be1f70b01613925ed47bf4491f5536862d' + + Monotone-Parent: 16bafd35c923b43175977acf723114a90f37d677 + Monotone-Parent: c38113be1f70b01613925ed47bf4491f5536862d + Monotone-Revision: 96be8fb544ada3cb6a58b0caa0bfb99522dac8db + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-07-08T23:06:08 + Monotone-Branch: ca.inverse.sogo + +commit d910fc85572a3c172cc71ceec88b78745e443fa8 +Merge: 94e43f1 0494428 +Author: Francis Lachapelle +Date: Tue Jul 8 21:17:45 2008 +0000 + + merge of '6c3815301043c73cd8c87444dacb26fe1331a86f' + and '7d2120f897825c5610c6111ccba1a14c02fdcb07' + + Monotone-Parent: 6c3815301043c73cd8c87444dacb26fe1331a86f + Monotone-Parent: 7d2120f897825c5610c6111ccba1a14c02fdcb07 + Monotone-Revision: c38113be1f70b01613925ed47bf4491f5536862d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-07-08T21:17:45 + Monotone-Branch: ca.inverse.sogo + commit 049442813954f8c102533346433fea5942a6f601 Author: Francis Lachapelle Date: Tue Jul 8 20:14:47 2008 +0000 @@ -89879,6 +105343,22 @@ Date: Tue Jul 8 20:14:47 2008 +0000 M UI/WebServerResources/UIxMailEditor.js +commit fb79b7a0c181987c6cb98ab39e8e3049dfe84053 +Merge: 0797fb9 ed96116 +Author: Wolfgang Sourdeau +Date: Tue Jul 8 15:46:29 2008 +0000 + + merge of '305966069ea6e632bec9f09e6fd85e54295efb03' + and '4919aeeff629dcb3750bd1e1f28cf06348a5da02' + + Monotone-Parent: 305966069ea6e632bec9f09e6fd85e54295efb03 + Monotone-Parent: 4919aeeff629dcb3750bd1e1f28cf06348a5da02 + Monotone-Revision: 1ffb41682368b46b7d5dfbe50eb430e0859f6837 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-07-08T15:46:29 + Monotone-Branch: ca.inverse.sogo + commit ed9611678b22e80e272d11f1b73c8e63b605e0f5 Author: Wolfgang Sourdeau Date: Tue Jul 8 15:44:50 2008 +0000 @@ -90128,6 +105608,25 @@ M UI/WebServerResources/UIxAttendeesEditor.js M UI/WebServerResources/UIxMailEditor.js M UI/WebServerResources/generic.css +commit 061709ab082d384a2cd0c25efb61dc21db023327 +Merge: f23aa52 9b758a6 +Author: Francis Lachapelle +Date: Thu Jul 3 23:07:27 2008 +0000 + + merge of '8ca6b006717869bd8c2cfca4e9afa1da74772b12' + and '9a36073d1afa7838c5d2980e533a408ede5d3fdb' + + Monotone-Parent: 8ca6b006717869bd8c2cfca4e9afa1da74772b12 + Monotone-Parent: 9a36073d1afa7838c5d2980e533a408ede5d3fdb + Monotone-Revision: 5daf7aebb25ab3a16dccbb23766a2eb2a04a78f5 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-07-03T23:07:27 + Monotone-Date: 2008-07-04T19:27:26 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit f23aa520157c5f200b81225f93f52ff70d5a943e Author: Wolfgang Sourdeau Date: Fri Jul 4 18:27:07 2008 +0000 @@ -90299,6 +105798,22 @@ Date: Mon Jun 30 22:28:28 2008 +0000 M NEWS +commit 471f9002a24231ad3eebd13673cd4726e54c3add +Merge: 61abfb8 57adf17 +Author: Wolfgang Sourdeau +Date: Mon Jun 30 21:46:14 2008 +0000 + + merge of '12a978320b509383d727e835aa557429699e1bce' + and 'de179977f91b4497c002d506a13cf0098889c086' + + Monotone-Parent: 12a978320b509383d727e835aa557429699e1bce + Monotone-Parent: de179977f91b4497c002d506a13cf0098889c086 + Monotone-Revision: e78d6ed43cef4846ff53da0fb7517386a0b09874 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-06-30T21:46:14 + Monotone-Branch: ca.inverse.sogo + commit 61abfb87241de27c24710e676fbb64eabdde0835 Author: Wolfgang Sourdeau Date: Mon Jun 30 21:46:05 2008 +0000 @@ -90312,6 +105827,22 @@ Date: Mon Jun 30 21:46:05 2008 +0000 M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 57adf176764cd705236f8f4b3107643dba8aa175 +Merge: 5f6d80b 3074d66 +Author: Wolfgang Sourdeau +Date: Mon Jun 30 21:12:10 2008 +0000 + + merge of '00293ff1c17131bee9ded6c69cb66e9253198cb1' + and '46bd18b8766ad6df33d5fb254434ed6b19805eae' + + Monotone-Parent: 00293ff1c17131bee9ded6c69cb66e9253198cb1 + Monotone-Parent: 46bd18b8766ad6df33d5fb254434ed6b19805eae + Monotone-Revision: de179977f91b4497c002d506a13cf0098889c086 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-06-30T21:12:10 + Monotone-Branch: ca.inverse.sogo + commit 5f6d80b46ecdf6aa823c5dd36f12eb6b4993b558 Author: Wolfgang Sourdeau Date: Mon Jun 30 21:11:20 2008 +0000 @@ -90339,6 +105870,22 @@ Date: Mon Jun 30 20:58:29 2008 +0000 M UI/WebServerResources/UIxAttendeesEditor.js +commit f309a825ca6dbfa17de288efe5a4dbd3d6c2ed34 +Merge: 83014e4 40ec0cc +Author: Francis Lachapelle +Date: Mon Jun 30 20:36:23 2008 +0000 + + merge of '602ce15244a3cf50b41b2c16feb1c88a2d9bcc37' + and 'f8fd2d73c8df37a6753528c62bb5d7eb27f1e811' + + Monotone-Parent: 602ce15244a3cf50b41b2c16feb1c88a2d9bcc37 + Monotone-Parent: f8fd2d73c8df37a6753528c62bb5d7eb27f1e811 + Monotone-Revision: b38c37cda11815cc245586cfe099f39cb10261f2 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-06-30T20:36:23 + Monotone-Branch: ca.inverse.sogo + commit 40ec0cc96e486e518341680a2a36a4c672877898 Author: Francis Lachapelle Date: Mon Jun 30 20:35:48 2008 +0000 @@ -90406,6 +105953,22 @@ Date: Mon Jun 30 18:58:19 2008 +0000 M SoObjects/SOGo/SOGoParentFolder.m +commit 0ecc42f252749028c28b6449581336204922536a +Merge: 9eed3fc 68cef03 +Author: Wolfgang Sourdeau +Date: Mon Jun 30 18:57:07 2008 +0000 + + merge of '46d1c12eedb8177f788cf76fdb4e73b766c27617' + and '4ffb0fb9d1bad2a11d7f36633c52d54218fbde52' + + Monotone-Parent: 46d1c12eedb8177f788cf76fdb4e73b766c27617 + Monotone-Parent: 4ffb0fb9d1bad2a11d7f36633c52d54218fbde52 + Monotone-Revision: 5352455491daf79d879c8976262af4ecc972d346 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-06-30T18:57:07 + Monotone-Branch: ca.inverse.sogo + commit 68cef03a0664b44fac4e9e7402cc475546272e46 Author: Wolfgang Sourdeau Date: Mon Jun 30 18:55:45 2008 +0000 @@ -90831,6 +106394,22 @@ Date: Fri Jun 20 15:41:52 2008 +0000 M UI/Templates/SchedulerUI/UIxCalendarProperties.wox M UI/WebServerResources/UIxCalendarProperties.css +commit 52a2e85a1e441ba7812a059789a57b6c4ccf424a +Merge: 1a51f75 7401356 +Author: Wolfgang Sourdeau +Date: Fri Jun 20 14:55:37 2008 +0000 + + merge of '5901cb55e465d09b6ccf43a331523d24a91ebb01' + and 'ab2e4a9b9ea9d6fe4dbb85153205e15f4a080f30' + + Monotone-Parent: 5901cb55e465d09b6ccf43a331523d24a91ebb01 + Monotone-Parent: ab2e4a9b9ea9d6fe4dbb85153205e15f4a080f30 + Monotone-Revision: 187fb28d41b875b82a5bc4cebd053fc83e84f32b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-06-20T14:55:37 + Monotone-Branch: ca.inverse.sogo + commit 1a51f750127f1556330cbfa5ea1b3d34d68fa495 Author: Wolfgang Sourdeau Date: Fri Jun 20 14:52:40 2008 +0000 @@ -92062,6 +107641,22 @@ A SoObjects/SOGo/NSURL+DAV.m D SoObjects/SOGo/SOGoDAVRendererTypes.h D SoObjects/SOGo/SOGoDAVRendererTypes.m +commit 6a1cf458cd030a32c5604aed37a03788388e9abd +Merge: 0ea4ec6 466ec44 +Author: Wolfgang Sourdeau +Date: Tue Apr 29 20:59:05 2008 +0000 + + merge of 'edee02986f2da875cdc191d1e96c9d41d928200a' + and 'f36334509c4664853d23a261e33fef626136abcf' + + Monotone-Parent: edee02986f2da875cdc191d1e96c9d41d928200a + Monotone-Parent: f36334509c4664853d23a261e33fef626136abcf + Monotone-Revision: b8c85ddcde506f67f18bf96dcff79741af94661b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-04-29T20:59:05 + Monotone-Branch: ca.inverse.sogo + commit 466ec44822edbb10bd68996cb1d0b60cf93628ad Author: Wolfgang Sourdeau Date: Tue Apr 29 20:58:35 2008 +0000 @@ -92875,6 +108470,22 @@ Date: Fri Mar 28 14:47:07 2008 +0000 M UI/WebServerResources/ContactsUI.js +commit 90889142a0919585f9948e17740018c2d4f35d39 +Merge: 2a64c9d bba8241 +Author: Wolfgang Sourdeau +Date: Fri Mar 28 14:16:09 2008 +0000 + + merge of '14b1d75f21b83c7e79aaa832f13fcfd18393d8ea' + and '8a7a7f16173ed5c15a0214ed9fc820bffd475da1' + + Monotone-Parent: 14b1d75f21b83c7e79aaa832f13fcfd18393d8ea + Monotone-Parent: 8a7a7f16173ed5c15a0214ed9fc820bffd475da1 + Monotone-Revision: 77a448cff64353c09e0f8a786ad2aab1113b3a74 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-03-28T14:16:09 + Monotone-Branch: ca.inverse.sogo + commit 2a64c9ddcabcc3a9f8690cd1360d5634df84a487 Author: Wolfgang Sourdeau Date: Fri Mar 28 14:15:46 2008 +0000 @@ -92904,6 +108515,22 @@ Date: Fri Mar 28 13:56:07 2008 +0000 M UI/WebServerResources/ContactsUI.js +commit 5dd408cc433f1fd3012876c6221282b4a0695bb7 +Merge: 00565ec 05d4708 +Author: Wolfgang Sourdeau +Date: Thu Mar 27 21:19:39 2008 +0000 + + merge of 'e9991645e03e37c7b75619ac4070814a2b6e9ad8' + and 'f5eb60c48e1a3dab6f675586bd2f939ba6b44ebc' + + Monotone-Parent: e9991645e03e37c7b75619ac4070814a2b6e9ad8 + Monotone-Parent: f5eb60c48e1a3dab6f675586bd2f939ba6b44ebc + Monotone-Revision: d20c7d683d0045394dd1f0a002a37f7aecf38ce1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-03-27T21:19:39 + Monotone-Branch: ca.inverse.sogo + commit 05d4708ed60c71625cab4c6f372b7d03dce483f0 Author: Wolfgang Sourdeau Date: Thu Mar 27 21:08:51 2008 +0000 @@ -92977,6 +108604,22 @@ Date: Thu Mar 27 19:26:55 2008 +0000 M UI/WebServerResources/generic.js +commit 7ee91d7414c0a9b8995b81baf0b9c38aeaee5edc +Merge: 31958a7 e5dc646 +Author: Wolfgang Sourdeau +Date: Thu Mar 27 18:11:32 2008 +0000 + + merge of '31454db74b1a3b3d5fca41183f6969ab4a4d3f65' + and 'c663318a0219d6419a992fb60d66bd980d19ac2d' + + Monotone-Parent: 31454db74b1a3b3d5fca41183f6969ab4a4d3f65 + Monotone-Parent: c663318a0219d6419a992fb60d66bd980d19ac2d + Monotone-Revision: 389ee2a27fb75cca12b81a54f3b8a8c180f6d946 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-03-27T18:11:32 + Monotone-Branch: ca.inverse.sogo + commit e5dc646a89f291116a411f3898fefdb785555d46 Author: Wolfgang Sourdeau Date: Thu Mar 27 14:12:03 2008 +0000 @@ -93049,6 +108692,22 @@ Date: Wed Mar 26 20:49:30 2008 +0000 M UI/WebServerResources/SOGoRootPage.js +commit 86d45117ad61de8b54f5c6a5f937b596d3d1dbf9 +Merge: 4b815c9 de1bd56 +Author: Wolfgang Sourdeau +Date: Wed Mar 26 20:31:09 2008 +0000 + + merge of '33cd28ec24da9b667bfbfe813859158a7c753836' + and 'e70b402803fd5be6062e9c2357b0a52a293a3440' + + Monotone-Parent: 33cd28ec24da9b667bfbfe813859158a7c753836 + Monotone-Parent: e70b402803fd5be6062e9c2357b0a52a293a3440 + Monotone-Revision: cef7b2ad79ff11b1de6c82ad77501b4fa8f1d757 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-03-26T20:31:09 + Monotone-Branch: ca.inverse.sogo + commit de1bd56f2c33784009afc91b688809df420046c2 Author: Wolfgang Sourdeau Date: Wed Mar 26 20:30:53 2008 +0000 @@ -93124,6 +108783,22 @@ Date: Tue Mar 25 20:48:01 2008 +0000 M UI/Contacts/Italian.lproj/Localizable.strings +commit 5f5942fbdb872b721c5783a697d7feaefe6042aa +Merge: a62cd61 2bc2bb9 +Author: Wolfgang Sourdeau +Date: Tue Mar 25 20:44:40 2008 +0000 + + merge of 'c0da933d3e86c470a7d83491a010f1ba6edc3fcd' + and 'da177815e95b11791d2a07d68ea27df0c5d8b8e8' + + Monotone-Parent: c0da933d3e86c470a7d83491a010f1ba6edc3fcd + Monotone-Parent: da177815e95b11791d2a07d68ea27df0c5d8b8e8 + Monotone-Revision: 61ccc0b85c5ad0f5c359e98c73da3a77ec12dd09 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-03-25T20:44:40 + Monotone-Branch: ca.inverse.sogo + commit 2bc2bb954b1e7b2a0b0c257f26a6beff05f7e96a Author: Wolfgang Sourdeau Date: Tue Mar 25 20:43:29 2008 +0000 @@ -94595,6 +110270,22 @@ M UI/WebServerResources/MailerUI.js M UI/WebServerResources/SOGoDragHandles.js M UI/WebServerResources/SchedulerUI.js +commit 480dc6ff8687bc0754e4f00fc755b55532f1eb75 +Merge: 4c1808f c6b8cb5 +Author: Wolfgang Sourdeau +Date: Fri Feb 1 16:30:00 2008 +0000 + + merge of '6e077ed907974bc4e78dbdf12a128ba170de5a38' + and 'a216f87669942e793f9124b63661a5ae82105c1d' + + Monotone-Parent: 6e077ed907974bc4e78dbdf12a128ba170de5a38 + Monotone-Parent: a216f87669942e793f9124b63661a5ae82105c1d + Monotone-Revision: bdc770e039bce1273bf76acc5e48dd7006974831 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-02-01T16:30:00 + Monotone-Branch: ca.inverse.sogo + commit c6b8cb5a1cacfc72662845f38b01f5f340c566bb Author: Wolfgang Sourdeau Date: Fri Feb 1 16:28:53 2008 +0000 @@ -95015,6 +110706,22 @@ Date: Mon Jan 21 23:26:41 2008 +0000 M UI/MailerUI/German.lproj/Localizable.strings +commit 53a05b7e153f6208d59bd991f04bd9c5e16f9e68 +Merge: dbb64e6 5afddeb +Author: Wolfgang Sourdeau +Date: Mon Jan 21 23:18:27 2008 +0000 + + merge of '4c80538c3aa9361187b3f08174b8c64098a98318' + and '5ad5e8cbaacb3208712da8a7a033eb689e942a0c' + + Monotone-Parent: 4c80538c3aa9361187b3f08174b8c64098a98318 + Monotone-Parent: 5ad5e8cbaacb3208712da8a7a033eb689e942a0c + Monotone-Revision: b834eebdc880064c4db7e21c7bf4960a2b90f0d1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-01-21T23:18:27 + Monotone-Branch: ca.inverse.sogo + commit dbb64e6afae450db5359dc6ccd0b12d1f18a206d Author: Wolfgang Sourdeau Date: Mon Jan 21 23:18:02 2008 +0000 @@ -95033,6 +110740,22 @@ M UI/MailerUI/German.lproj/Localizable.strings M UI/PreferencesUI/German.lproj/Localizable.strings M UI/Scheduler/German.lproj/Localizable.strings +commit 5afddeb973ab3721dd596c69c20c97e7e1b9af94 +Merge: 22333ca 49bc44c +Author: Francis Lachapelle +Date: Mon Jan 21 20:52:53 2008 +0000 + + merge of '53c5d360d6227b55fed66ce7b836271a87287b35' + and '97ce53eed867e1824e43f8db18e4c2e3affcff00' + + Monotone-Parent: 53c5d360d6227b55fed66ce7b836271a87287b35 + Monotone-Parent: 97ce53eed867e1824e43f8db18e4c2e3affcff00 + Monotone-Revision: 5ad5e8cbaacb3208712da8a7a033eb689e942a0c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-01-21T20:52:53 + Monotone-Branch: ca.inverse.sogo + commit 22333cad807d459d2b41bb4675135707515f9ae3 Author: Francis Lachapelle Date: Mon Jan 21 20:52:44 2008 +0000 @@ -95087,6 +110810,22 @@ Date: Fri Jan 18 22:59:43 2008 +0000 M ChangeLog M SoObjects/Contacts/SOGoFolder+CardDAV.m +commit 88d952fa5b0e128a3d42b1d75e15fb593afa2df4 +Merge: b969506 13f9e39 +Author: Wolfgang Sourdeau +Date: Wed Jan 16 21:33:23 2008 +0000 + + merge of '110a71a41b33e24efaf1a4226f01890c4862b3ad' + and '893c06630e071283b43ce498129beffd183258e8' + + Monotone-Parent: 110a71a41b33e24efaf1a4226f01890c4862b3ad + Monotone-Parent: 893c06630e071283b43ce498129beffd183258e8 + Monotone-Revision: 0b8453c1e1ca97f10acca6a72c72e8f6b29907d6 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2008-01-16T21:33:23 + Monotone-Branch: ca.inverse.sogo + commit b969506d278d891e6e2185aa3f85b8363b0fcf4e Author: Francis Lachapelle Date: Wed Jan 16 21:24:39 2008 +0000 @@ -95328,6 +111067,22 @@ Date: Wed Jan 16 17:23:46 2008 +0000 M UI/Scheduler/German.lproj/Localizable.strings +commit 990484bb556d87063e0e84e3176a5564852b3435 +Merge: 4da5e75 f4fd9e1 +Author: Francis Lachapelle +Date: Wed Jan 16 17:12:33 2008 +0000 + + merge of '55cffccd09952a874480f0adb6ded2337fa76e1d' + and '656122c69a0d8d7212bed5df2febbb397d3ff7de' + + Monotone-Parent: 55cffccd09952a874480f0adb6ded2337fa76e1d + Monotone-Parent: 656122c69a0d8d7212bed5df2febbb397d3ff7de + Monotone-Revision: b11440ad1fa42c57190ed1e93d71261a15d7349c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-01-16T17:12:33 + Monotone-Branch: ca.inverse.sogo + commit f4fd9e1fa694a018059de0ddefde36d2d161a58b Author: Ludovic Marcotte Date: Wed Jan 16 17:07:46 2008 +0000 @@ -95501,6 +111256,22 @@ Date: Tue Jan 8 20:35:35 2008 +0000 M UI/Scheduler/English.lproj/Localizable.strings +commit ad85493d71a7509b629b08ad526712995c5bc550 +Merge: f4e0ba6 931c444 +Author: Francis Lachapelle +Date: Tue Jan 8 20:30:12 2008 +0000 + + merge of '417eb1a0caae0d680292391081de2e4b99beecda' + and '52de7ca60ee4c08121422f971592744b4e22b261' + + Monotone-Parent: 417eb1a0caae0d680292391081de2e4b99beecda + Monotone-Parent: 52de7ca60ee4c08121422f971592744b4e22b261 + Monotone-Revision: b660b29d66c16a254c4fdfd215d0c39ccb38db39 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2008-01-08T20:30:12 + Monotone-Branch: ca.inverse.sogo + commit f4e0ba66e6fed396f8a0850a7231ced79e924cf2 Author: Francis Lachapelle Date: Tue Jan 8 20:29:51 2008 +0000 @@ -95583,6 +111354,22 @@ M UI/WebServerResources/UIxAttendeesEditor.css M UI/WebServerResources/UIxAttendeesEditor.js M UI/WebServerResources/iefixes.css +commit 7574a9bb3a69c244865c57d7cfaac8fe86eb44a5 +Merge: 0b5ea38 6f6b695 +Author: Wolfgang Sourdeau +Date: Fri Dec 21 21:50:34 2007 +0000 + + merge of '2918fd48475c28fab3fffda506a3e755d3121d38' + and '46e53471ba15a415a840ddb058785b89b6415704' + + Monotone-Parent: 2918fd48475c28fab3fffda506a3e755d3121d38 + Monotone-Parent: 46e53471ba15a415a840ddb058785b89b6415704 + Monotone-Revision: 4bfedf0d0ab8fc8042756a4922e29e7270a9c9c0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-12-21T21:50:34 + Monotone-Branch: ca.inverse.sogo + commit 0b5ea38d2ca3f6bb08b562e3c4267ef1cc8628af Author: Wolfgang Sourdeau Date: Fri Dec 21 21:49:05 2007 +0000 @@ -95709,6 +111496,22 @@ Date: Thu Dec 20 21:55:50 2007 +0000 M UI/WebServerResources/MailerUI.css +commit 76715ba4c056d549ae60d9eb60f724bd005670b3 +Merge: fb2b3d0 9a7d530 +Author: Wolfgang Sourdeau +Date: Tue Dec 18 16:31:58 2007 +0000 + + merge of '46ad36b9683fe69680e587f98019b74bc6ec5d7f' + and '5bf793a7ff6961b9cb331cb0b2e5068dc768f5cf' + + Monotone-Parent: 46ad36b9683fe69680e587f98019b74bc6ec5d7f + Monotone-Parent: 5bf793a7ff6961b9cb331cb0b2e5068dc768f5cf + Monotone-Revision: ced0f06e463a22ebb3812a7fcd4a1ef7b5a1f46c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-12-18T16:31:58 + Monotone-Branch: ca.inverse.sogo + commit fb2b3d095aaf889c6c2579ac4aecf12af67bbb47 Author: Wolfgang Sourdeau Date: Tue Dec 18 16:30:03 2007 +0000 @@ -95735,6 +111538,22 @@ Date: Mon Dec 17 22:22:45 2007 +0000 M NEWS +commit 760f88a84890a6b3ea43839aa6c1cb69faedc7be +Merge: 6730c7a f505856 +Author: Francis Lachapelle +Date: Mon Dec 17 22:19:04 2007 +0000 + + merge of '2315fd857fb9cd19617eedf26be41092290b416f' + and '3014a5bc1171dc1be50b98deb24d4cfc7e769a71' + + Monotone-Parent: 2315fd857fb9cd19617eedf26be41092290b416f + Monotone-Parent: 3014a5bc1171dc1be50b98deb24d4cfc7e769a71 + Monotone-Revision: 1ba4b22d198e6713ef43aa72d57226fbb44656c1 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-12-17T22:19:04 + Monotone-Branch: ca.inverse.sogo + commit 6730c7ad1c715aafa700e9d939e10edc33fcccfd Author: Francis Lachapelle Date: Mon Dec 17 22:18:30 2007 +0000 @@ -95762,6 +111581,22 @@ Date: Mon Dec 17 22:12:32 2007 +0000 M NEWS +commit 806efcbbb92be042d8d90fb5d5a349866f649d85 +Merge: b5f32e5 4c75cda +Author: Francis Lachapelle +Date: Mon Dec 17 21:39:08 2007 +0000 + + merge of '2bfa9bbfe434c155e38912aec8785dc7fa44e272' + and '9e5bc230d6271b83c611acea6c2d7bd1bded95f1' + + Monotone-Parent: 2bfa9bbfe434c155e38912aec8785dc7fa44e272 + Monotone-Parent: 9e5bc230d6271b83c611acea6c2d7bd1bded95f1 + Monotone-Revision: 2f99ef62585c941c8c8ea1a94d1fc31d843c589f + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-12-17T21:39:08 + Monotone-Branch: ca.inverse.sogo + commit 4c75cda7f5e5733bd249bd10fdd17987d15752a9 Author: Francis Lachapelle Date: Mon Dec 17 21:38:48 2007 +0000 @@ -95829,6 +111664,22 @@ Date: Mon Dec 17 20:49:33 2007 +0000 M UI/Scheduler/UIxCalListingActions.m +commit 2fec4585dcb9bd432558ebb6b9be3797d70fed0b +Merge: 9ae5be9 b62a6e9 +Author: Wolfgang Sourdeau +Date: Mon Dec 17 20:46:13 2007 +0000 + + merge of '6233812eac33115667675d01081adb1fed7344fd' + and 'aca422868e377bcf123be4fcaa0a258238b473a6' + + Monotone-Parent: 6233812eac33115667675d01081adb1fed7344fd + Monotone-Parent: aca422868e377bcf123be4fcaa0a258238b473a6 + Monotone-Revision: c4d172fda57e0bd72cb109b117dbc93d996684f0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-12-17T20:46:13 + Monotone-Branch: ca.inverse.sogo + commit b62a6e9f7f6a8821111f3c85354e86c80a3bb6da Author: Wolfgang Sourdeau Date: Mon Dec 17 20:45:48 2007 +0000 @@ -95958,6 +111809,22 @@ Date: Mon Dec 17 15:34:01 2007 +0000 M UI/WebServerResources/ContactsUI.js M UI/WebServerResources/UIxContactsUserFolders.js +commit 619ca36d1e0b64b206a7542f3cdbaebb78edd9d8 +Merge: d7e2ba3 0f74a8d +Author: Francis Lachapelle +Date: Mon Dec 17 15:33:19 2007 +0000 + + merge of '67bda357e8c25b79b6b024c6a8a779918c63ab3e' + and '772069a4679fa8b05adc4dc49b2087230a05669c' + + Monotone-Parent: 67bda357e8c25b79b6b024c6a8a779918c63ab3e + Monotone-Parent: 772069a4679fa8b05adc4dc49b2087230a05669c + Monotone-Revision: b18975047f69436053c859a6b62916e650ac6f8b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-12-17T15:33:19 + Monotone-Branch: ca.inverse.sogo + commit 0f74a8d504d82f3daeeeeb1edfffa701a2b12a42 Author: Wolfgang Sourdeau Date: Mon Dec 17 15:29:06 2007 +0000 @@ -96385,6 +112252,22 @@ M UI/MailerUI/German.lproj/Localizable.strings M UI/Templates/MailerUI/UIxMailMainFrame.wox M UI/WebServerResources/MailerUI.js +commit bc548c963cad5061de657a59f6e0b6d8621fdbf0 +Merge: 912b9d1 a10c89f +Author: Francis Lachapelle +Date: Mon Dec 10 21:16:44 2007 +0000 + + merge of '2fb05a09608f9836ad74855b6a11b662b983d5a0' + and 'a2dcd47a4089e8f71eebc363e436ba2ed8bc6df5' + + Monotone-Parent: 2fb05a09608f9836ad74855b6a11b662b983d5a0 + Monotone-Parent: a2dcd47a4089e8f71eebc363e436ba2ed8bc6df5 + Monotone-Revision: 18f239a3de0b7ac267996e840fa462638dadaf29 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-12-10T21:16:44 + Monotone-Branch: ca.inverse.sogo + commit 912b9d1c040d0eb298d7fef868b2fb1a5241436a Author: Wolfgang Sourdeau Date: Mon Dec 10 21:15:32 2007 +0000 @@ -96608,6 +112491,22 @@ M UI/Common/UIxPageFrame.m M UI/Templates/UIxPageFrame.wox M UI/WebServerResources/generic.css +commit 48223b1ee7b83713ee3b0280cc1bd581d5b5833d +Merge: 5ccbed2 8a4b14a +Author: Wolfgang Sourdeau +Date: Thu Dec 6 21:10:14 2007 +0000 + + merge of 'b68be9f250b22568280f0f3fe29f6b42ed225aa1' + and 'c4ca1fc9171a84aed3074955c7d96c02bf3ae9ad' + + Monotone-Parent: b68be9f250b22568280f0f3fe29f6b42ed225aa1 + Monotone-Parent: c4ca1fc9171a84aed3074955c7d96c02bf3ae9ad + Monotone-Revision: 6753ccaa7526439dbf30f82e0fd9724d49478e83 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-12-06T21:10:14 + Monotone-Branch: ca.inverse.sogo + commit 5ccbed256ac3112ea4a62ff6a01663fae074d2f3 Author: Francis Lachapelle Date: Thu Dec 6 20:50:20 2007 +0000 @@ -96887,6 +112786,22 @@ Date: Tue Dec 4 23:24:40 2007 +0000 M UI/MailerUI/UIxMailToSelection.m +commit 626849f6f5c54b89a99f6ecf5fdb1b9287c06dd9 +Merge: bf8acbc ac0a6d8 +Author: Wolfgang Sourdeau +Date: Tue Dec 4 23:20:02 2007 +0000 + + merge of '0dd67af506445aca2871edc97a4383c609e20c42' + and '177ce0927201d7757ef2447dd1dbd4dab62930ae' + + Monotone-Parent: 0dd67af506445aca2871edc97a4383c609e20c42 + Monotone-Parent: 177ce0927201d7757ef2447dd1dbd4dab62930ae + Monotone-Revision: 78dcdb9c4c1457146fc206115afe39e0596352f3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-12-04T23:20:02 + Monotone-Branch: ca.inverse.sogo + commit ac0a6d8498c3b7ae605207d0adbbe2b800878dad Author: Wolfgang Sourdeau Date: Tue Dec 4 23:19:47 2007 +0000 @@ -97147,6 +113062,22 @@ Date: Wed Nov 28 23:36:40 2007 +0000 M NEWS +commit 6f4fb09792c83d28015c1331d5107e01bbf852d7 +Merge: dcf2e65 a786823 +Author: Wolfgang Sourdeau +Date: Tue Nov 27 23:18:47 2007 +0000 + + merge of '4d5fa5d41e23e83fdb8250dd90fc965723ec9b29' + and 'd2bae4e2dc4bfb2a6101a5dcd5cfd0eb00fdd4b1' + + Monotone-Parent: 4d5fa5d41e23e83fdb8250dd90fc965723ec9b29 + Monotone-Parent: d2bae4e2dc4bfb2a6101a5dcd5cfd0eb00fdd4b1 + Monotone-Revision: 36cb10929353af178a9112e3d9f13378f7a8a70f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-27T23:18:47 + Monotone-Branch: ca.inverse.sogo + commit dcf2e65b5223ab8264b47e234980517479779055 Author: Wolfgang Sourdeau Date: Tue Nov 27 23:18:17 2007 +0000 @@ -97258,6 +113189,22 @@ M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/UIxAppointmentEditor.js M UI/WebServerResources/skycalendar.html +commit 5447d83d4bf26e18683ea232a8110d6bc6f2c9bf +Merge: 348af28 fea5eb9 +Author: Francis Lachapelle +Date: Tue Nov 27 21:57:57 2007 +0000 + + merge of '30ec73924173f30cac8edaa24abb0d6e6dfdeac1' + and '3a0c58bfa60eceb8b04e37505a605d15b3d2b1af' + + Monotone-Parent: 30ec73924173f30cac8edaa24abb0d6e6dfdeac1 + Monotone-Parent: 3a0c58bfa60eceb8b04e37505a605d15b3d2b1af + Monotone-Revision: a9acd9019d1a4eac616803c0f5ee8fe8af50cf15 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-11-27T21:57:57 + Monotone-Branch: ca.inverse.sogo + commit fea5eb9d53d409de9245ab06afff1b951d3c31ea Author: Wolfgang Sourdeau Date: Tue Nov 27 21:07:30 2007 +0000 @@ -97585,6 +113532,22 @@ Date: Mon Nov 26 14:23:35 2007 +0000 M SoObjects/Mailer/SOGoDraftObject.m +commit 9b200c7820cdab5f4d7f5628402d29cbd6dbaa0c +Merge: cad5d40 b172c6d +Author: Wolfgang Sourdeau +Date: Mon Nov 26 14:02:18 2007 +0000 + + merge of 'd1e3f0a9a3c943496e50635a2761fd74560c93c1' + and 'ffdf9d7d568e2cf85a3845c522d88c7fbeb5d9bd' + + Monotone-Parent: d1e3f0a9a3c943496e50635a2761fd74560c93c1 + Monotone-Parent: ffdf9d7d568e2cf85a3845c522d88c7fbeb5d9bd + Monotone-Revision: 7f9ed95ef5a72bd87470633eec2baeb70b48936e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-26T14:02:18 + Monotone-Branch: ca.inverse.sogo + commit cad5d402018c30c4902bc4c74f7bc21f247988e6 Author: Ludovic Marcotte Date: Mon Nov 26 01:28:40 2007 +0000 @@ -97651,6 +113614,22 @@ M UI/WebServerResources/MailerUI.js M UI/WebServerResources/generic.css M UI/WebServerResources/generic.js +commit 5b4a14c031b5a88c6ddd1914063490d13199bf1d +Merge: e13dfcb 4c5c556 +Author: Francis Lachapelle +Date: Fri Nov 23 16:52:34 2007 +0000 + + merge of '95d6401b61dda37ed3a6fc0177c3a09c96cea4ca' + and 'd4812ea4a50ad648584e08fb8b3831fdc2b4a4ab' + + Monotone-Parent: 95d6401b61dda37ed3a6fc0177c3a09c96cea4ca + Monotone-Parent: d4812ea4a50ad648584e08fb8b3831fdc2b4a4ab + Monotone-Revision: 0c51f7b3e009fbf917f380938c76be5a98a288d0 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-11-23T16:52:34 + Monotone-Branch: ca.inverse.sogo + commit 4c5c55671c0a70899e1b6c513ee609633c2be5a6 Author: Francis Lachapelle Date: Fri Nov 23 16:52:08 2007 +0000 @@ -97716,6 +113695,25 @@ Date: Thu Nov 22 23:07:16 2007 +0000 A SOPE/sope-patchset-r1551.diff +commit 18069a8ebbe39979646fb045d0737f00583f0049 +Merge: d6041f3 9e7fd1b +Author: Francis Lachapelle +Date: Thu Nov 22 21:12:21 2007 +0000 + + merge of '6961ced4482e86c2a2fd2249397ec110584f633a' + and '9c563a19a8b6747bd6b2c53b4aec14e16c3a623e' + + Monotone-Parent: 6961ced4482e86c2a2fd2249397ec110584f633a + Monotone-Parent: 9c563a19a8b6747bd6b2c53b4aec14e16c3a623e + Monotone-Revision: 319bbf68185b357aadf75af746258d3fe8f23e91 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-22T21:12:21 + Monotone-Date: 2007-11-22T23:04:59 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit d6041f3d888123322b8ce08144ea086282d1176d Author: Francis Lachapelle Date: Thu Nov 22 21:11:49 2007 +0000 @@ -97762,6 +113760,22 @@ M ChangeLog M SoObjects/SOGo/NSCalendarDate+SOGo.h M SoObjects/SOGo/NSCalendarDate+SOGo.m +commit f0ff11f0a59a09ad482612cc763078e866664998 +Merge: 68b4fe0 a87d9dc +Author: Wolfgang Sourdeau +Date: Thu Nov 22 16:19:42 2007 +0000 + + merge of '00622e0c5fa34a4e5e98835bf4037dc6f562e342' + and '481000e0cd17c7724939535ed3c25eaa596aa5cb' + + Monotone-Parent: 00622e0c5fa34a4e5e98835bf4037dc6f562e342 + Monotone-Parent: 481000e0cd17c7724939535ed3c25eaa596aa5cb + Monotone-Revision: c1fa71027de8d19eaa232cf89370ad4655d2d15b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-22T16:19:42 + Monotone-Branch: ca.inverse.sogo + commit 68b4fe07be3d73aea37015b6fbf6fb354cc8d088 Author: Wolfgang Sourdeau Date: Thu Nov 22 16:19:11 2007 +0000 @@ -97804,6 +113818,22 @@ Date: Thu Nov 22 14:52:03 2007 +0000 M UI/WebServerResources/UIxAttendeesEditor.css +commit 4e18eae0c5a13d1bbba68d38d71374e51570e7ed +Merge: a421956 fc74f8f +Author: Francis Lachapelle +Date: Wed Nov 21 22:39:02 2007 +0000 + + merge of '97177e8c25666ceaaffd5ed4ce58fac2fef8354a' + and 'a2e22f9ca9e5096f59327f5b4d176050ffcbf15f' + + Monotone-Parent: 97177e8c25666ceaaffd5ed4ce58fac2fef8354a + Monotone-Parent: a2e22f9ca9e5096f59327f5b4d176050ffcbf15f + Monotone-Revision: a949c0a5881acabcd4cf2e8940f829cbd16b1037 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-11-21T22:39:02 + Monotone-Branch: ca.inverse.sogo + commit a421956b860616d025f5364c2b71ee04712f154c Author: Francis Lachapelle Date: Wed Nov 21 22:38:42 2007 +0000 @@ -97955,6 +113985,22 @@ Date: Wed Nov 21 15:27:52 2007 +0000 M SoObjects/Mailer/SOGoMailObject.m +commit d0bae20969807c94588deb1c092ca4c225ce5fcd +Merge: e45d56f 0070dc9 +Author: Francis Lachapelle +Date: Wed Nov 21 15:09:33 2007 +0000 + + merge of '397fde917fae54c68a56446340e43b77444b00e1' + and 'e9584ae6fb22159a5f2cace0641d3a58c6816280' + + Monotone-Parent: 397fde917fae54c68a56446340e43b77444b00e1 + Monotone-Parent: e9584ae6fb22159a5f2cace0641d3a58c6816280 + Monotone-Revision: 748fb7eea98a07ee1396f6902a6b0fb3e52f280e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-11-21T15:09:33 + Monotone-Branch: ca.inverse.sogo + commit e45d56f025c29388051fd019667b80473b026f5b Author: Francis Lachapelle Date: Wed Nov 21 15:04:37 2007 +0000 @@ -97987,6 +114033,22 @@ M SoObjects/Mailer/SOGoMailBodyPart.m M SoObjects/Mailer/SOGoMailObject.m M UI/MailPartViewers/UIxMailRenderingContext.m +commit 6718be9192a238a78c4fd763c384f8aabb701f4c +Merge: 0104aca 45deea7 +Author: Wolfgang Sourdeau +Date: Tue Nov 20 22:18:49 2007 +0000 + + merge of '566c52eecd68ab1a6fbb711a337a83289ec7b3b4' + and '917b856310d41617cad0757859d22615b99fed50' + + Monotone-Parent: 566c52eecd68ab1a6fbb711a337a83289ec7b3b4 + Monotone-Parent: 917b856310d41617cad0757859d22615b99fed50 + Monotone-Revision: b5051834282e52ed3ada41a862242574f4f3016d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-20T22:18:49 + Monotone-Branch: ca.inverse.sogo + commit 45deea7dfb7637367157cac17a231d672d5fcaf5 Author: Wolfgang Sourdeau Date: Tue Nov 20 22:18:30 2007 +0000 @@ -98043,6 +114105,22 @@ Date: Tue Nov 20 21:11:23 2007 +0000 M UI/WebServerResources/UIxMailEditor.css M UI/WebServerResources/UIxMailEditor.js +commit 69bee48ac6e31a19daf3882182ee6d49c480104b +Merge: 4522bd5 a0a7fce +Author: Francis Lachapelle +Date: Tue Nov 20 21:10:21 2007 +0000 + + merge of '3188fd0271db42fb785221461e9a3655109f23a8' + and '61fe4e19b18d4fbce396bf9e5434da7d4e74519d' + + Monotone-Parent: 3188fd0271db42fb785221461e9a3655109f23a8 + Monotone-Parent: 61fe4e19b18d4fbce396bf9e5434da7d4e74519d + Monotone-Revision: 4bdfcf9d428ded83dff00052f53189e0a1020675 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-11-20T21:10:21 + Monotone-Branch: ca.inverse.sogo + commit 4522bd5626da5ba15f064a56580d74d8f7cd5541 Author: Wolfgang Sourdeau Date: Tue Nov 20 19:15:26 2007 +0000 @@ -98073,6 +114151,22 @@ Date: Tue Nov 20 19:15:22 2007 +0000 M UI/WebServerResources/UIxMailEditor.js +commit a0a7fcec7e7633c1cce2eb801be1cc5b10522ac0 +Merge: 94c6930 bc9b594 +Author: Francis Lachapelle +Date: Tue Nov 20 17:11:53 2007 +0000 + + merge of '80314eb2f15e5d1fc369f56a8001f005ba7e0f5f' + and 'c44cce7c2e022aab27ce96484383b17671de3791' + + Monotone-Parent: 80314eb2f15e5d1fc369f56a8001f005ba7e0f5f + Monotone-Parent: c44cce7c2e022aab27ce96484383b17671de3791 + Monotone-Revision: 61fe4e19b18d4fbce396bf9e5434da7d4e74519d + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-11-20T17:11:53 + Monotone-Branch: ca.inverse.sogo + commit bc9b594178739668f2d4f14c896ef7b18342bb06 Author: Francis Lachapelle Date: Tue Nov 20 17:11:26 2007 +0000 @@ -98089,6 +114183,22 @@ M UI/WebServerResources/UIxAclEditor.js M UI/WebServerResources/generic.css M UI/WebServerResources/iefixes.css +commit 94c6930490d9ae2dfd4ca157058da9ddbcc796ca +Merge: fe606b3 ab03089 +Author: Wolfgang Sourdeau +Date: Tue Nov 20 17:01:19 2007 +0000 + + merge of '8b5761d2acde444a5c7b9214e3506a044c23919b' + and 'be71096e4701678c38f432b7c7ceb5d87bfd349f' + + Monotone-Parent: 8b5761d2acde444a5c7b9214e3506a044c23919b + Monotone-Parent: be71096e4701678c38f432b7c7ceb5d87bfd349f + Monotone-Revision: 80314eb2f15e5d1fc369f56a8001f005ba7e0f5f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-20T17:01:19 + Monotone-Branch: ca.inverse.sogo + commit ab0308931a6ab95dea8c9750f1b1d4e04e02f39d Author: Wolfgang Sourdeau Date: Tue Nov 20 17:00:08 2007 +0000 @@ -98184,6 +114294,22 @@ Date: Mon Nov 19 22:56:27 2007 +0000 M UI/Common/UIxPageFrame.m +commit 4538ed0e0ff450cd0f460306b5da42d686197e6a +Merge: 764d45e 2cbc2ba +Author: Wolfgang Sourdeau +Date: Mon Nov 19 22:44:56 2007 +0000 + + merge of '694c7b017aa273b513c6e1d50eea0215ccaf487c' + and 'd74fd5d68d5fae10363904ec274b94033ae33c2c' + + Monotone-Parent: 694c7b017aa273b513c6e1d50eea0215ccaf487c + Monotone-Parent: d74fd5d68d5fae10363904ec274b94033ae33c2c + Monotone-Revision: 08487d889f4363cd2d969280eaf5e7fb9f4dd28b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-19T22:44:56 + Monotone-Branch: ca.inverse.sogo + commit 2cbc2ba742a39bfd8528b3841386a6453fa4143a Author: Wolfgang Sourdeau Date: Mon Nov 19 22:44:12 2007 +0000 @@ -98242,6 +114368,22 @@ Date: Mon Nov 19 22:35:25 2007 +0000 M UI/Common/UIxPageFrame.h +commit 01f0bfe3852d8f9ae5ad61084c7a6fa73d8821ac +Merge: ca725a4 ad10b8e +Author: Wolfgang Sourdeau +Date: Mon Nov 19 22:34:47 2007 +0000 + + merge of '1af71f130ccb8d21bb16f766da69f735eac5f36b' + and '9e683df87b2b67f61552768bc12e69f0d289640e' + + Monotone-Parent: 1af71f130ccb8d21bb16f766da69f735eac5f36b + Monotone-Parent: 9e683df87b2b67f61552768bc12e69f0d289640e + Monotone-Revision: b7928cea3cb5b03ea7898caed42d7157ab0fcbd3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-19T22:34:47 + Monotone-Branch: ca.inverse.sogo + commit ca725a4dbddc196ffd79ceb3e76f271648e51fd3 Author: Wolfgang Sourdeau Date: Mon Nov 19 22:34:31 2007 +0000 @@ -98277,6 +114419,22 @@ M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/UIxAclEditor.js M UI/WebServerResources/generic.js +commit ddd0b2f65379a155d4553fd9b45deec4428d33c6 +Merge: c1e1b16 06fd3a0 +Author: Wolfgang Sourdeau +Date: Mon Nov 19 21:08:46 2007 +0000 + + merge of '1804bb2fc333899fed4fa062ac489b8006f6b8a4' + and '94a466c5a8173924f1c2a2c226a8e65b45001f24' + + Monotone-Parent: 1804bb2fc333899fed4fa062ac489b8006f6b8a4 + Monotone-Parent: 94a466c5a8173924f1c2a2c226a8e65b45001f24 + Monotone-Revision: efb32ee0b07634ff28f86f07c618160d8d121225 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-19T21:08:46 + Monotone-Branch: ca.inverse.sogo + commit c1e1b16f0a26585fc2fef4c59f7dbee333528683 Author: Wolfgang Sourdeau Date: Mon Nov 19 21:07:54 2007 +0000 @@ -98644,6 +114802,22 @@ M UI/WebServerResources/SchedulerUI.js M UI/WebServerResources/UIxComponentEditor.js M UI/WebServerResources/generic.css +commit dd5d07c5fbc201f9af511ac5478f4be71d76b0c5 +Merge: 51f5520 b686981 +Author: Wolfgang Sourdeau +Date: Thu Nov 15 22:42:02 2007 +0000 + + merge of '73e29d3a84d2c6904889f66d1758bfcbbb10951c' + and 'beaf15da6c5ace795eb3aec6ad006363be242a2d' + + Monotone-Parent: 73e29d3a84d2c6904889f66d1758bfcbbb10951c + Monotone-Parent: beaf15da6c5ace795eb3aec6ad006363be242a2d + Monotone-Revision: 437fac2430280df37d483569496666d9d69454cd + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-15T22:42:02 + Monotone-Branch: ca.inverse.sogo + commit b6869811a71e7b0f82f6081a14a80ac849c6bd23 Author: Wolfgang Sourdeau Date: Thu Nov 15 22:41:23 2007 +0000 @@ -98897,6 +115071,22 @@ Date: Tue Nov 13 17:39:03 2007 +0000 M ChangeLog M UI/Scheduler/UIxComponentEditor.m +commit 7e749b87b16b11ddbc0d0aecb26d06cbe9aa2b92 +Merge: 435050a a9e9741 +Author: Wolfgang Sourdeau +Date: Tue Nov 13 15:46:57 2007 +0000 + + merge of '7e27ec483444357e415f6b2215558bf38eeb8ca3' + and 'de861732de0e2d590062aa58b0990ee5de356ed5' + + Monotone-Parent: 7e27ec483444357e415f6b2215558bf38eeb8ca3 + Monotone-Parent: de861732de0e2d590062aa58b0990ee5de356ed5 + Monotone-Revision: 8aee58cb522e068aa5eaadc2f96fd18a32e8c998 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-13T15:46:57 + Monotone-Branch: ca.inverse.sogo + commit 435050a66d7187600b61ba4433071401c2c48d24 Author: Wolfgang Sourdeau Date: Tue Nov 13 14:58:40 2007 +0000 @@ -98942,6 +115132,22 @@ M UI/WebServerResources/UIxComponentEditor.js M UI/WebServerResources/generic.css M UI/WebServerResources/generic.js +commit f349060c90170b6f5b0b7a8d88a926655c3a3e43 +Merge: 412d3de ce13f57 +Author: Wolfgang Sourdeau +Date: Mon Nov 12 20:57:09 2007 +0000 + + merge of '20c7862f09b4fde6c2067b6fa562bc2dcd72ae78' + and '2699a7bfc566b3d087c4b5ed82888408feaa4fb3' + + Monotone-Parent: 20c7862f09b4fde6c2067b6fa562bc2dcd72ae78 + Monotone-Parent: 2699a7bfc566b3d087c4b5ed82888408feaa4fb3 + Monotone-Revision: 9932c60ae3f371eb7352ff77e53ef5ca51f43aec + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-12T20:57:09 + Monotone-Branch: ca.inverse.sogo + commit ce13f57d237c4ea29c202ad54a81c53f30340eb6 Author: Wolfgang Sourdeau Date: Mon Nov 12 20:56:56 2007 +0000 @@ -99015,6 +115221,27 @@ Date: Mon Nov 12 19:54:07 2007 +0000 M ChangeLog +commit 1e990e3bc9ae151289df5450cd108604bedfaf07 +Merge: 7066fcc 68586b3 +Author: Francis Lachapelle +Date: Mon Nov 12 19:33:06 2007 +0000 + + merge of '2d4a926cb463fbf80ac0aa402d2ed4efa912738c' + and 'e36a8c628cd255191811f8710656b9aae89137e7' + merge of 2d4a926cb463fbf80ac0aa402d2ed4efa912738c + and e36a8c628cd255191811f8710656b9aae89137e7 + + Monotone-Parent: 2d4a926cb463fbf80ac0aa402d2ed4efa912738c + Monotone-Parent: e36a8c628cd255191811f8710656b9aae89137e7 + Monotone-Revision: d63ac588bc9d6090e40d0640860dacaee66d0edb + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2007-11-12T19:33:06 + Monotone-Date: 2007-11-12T20:01:42 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit 7066fcc2ff1562f6feb3a33622e1fb89f0911202 Author: Wolfgang Sourdeau Date: Mon Nov 12 17:08:12 2007 +0000 @@ -99073,6 +115300,22 @@ Date: Mon Nov 12 15:05:25 2007 +0000 M SOPE/sope-patchset-r1546.diff +commit a62e558d10d1fecbfbccb2607c34b74f0643494b +Merge: 1eda040 1392e10 +Author: Wolfgang Sourdeau +Date: Sat Nov 10 00:03:24 2007 +0000 + + merge of '11f4bdac420d36e45b12ca5d1d393ec34f43c609' + and '90a65543c12f64be022dceaada5327dafced8237' + + Monotone-Parent: 11f4bdac420d36e45b12ca5d1d393ec34f43c609 + Monotone-Parent: 90a65543c12f64be022dceaada5327dafced8237 + Monotone-Revision: 0ae742cafbf84e4884bef1a66df7ee968561f6b3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-10T00:03:24 + Monotone-Branch: ca.inverse.sogo + commit 1eda040e8446d8b68c337bc8ad8af59e85463e37 Author: Wolfgang Sourdeau Date: Sat Nov 10 00:02:30 2007 +0000 @@ -99726,6 +115969,22 @@ Date: Wed Nov 7 15:40:23 2007 +0000 M SoObjects/Appointments/SOGoCalendarComponent.m +commit abc0a8dda5763f7191411edaeafb879c9edfca4f +Merge: f3a9826 f2798d6 +Author: Wolfgang Sourdeau +Date: Tue Nov 6 23:12:10 2007 +0000 + + merge of '5b69d2cd30194d3e8db89060210265b500c3a3e0' + and 'dae312b4bfd2084618c23a6232f43e0a9c5d7938' + + Monotone-Parent: 5b69d2cd30194d3e8db89060210265b500c3a3e0 + Monotone-Parent: dae312b4bfd2084618c23a6232f43e0a9c5d7938 + Monotone-Revision: cbbaf4a8411e0af4f8c4320f2c151556beba1fad + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-06T23:12:10 + Monotone-Branch: ca.inverse.sogo + commit f3a9826129dfc4f8aecd80a9f4691ad9d195f370 Author: Francis Lachapelle Date: Tue Nov 6 22:46:54 2007 +0000 @@ -99993,6 +116252,22 @@ M ChangeLog M UI/MailerUI/UIxMailListView.h M UI/MailerUI/UIxMailListView.m +commit 3c6d855c5e4037fb64eed4e81f14c6d8d598ba74 +Merge: d5b61ec 809fc79 +Author: Wolfgang Sourdeau +Date: Mon Nov 5 22:20:33 2007 +0000 + + merge of '573e35d1eb013cb0298d8cac99d4b4916c2a085c' + and '77360f1172167cd2c4d6add77a31565324428b78' + + Monotone-Parent: 573e35d1eb013cb0298d8cac99d4b4916c2a085c + Monotone-Parent: 77360f1172167cd2c4d6add77a31565324428b78 + Monotone-Revision: 1f5154a7061d5d35fbae4f27e238a58b5c521dc7 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-05T22:20:33 + Monotone-Branch: ca.inverse.sogo + commit 809fc79cfeafc1b5a079f3270e5a3ac8298d5e8a Author: Francis Lachapelle Date: Mon Nov 5 22:03:59 2007 +0000 @@ -100006,6 +116281,22 @@ Date: Mon Nov 5 22:03:59 2007 +0000 M UI/WebServerResources/MailerUI.js +commit d5b61ec534b290018cc475cd83ac31bb8b4c8e37 +Merge: 309ea3c a4964f4 +Author: Wolfgang Sourdeau +Date: Mon Nov 5 21:26:29 2007 +0000 + + merge of '6a4824550c190457f2e4b04575ebdecbfda0908d' + and 'b0e35bdbcaa9fb45b5f60a9d61d40f8ee83c0ffc' + + Monotone-Parent: 6a4824550c190457f2e4b04575ebdecbfda0908d + Monotone-Parent: b0e35bdbcaa9fb45b5f60a9d61d40f8ee83c0ffc + Monotone-Revision: 573e35d1eb013cb0298d8cac99d4b4916c2a085c + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-05T21:26:29 + Monotone-Branch: ca.inverse.sogo + commit a4964f4a07bc56565bbf3e4308c1067a33f22897 Author: Francis Lachapelle Date: Mon Nov 5 21:22:15 2007 +0000 @@ -100019,6 +116310,22 @@ Date: Mon Nov 5 21:22:15 2007 +0000 M NEWS +commit 452ead6e5549a632362355e9fcfc3571f3cd0e3a +Merge: c23a1a2 8bb257a +Author: Francis Lachapelle +Date: Mon Nov 5 21:19:32 2007 +0000 + + merge of 'b8a7f141c61c9502ae4ff5f47a7ba3738167855d' + and 'bbea5e19ac4a2f9a19a883ba3996f30f53daba4d' + + Monotone-Parent: b8a7f141c61c9502ae4ff5f47a7ba3738167855d + Monotone-Parent: bbea5e19ac4a2f9a19a883ba3996f30f53daba4d + Monotone-Revision: 0dcb1416bcd5a76e09bd067dde2a61df931921d9 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-11-05T21:19:32 + Monotone-Branch: ca.inverse.sogo + commit 8bb257ad270dc4894cab4c2985fa412ef3e5aba6 Author: Francis Lachapelle Date: Mon Nov 5 21:19:09 2007 +0000 @@ -100170,6 +116477,22 @@ M UI/MailerUI/WOContext+UIxMailer.m M UI/Templates/MailPartViewers/UIxMailPartMessageViewer.wox M UI/Templates/MailerUI/UIxMailView.wox +commit dcd79d986a5beb22783cf4a2ca222f4ffbcb24d1 +Merge: c6b33b5 cc0237b +Author: Wolfgang Sourdeau +Date: Mon Nov 5 14:52:45 2007 +0000 + + merge of '778ca12e99d197e109e23159f48ce1b32026519c' + and 'ecf850422f6e93462013857de0eaef9e5ed5eb02' + + Monotone-Parent: 778ca12e99d197e109e23159f48ce1b32026519c + Monotone-Parent: ecf850422f6e93462013857de0eaef9e5ed5eb02 + Monotone-Revision: 025330d36e1af8f073a0b0a02b64a65e36da2ffb + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-05T14:52:45 + Monotone-Branch: ca.inverse.sogo + commit cc0237bc45368239fbc985112f989068393640f5 Author: Wolfgang Sourdeau Date: Mon Nov 5 14:51:50 2007 +0000 @@ -100306,6 +116629,22 @@ Date: Sat Nov 3 21:16:59 2007 +0000 M ChangeLog M UI/Scheduler/UIxAppointmentEditor.m +commit f18ee2e6b39d5986fc542d28a6f01cfd91b68cae +Merge: 296f7c9 833c1b0 +Author: Wolfgang Sourdeau +Date: Sat Nov 3 03:18:30 2007 +0000 + + merge of '13393d495dd8aa1faf4cf52d567d0df2fa874cb2' + and '2e34a8c5fd6fbd4df87b0c1d3bde6bd4e3e7faab' + + Monotone-Parent: 13393d495dd8aa1faf4cf52d567d0df2fa874cb2 + Monotone-Parent: 2e34a8c5fd6fbd4df87b0c1d3bde6bd4e3e7faab + Monotone-Revision: 9309391aaa757ddac8064ffbf2a6d70142a30d02 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-03T03:18:30 + Monotone-Branch: ca.inverse.sogo + commit 296f7c9328574070544518b078758feb3deb1721 Author: Wolfgang Sourdeau Date: Sat Nov 3 03:18:13 2007 +0000 @@ -100390,6 +116729,22 @@ Date: Fri Nov 2 19:42:40 2007 +0000 M UI/WebServerResources/MailerUI.js +commit 2ab1e11e59a01e260ba80e602132b60c9601bacd +Merge: b7ba11b ad53fa5 +Author: Wolfgang Sourdeau +Date: Fri Nov 2 19:11:03 2007 +0000 + + merge of 'ced6d6c76d948b5a599e3ca67efeab0f03c99111' + and 'ed40a4a9e9d163d3485ee9181074ef26215a9f2e' + + Monotone-Parent: ced6d6c76d948b5a599e3ca67efeab0f03c99111 + Monotone-Parent: ed40a4a9e9d163d3485ee9181074ef26215a9f2e + Monotone-Revision: 909eda2dfa5708b168adc8b891a2217b109db587 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-02T19:11:03 + Monotone-Branch: ca.inverse.sogo + commit b7ba11be6107e3463c053730d5cdad474c5a4694 Author: Wolfgang Sourdeau Date: Fri Nov 2 19:02:24 2007 +0000 @@ -100480,6 +116835,22 @@ Date: Fri Nov 2 16:07:12 2007 +0000 M SOPE/sope-patchset-r1546.diff +commit ae54dff00b2549a6a6eb953ae11a992c92322b81 +Merge: 5a6a8c5 8c3088a +Author: Wolfgang Sourdeau +Date: Fri Nov 2 16:06:09 2007 +0000 + + merge of '099bb38adc3a421ac01c727c611e9aa2edfa4859' + and '481fe3d5a9c50bc134e3db63b08e84fc0a7456fd' + + Monotone-Parent: 099bb38adc3a421ac01c727c611e9aa2edfa4859 + Monotone-Parent: 481fe3d5a9c50bc134e3db63b08e84fc0a7456fd + Monotone-Revision: 0a65ce66f63c6abb9e10dda0172f401edd28a028 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-11-02T16:06:09 + Monotone-Branch: ca.inverse.sogo + commit 5a6a8c511ed3e677165838fa8e24f2e134825d25 Author: Wolfgang Sourdeau Date: Fri Nov 2 16:05:54 2007 +0000 @@ -100715,6 +117086,22 @@ Date: Thu Nov 1 12:25:21 2007 +0000 M ChangeLog M SoObjects/SOGo/AgenorUserDefaults.m +commit 8bc00a5cf22f6d32a18d6e1201f3b13be8bf215b +Merge: 28f4543 4b434d7 +Author: Wolfgang Sourdeau +Date: Wed Oct 31 17:16:50 2007 +0000 + + merge of '8598aa9f30108405c0f497eeedf0113568115c19' + and 'ccac1110e9fff9029a2485c4ba9345c4912b0c85' + + Monotone-Parent: 8598aa9f30108405c0f497eeedf0113568115c19 + Monotone-Parent: ccac1110e9fff9029a2485c4ba9345c4912b0c85 + Monotone-Revision: 23bc0dfd83428726c3d32139c369a2635bca5566 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-31T17:16:50 + Monotone-Branch: ca.inverse.sogo + commit 28f45434f4f19d02fa219f5e90dc11bf8e828fcf Author: Wolfgang Sourdeau Date: Wed Oct 31 17:16:14 2007 +0000 @@ -100769,6 +117156,22 @@ Date: Wed Oct 31 17:04:15 2007 +0000 M UI/MailPartViewers/UIxMailPartTextViewer.m M UI/WebServerResources/generic.js +commit 00b51bba79327cd50ab0ac42648b2af8567fe9ad +Merge: 32e9662 5f0ec7f +Author: Wolfgang Sourdeau +Date: Wed Oct 31 15:56:55 2007 +0000 + + merge of '24cf83dbb2cb1e47afd0354cd24653a8c26a7ce1' + and '422c0e30f5ac2600cebe515717b624e5c47f9b88' + + Monotone-Parent: 24cf83dbb2cb1e47afd0354cd24653a8c26a7ce1 + Monotone-Parent: 422c0e30f5ac2600cebe515717b624e5c47f9b88 + Monotone-Revision: c63be943c6ed8307cd0bd6059b5dd4d20e644c15 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-31T15:56:55 + Monotone-Branch: ca.inverse.sogo + commit 32e9662706319ee95f35952cefbdfa7a06845f1f Author: Wolfgang Sourdeau Date: Wed Oct 31 15:55:47 2007 +0000 @@ -100851,6 +117254,22 @@ M UI/MainUI/French.lproj/Localizable.strings M UI/Templates/MainUI/SOGoRootPage.wox M UI/Templates/UIxPageFrame.wox +commit 8fc51692f3ceecd3b98480f95c3854a4d2ce1bef +Merge: 9f6b51e cce5365 +Author: Wolfgang Sourdeau +Date: Tue Oct 30 21:52:00 2007 +0000 + + merge of '2ba549bd931928e8baf58a32a9d2f37dc0b06cdb' + and '32d1ca739dd26295aa3ac6edbf80356b4a503551' + + Monotone-Parent: 2ba549bd931928e8baf58a32a9d2f37dc0b06cdb + Monotone-Parent: 32d1ca739dd26295aa3ac6edbf80356b4a503551 + Monotone-Revision: 4a28046fedbf71f0488cf8b1025ae1f3deeea9e9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-30T21:52:00 + Monotone-Branch: ca.inverse.sogo + commit 9f6b51e9f215eed9d776d9b1ad9f0b4f9dff6423 Author: Wolfgang Sourdeau Date: Tue Oct 30 21:51:31 2007 +0000 @@ -100882,6 +117301,22 @@ Date: Tue Oct 30 21:04:11 2007 +0000 M UI/WebServerResources/MailerUI.js +commit f65b26e256d6cbc88792997a20a9923c0b533b1f +Merge: 3f1fadd 0986ba4 +Author: Francis Lachapelle +Date: Tue Oct 30 19:58:00 2007 +0000 + + merge of '0f1ef8f1bf7e8be2363a84056b5ce417b06606f7' + and '529806b76290054de1e3af14d027b6f92e169941' + + Monotone-Parent: 0f1ef8f1bf7e8be2363a84056b5ce417b06606f7 + Monotone-Parent: 529806b76290054de1e3af14d027b6f92e169941 + Monotone-Revision: f8ea10b15b292e5a980916a948246542ce346cca + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-10-30T19:58:00 + Monotone-Branch: ca.inverse.sogo + commit 3f1fadd28b8aebb0d1cae04e1d3b1b7c95c651de Author: Francis Lachapelle Date: Tue Oct 30 19:56:50 2007 +0000 @@ -101042,6 +117477,22 @@ M UI/MailerUI/UIxMailListView.m M UI/Templates/MailerUI/UIxMailListView.wox M UI/WebServerResources/MailerUI.js +commit 06db6b3cfec94927d9403f04143444bdbf11349d +Merge: eaf4b21 2ab7bfa +Author: Wolfgang Sourdeau +Date: Mon Oct 29 15:34:41 2007 +0000 + + merge of 'aed8c4c9e27094db008e460fe8a2157565022474' + and 'e4fec6e182744550cd3d54b27f42cadaca7953e5' + + Monotone-Parent: aed8c4c9e27094db008e460fe8a2157565022474 + Monotone-Parent: e4fec6e182744550cd3d54b27f42cadaca7953e5 + Monotone-Revision: 2bc207d81d82294857b2ad0ea427bf850d32867d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-29T15:34:41 + Monotone-Branch: ca.inverse.sogo + commit eaf4b21b7b02921fdeee4cb9969d143e65d39deb Author: Wolfgang Sourdeau Date: Mon Oct 29 15:33:51 2007 +0000 @@ -101207,6 +117658,22 @@ Date: Fri Oct 26 15:50:27 2007 +0000 M ChangeLog M SoObjects/Mailer/SOGoMailBodyPart.m +commit 708dcfc0b18c491ce28f0259b8765775a896bac6 +Merge: 5ce7f9d 116df61 +Author: Wolfgang Sourdeau +Date: Fri Oct 26 15:36:34 2007 +0000 + + merge of '286ef895fa5866cbba4e854f1db4225df88da0b5' + and '43873f327e4f2327b78f3b1c2f2c079cbe5f76d0' + + Monotone-Parent: 286ef895fa5866cbba4e854f1db4225df88da0b5 + Monotone-Parent: 43873f327e4f2327b78f3b1c2f2c079cbe5f76d0 + Monotone-Revision: 4557d2116359d7e6bf6cc5b09aa5249747d99199 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-26T15:36:34 + Monotone-Branch: ca.inverse.sogo + commit 116df618efa1ad126cb11508efeb37591fa36b25 Author: Wolfgang Sourdeau Date: Fri Oct 26 15:35:51 2007 +0000 @@ -101273,6 +117740,22 @@ Date: Fri Oct 26 13:58:15 2007 +0000 M UI/MainUI/SOGoUserHomePage.m +commit f9d0c78e93268db2a485b34e240196fbb5c89b8c +Merge: db25967 a62ca91 +Author: Francis Lachapelle +Date: Thu Oct 25 20:36:28 2007 +0000 + + merge of '6554f23cdb0a8f5750823a6297e26d8134456619' + and 'e66413b1d356cd2a685502a8443bfd09cf20b6a5' + + Monotone-Parent: 6554f23cdb0a8f5750823a6297e26d8134456619 + Monotone-Parent: e66413b1d356cd2a685502a8443bfd09cf20b6a5 + Monotone-Revision: 63a530bbdbc486f47136825ad11a2ed0267f8e1e + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-10-25T20:36:28 + Monotone-Branch: ca.inverse.sogo + commit db25967bd20a180c7b0a99f23f74055860f2be02 Author: Francis Lachapelle Date: Thu Oct 25 20:36:08 2007 +0000 @@ -101288,6 +117771,22 @@ M UI/WebServerResources/MailerUI.css M UI/WebServerResources/MailerUI.js M UI/WebServerResources/UIxMailPopupView.js +commit a62ca9197571285316e7148172c8d380c8d3821e +Merge: ca1db4c 9657b7f +Author: Wolfgang Sourdeau +Date: Thu Oct 25 20:12:19 2007 +0000 + + merge of '0ebf0ab3929b5c634b6870dbdf4648265482e512' + and '92223c349e36554e352239ae2da737603abfaea3' + + Monotone-Parent: 0ebf0ab3929b5c634b6870dbdf4648265482e512 + Monotone-Parent: 92223c349e36554e352239ae2da737603abfaea3 + Monotone-Revision: e66413b1d356cd2a685502a8443bfd09cf20b6a5 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-25T20:12:19 + Monotone-Branch: ca.inverse.sogo + commit 9657b7f1d8ddbf67b5efe770da0ba2134a491155 Author: Wolfgang Sourdeau Date: Thu Oct 25 20:07:56 2007 +0000 @@ -101322,6 +117821,22 @@ Date: Thu Oct 25 19:41:49 2007 +0000 M UI/WebServerResources/generic.js +commit c8111dd1133bf5a3b9c89cfa84024bf60c0c8605 +Merge: 1838a83 2ee860c +Author: Francis Lachapelle +Date: Thu Oct 25 19:22:23 2007 +0000 + + merge of '0a3d8971fb4a3b2c5dfbe3f501204e4f46f3ce96' + and '411e18da9b8303cd9a4927e92d807baf5025523f' + + Monotone-Parent: 0a3d8971fb4a3b2c5dfbe3f501204e4f46f3ce96 + Monotone-Parent: 411e18da9b8303cd9a4927e92d807baf5025523f + Monotone-Revision: b8739c38c2f4892f1fb2d687073e8cd5538e75f8 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-10-25T19:22:23 + Monotone-Branch: ca.inverse.sogo + commit 1838a833fa51b9aaab8f12ebc8656e8b56768e57 Author: Francis Lachapelle Date: Thu Oct 25 19:22:07 2007 +0000 @@ -101376,6 +117891,22 @@ Date: Thu Oct 25 17:34:27 2007 +0000 M UI/WebServerResources/UIxMailEditor.js +commit 1ecd73a134a20bf2a381c0064c00dda16ca84aab +Merge: cbd3b01 78d3048 +Author: Wolfgang Sourdeau +Date: Thu Oct 25 15:29:13 2007 +0000 + + merge of '5510a075ff0317a22da3bd5c546abb2ce9386a21' + and '8a165a32a6a836849e62e7fa408d15b5ce3c7a25' + + Monotone-Parent: 5510a075ff0317a22da3bd5c546abb2ce9386a21 + Monotone-Parent: 8a165a32a6a836849e62e7fa408d15b5ce3c7a25 + Monotone-Revision: aac6a8a6798d9e703464623588abec8ba095b7e3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-25T15:29:13 + Monotone-Branch: ca.inverse.sogo + commit cbd3b01764aad15288671a0ffe0891a7ddd3d651 Author: Wolfgang Sourdeau Date: Thu Oct 25 15:28:59 2007 +0000 @@ -101472,6 +118003,22 @@ M ChangeLog A SoObjects/Mailer/NSData+Mail.h A SoObjects/Mailer/NSData+Mail.m +commit 78d3048cdb7ce6f5b752d84fa1f9ba20b29eb720 +Merge: 93f24ba b2ed4bf +Author: Francis Lachapelle +Date: Thu Oct 25 14:05:29 2007 +0000 + + merge of '7ee0c1dd084226bd61d44f69428903723aac6bbc' + and 'd740c679cf1cefcedfad26e298c71bde54a6286d' + + Monotone-Parent: 7ee0c1dd084226bd61d44f69428903723aac6bbc + Monotone-Parent: d740c679cf1cefcedfad26e298c71bde54a6286d + Monotone-Revision: 8a165a32a6a836849e62e7fa408d15b5ce3c7a25 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-10-25T14:05:29 + Monotone-Branch: ca.inverse.sogo + commit b2ed4bfad4cda4eabe8cf527b0bb45efbd26b03b Author: Francis Lachapelle Date: Wed Oct 24 20:06:53 2007 +0000 @@ -101499,6 +118046,22 @@ Date: Wed Oct 24 17:21:33 2007 +0000 D SOPE/sope-patchset-r1544.diff D SOPE/sope-patchset-r1545.diff +commit 90903cd520cbe0f2c002c567d526daccd116fc0b +Merge: 376cf9d d1bc275 +Author: Wolfgang Sourdeau +Date: Wed Oct 24 17:11:26 2007 +0000 + + merge of '73129aff4f6b4b95f21676585470ad140c466afe' + and 'd82071db080ca95a635a31828f573df51471c057' + + Monotone-Parent: 73129aff4f6b4b95f21676585470ad140c466afe + Monotone-Parent: d82071db080ca95a635a31828f573df51471c057 + Monotone-Revision: 84918f7ffc2695a68b90c84f75767b8b17f3d954 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-24T17:11:26 + Monotone-Branch: ca.inverse.sogo + commit d1bc275c1f7fe448cd0b4cd3abfcd47f1d41ceaa Author: Francis Lachapelle Date: Wed Oct 24 17:10:16 2007 +0000 @@ -101514,6 +118077,22 @@ M UI/Templates/SchedulerUI/UIxCalendarSelector.wox M UI/WebServerResources/SchedulerUI.css M UI/WebServerResources/SchedulerUI.js +commit 376cf9dedc0f8968a136b8a32a153d85bb6590d5 +Merge: 2ff9d68 f03e5f5 +Author: Wolfgang Sourdeau +Date: Wed Oct 24 16:56:45 2007 +0000 + + merge of '144891fa296b6c974c0d29524a0c1c6609d48279' + and '2cfe32432efb28a38a497bae78a3b7dcc275af26' + + Monotone-Parent: 144891fa296b6c974c0d29524a0c1c6609d48279 + Monotone-Parent: 2cfe32432efb28a38a497bae78a3b7dcc275af26 + Monotone-Revision: 73129aff4f6b4b95f21676585470ad140c466afe + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-24T16:56:45 + Monotone-Branch: ca.inverse.sogo + commit f03e5f5e14ab83a2e94e68a439e36bc301af2c99 Author: Wolfgang Sourdeau Date: Wed Oct 24 16:56:34 2007 +0000 @@ -101832,6 +118411,22 @@ Date: Mon Oct 22 21:52:13 2007 +0000 M SoObjects/SOGo/SOGoFolder.m +commit 3752adf2c6143460ecc68a7237c49892fc159371 +Merge: ab26db1 088482a +Author: Wolfgang Sourdeau +Date: Mon Oct 22 16:07:51 2007 +0000 + + merge of '0041273d01585512fe8832e36abdf07e9decc527' + and '70caa6c315c0b61c28f0ef9d832f18f6cd4ba00f' + + Monotone-Parent: 0041273d01585512fe8832e36abdf07e9decc527 + Monotone-Parent: 70caa6c315c0b61c28f0ef9d832f18f6cd4ba00f + Monotone-Revision: 9bd3efbf4f547d824498717029033f28648869c2 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-22T16:07:51 + Monotone-Branch: ca.inverse.sogo + commit 088482accb56978208bdee3c12be56c62f7a3d59 Author: Wolfgang Sourdeau Date: Mon Oct 22 16:07:12 2007 +0000 @@ -101861,6 +118456,22 @@ Date: Mon Oct 22 16:02:36 2007 +0000 M SoObjects/Mailer/SOGoMailAccount.m +commit ab26db1f989e00ac0ce746cd8c6ccfe0c58f5c7c +Merge: 5df57e7 4f7f132 +Author: Francis Lachapelle +Date: Mon Oct 22 15:18:41 2007 +0000 + + merge of '5d835533f52a26e3b8bb1a2570a4ac5d20e8e7a6' + and 'd3291322d5661d3ab179d4b554b40c2516e33731' + + Monotone-Parent: 5d835533f52a26e3b8bb1a2570a4ac5d20e8e7a6 + Monotone-Parent: d3291322d5661d3ab179d4b554b40c2516e33731 + Monotone-Revision: 0041273d01585512fe8832e36abdf07e9decc527 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-10-22T15:18:41 + Monotone-Branch: ca.inverse.sogo + commit 5df57e72217288aa73af52a4996d8fa6ea64594b Author: Wolfgang Sourdeau Date: Mon Oct 22 13:50:49 2007 +0000 @@ -101927,6 +118538,22 @@ Date: Fri Oct 19 21:00:25 2007 +0000 M Main/sogod.m +commit 41499c069be7b8e06fcffd9cab1d7bdb21db7cb3 +Merge: 1e29a6e b1c41eb +Author: Wolfgang Sourdeau +Date: Fri Oct 19 19:33:01 2007 +0000 + + merge of '1c43299cc4dd7d03f90df10c2a39ffe39966165a' + and 'f775647c24125f4df21cdc41b3c4eae6eccec830' + + Monotone-Parent: 1c43299cc4dd7d03f90df10c2a39ffe39966165a + Monotone-Parent: f775647c24125f4df21cdc41b3c4eae6eccec830 + Monotone-Revision: cced931fa315625b655b851184d3453c3a115eee + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-19T19:33:01 + Monotone-Branch: ca.inverse.sogo + commit 1e29a6e20cdcbb427ff3a15909845cd37d78b8c7 Author: Wolfgang Sourdeau Date: Fri Oct 19 19:32:00 2007 +0000 @@ -102089,6 +118716,22 @@ M ChangeLog M UI/Common/UIxPageFrame.h M UI/Common/UIxPageFrame.m +commit aa0f8d2c4abc828ae53c891c8c24d18f3b59ade9 +Merge: 361e31b 3fd8ee0 +Author: Wolfgang Sourdeau +Date: Thu Oct 18 17:20:18 2007 +0000 + + merge of '57ab60b3a3a179042115ec92eeabf44470945a9c' + and '7822887b219614cd66e9d1e19da4799f884657bf' + + Monotone-Parent: 57ab60b3a3a179042115ec92eeabf44470945a9c + Monotone-Parent: 7822887b219614cd66e9d1e19da4799f884657bf + Monotone-Revision: 0ed0ef307cb74b67ba17424e0e8a0e04a8364e9f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-10-18T17:20:18 + Monotone-Branch: ca.inverse.sogo + commit 361e31b6429f1c1ca9d125c2605347cd09bfdf31 Author: Wolfgang Sourdeau Date: Thu Oct 18 17:19:05 2007 +0000 @@ -102177,6 +118820,22 @@ M UI/Templates/UIxPageFrame.wox M UI/WebServerResources/ContactsUI.js M UI/WebServerResources/generic.js +commit 3fd8ee059fefc821d415fe9128f147efe3c7d50a +Merge: bd3b16a 4e7ed2d +Author: Dominik Gehl +Date: Thu Oct 18 01:44:28 2007 +0000 + + merge of '7659385c293a64fbec59fda5d5bf34bcd7b51d96' + and 'f8b29d68c36441f92d7ffe8056a95fd25a2fd409' + + Monotone-Parent: 7659385c293a64fbec59fda5d5bf34bcd7b51d96 + Monotone-Parent: f8b29d68c36441f92d7ffe8056a95fd25a2fd409 + Monotone-Revision: 7822887b219614cd66e9d1e19da4799f884657bf + + Monotone-Author: dgehl@inverse.ca + Monotone-Date: 2007-10-18T01:44:28 + Monotone-Branch: ca.inverse.sogo + commit bd3b16ab89c3b9d2dd2f3af10b2d4fe092af1bf8 Author: Dominik Gehl Date: Thu Oct 18 01:44:14 2007 +0000 @@ -102587,6 +119246,54 @@ Date: Thu Oct 11 20:31:42 2007 +0000 A SOPE/sope-patchset-r1544.diff M UI/WebServerResources/SchedulerUI.js +commit 86036f3b6171d72fab9e04edaf46de3545b3987c +Merge: b181ae4 7de2095 +Author: Ludovic Marcotte +Date: Thu Oct 11 16:07:46 2007 +0000 + + merge of b0b72d2b8bd2c6a09fcdb1e4950988276473744a + and f8ff047cf5f8db346b806dbe1e5ab68bf8e9d22b + + Monotone-Parent: b0b72d2b8bd2c6a09fcdb1e4950988276473744a + Monotone-Parent: f8ff047cf5f8db346b806dbe1e5ab68bf8e9d22b + Monotone-Revision: 1627eb2fa6b4c1b99a1724c339095c802d86f162 + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2007-10-11T16:07:46 + Monotone-Branch: ca.inverse.sogo + +commit 7de20958da4d37c3882c9279291769706e451a22 +Merge: e6964ac eb86b0d +Author: Francis Lachapelle +Date: Thu Oct 11 15:58:26 2007 +0000 + + merge of '015eb4cf8ecea01eb6fda8056121a53f54047e09' + and 'e3b893517d5077cf65dad935434fc36e7d8fec29' + + Monotone-Parent: 015eb4cf8ecea01eb6fda8056121a53f54047e09 + Monotone-Parent: e3b893517d5077cf65dad935434fc36e7d8fec29 + Monotone-Revision: f8ff047cf5f8db346b806dbe1e5ab68bf8e9d22b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-10-11T15:58:26 + Monotone-Branch: ca.inverse.sogo + +commit b181ae4d0e6525de061b7cc19a6b4862badc3537 +Merge: e6964ac 62e7896 +Author: Ludovic Marcotte +Date: Thu Oct 11 15:12:07 2007 +0000 + + merge of 015eb4cf8ecea01eb6fda8056121a53f54047e09 + and b5f6c20667d64bf39106ed8fa0eed2bcee16e372 + + Monotone-Parent: 015eb4cf8ecea01eb6fda8056121a53f54047e09 + Monotone-Parent: b5f6c20667d64bf39106ed8fa0eed2bcee16e372 + Monotone-Revision: b0b72d2b8bd2c6a09fcdb1e4950988276473744a + + Monotone-Author: ludovic@Sophos.ca + Monotone-Date: 2007-10-11T15:12:07 + Monotone-Branch: ca.inverse.sogo + commit e6964ac180114361176707a557a7e8c999632e4d Author: Ludovic Marcotte Date: Wed Oct 10 20:34:34 2007 +0000 @@ -102604,6 +119311,22 @@ M ChangeLog M UI/MailPartViewers/UIxMailPartTextViewer.m M UI/WebServerResources/MailerUI.css +commit eb86b0d6c77b2818802c4babcb3b29ca726d040f +Merge: 778658c 62e7896 +Author: Francis Lachapelle +Date: Wed Oct 10 19:28:05 2007 +0000 + + merge of '8b8f40b39b92d25a5eb1161d5efe0bd91fd3e207' + and 'b5f6c20667d64bf39106ed8fa0eed2bcee16e372' + + Monotone-Parent: 8b8f40b39b92d25a5eb1161d5efe0bd91fd3e207 + Monotone-Parent: b5f6c20667d64bf39106ed8fa0eed2bcee16e372 + Monotone-Revision: e3b893517d5077cf65dad935434fc36e7d8fec29 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-10-10T19:28:05 + Monotone-Branch: ca.inverse.sogo + commit 62e7896e1c979fa3e6ea62b2acd19ae07329e5bc Author: Francis Lachapelle Date: Wed Oct 10 19:25:48 2007 +0000 @@ -103180,6 +119903,22 @@ Date: Fri Sep 21 14:20:10 2007 +0000 M UI/WebServerResources/UIxCalUserRightsEditor.js M UI/WebServerResources/UIxMailUserRightsEditor.js +commit bb4d573291979c930ee8c3b1de7e71106466a794 +Merge: 18f5d5b 80da504 +Author: Wolfgang Sourdeau +Date: Wed Sep 19 22:03:30 2007 +0000 + + merge of '19a9cb7dca6866c4d759812496468f9d93e33225' + and '96effe6b8b81620e6321b228cbab54c6d0ff3555' + + Monotone-Parent: 19a9cb7dca6866c4d759812496468f9d93e33225 + Monotone-Parent: 96effe6b8b81620e6321b228cbab54c6d0ff3555 + Monotone-Revision: 3ebb6d8ed27fdb6ba4b35f0bfcdbc625fd8620b2 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-09-19T22:03:30 + Monotone-Branch: ca.inverse.sogo + commit 18f5d5bf9fe5bb48919746273a3a4a135c70c3e8 Author: Wolfgang Sourdeau Date: Wed Sep 19 22:03:11 2007 +0000 @@ -103268,6 +120007,22 @@ M UI/Templates/MainUI/SOGoRootPage.wox M UI/Templates/UIxPageFrame.wox M UI/WebServerResources/SOGoRootPage.css +commit b9393f0dd6adfa39126e342b5172b1726e507899 +Merge: 98385b5 59ee273 +Author: Francis Lachapelle +Date: Tue Sep 18 14:47:18 2007 +0000 + + merge of 'b94a205a2235d5b995faf01f91a8cccfff28235d' + and 'e480078fda9240a929b3ea04d2ddecdf26c20630' + + Monotone-Parent: b94a205a2235d5b995faf01f91a8cccfff28235d + Monotone-Parent: e480078fda9240a929b3ea04d2ddecdf26c20630 + Monotone-Revision: ebea63a163ebf08fba3b02873febbe9dcaaaeb2c + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-09-18T14:47:18 + Monotone-Branch: ca.inverse.sogo + commit 59ee273dc77eb210a4e268be7d0c37263e4511d7 Author: Francis Lachapelle Date: Mon Sep 17 22:42:55 2007 +0000 @@ -103350,6 +120105,22 @@ Date: Mon Sep 17 18:01:02 2007 +0000 M ChangeLog M UI/MailPartViewers/UIxMailPartICalViewer.m +commit 956c0ad57d4674e58f6b35c08820a74a8b2dcdfc +Merge: 1a12bec daee6ab +Author: Wolfgang Sourdeau +Date: Mon Sep 17 17:25:37 2007 +0000 + + merge of '10b3eef04f57d98b8cd5811853bd18ee77bd52c7' + and '7001bd5342e68b3d0c659bc90a70a249a337d23c' + + Monotone-Parent: 10b3eef04f57d98b8cd5811853bd18ee77bd52c7 + Monotone-Parent: 7001bd5342e68b3d0c659bc90a70a249a337d23c + Monotone-Revision: 95a479a030c58000846673a3dd3d9cdb31012678 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-09-17T17:25:37 + Monotone-Branch: ca.inverse.sogo + commit 1a12bec82232d7effecff740533fe5e47135273b Author: Wolfgang Sourdeau Date: Mon Sep 17 17:24:22 2007 +0000 @@ -103861,6 +120632,22 @@ Date: Fri Sep 14 22:06:36 2007 +0000 M NEWS +commit d4c43b432ef0b9635fb554fa360de0608c065abd +Merge: 3b49a8a 21718ae +Author: Wolfgang Sourdeau +Date: Fri Sep 14 22:05:54 2007 +0000 + + merge of '36df3bcfd6c56f483f2676ceb6b6757a6506dbb7' + and 'f12c75a72aac13edc9728fe5a656c622487836dd' + + Monotone-Parent: 36df3bcfd6c56f483f2676ceb6b6757a6506dbb7 + Monotone-Parent: f12c75a72aac13edc9728fe5a656c622487836dd + Monotone-Revision: 0c622c14bea584c75539ec4bf9d8ca29899745ef + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-09-14T22:05:54 + Monotone-Branch: ca.inverse.sogo + commit 21718aeac2aaec564cca74bfd68956c5e00eb254 Author: Wolfgang Sourdeau Date: Fri Sep 14 22:02:15 2007 +0000 @@ -104033,6 +120820,22 @@ M UI/Scheduler/English.lproj/Localizable.strings M UI/Scheduler/French.lproj/Localizable.strings M UI/Templates/UIxToolbar.wox +commit e9c31c81c86f35dd6c8ea24ca3848a644e6559a4 +Merge: 04d59e0 0c2dbaa +Author: Wolfgang Sourdeau +Date: Thu Sep 13 21:15:22 2007 +0000 + + merge of '9553e562ebed3759fe2052393023f3b5eb697bc0' + and 'a9a496d4716bb30eac90c8ad8d7e50c38bef62c8' + + Monotone-Parent: 9553e562ebed3759fe2052393023f3b5eb697bc0 + Monotone-Parent: a9a496d4716bb30eac90c8ad8d7e50c38bef62c8 + Monotone-Revision: d3bbadcce7472714c99e523e6d397a87aa65bf5b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-09-13T21:15:22 + Monotone-Branch: ca.inverse.sogo + commit 04d59e006e6f37e9e49ac62ecd87a4963d80ef72 Author: Francis Lachapelle Date: Thu Sep 13 18:22:23 2007 +0000 @@ -104074,6 +120877,22 @@ Date: Wed Sep 12 13:01:17 2007 +0000 M ChangeLog M UI/MainUI/SOGoRootPage.m +commit 9a679ba49cc4e4971ea2bff3d32a4a3fa9547658 +Merge: 6be11b1 3de30ec +Author: Wolfgang Sourdeau +Date: Tue Sep 11 20:58:35 2007 +0000 + + merge of 'baf4c7f8461dec960162ae0da21047d576421c14' + and 'fefb3f05edb2d5e5ba63661ae145d0369e47b444' + + Monotone-Parent: baf4c7f8461dec960162ae0da21047d576421c14 + Monotone-Parent: fefb3f05edb2d5e5ba63661ae145d0369e47b444 + Monotone-Revision: 9ef1fb2c66953b8ada0d55d0eec183621a71ebab + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-09-11T20:58:35 + Monotone-Branch: ca.inverse.sogo + commit 3de30ec3bfe8891e81ed39e1006cb8ba575ae00a Author: Wolfgang Sourdeau Date: Tue Sep 11 20:49:06 2007 +0000 @@ -104350,6 +121169,22 @@ Date: Mon Sep 10 22:15:03 2007 +0000 M SoObjects/SOGo/LDAPUserManager.m +commit 0d18159e3f4111cf8ae1f9b92bbe5a922539233e +Merge: 582d50e e1a76ce +Author: Wolfgang Sourdeau +Date: Mon Sep 10 21:41:17 2007 +0000 + + merge of '545a34252ee16fbadbc33154d62ee4abd58fa90f' + and 'b9afc4ca974ce44e6a8987a12509fb9a1f1d97cc' + + Monotone-Parent: 545a34252ee16fbadbc33154d62ee4abd58fa90f + Monotone-Parent: b9afc4ca974ce44e6a8987a12509fb9a1f1d97cc + Monotone-Revision: 17c806f9d1783a8e0f2f05f26979ca1f64b2693d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-09-10T21:41:17 + Monotone-Branch: ca.inverse.sogo + commit 582d50e57b344033beca060e44f96cf908755be6 Author: Wolfgang Sourdeau Date: Mon Sep 10 21:40:56 2007 +0000 @@ -104421,6 +121256,22 @@ Date: Mon Sep 10 18:49:28 2007 +0000 M NEWS +commit 8dcd97032ab33503915be417d10eafcc9741ddf5 +Merge: a953c7c 703121b +Author: Wolfgang Sourdeau +Date: Mon Sep 10 18:47:35 2007 +0000 + + merge of '036947e22f5b3eb801463875f6254522044e8867' + and '2b304355998deb143c93ae7f034e0360072a7387' + + Monotone-Parent: 036947e22f5b3eb801463875f6254522044e8867 + Monotone-Parent: 2b304355998deb143c93ae7f034e0360072a7387 + Monotone-Revision: 1ec2044e8b3d118db1cbc52ea520cb6c793d8406 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-09-10T18:47:35 + Monotone-Branch: ca.inverse.sogo + commit a953c7c4b32add3322f79392dbf1a60cafba0707 Author: Francis Lachapelle Date: Mon Sep 10 18:46:05 2007 +0000 @@ -105839,6 +122690,22 @@ Date: Thu Aug 23 16:12:01 2007 +0000 M UI/Templates/MailerUI/UIxMailEditor.wox M UI/Templates/MailerUI/UIxMailToSelection.wox +commit 04c446ab32b4ece5c0f5d42576c4068802e078fb +Merge: a4c610c cb2822f +Author: Wolfgang Sourdeau +Date: Thu Aug 23 13:49:36 2007 +0000 + + merge of 'a713d0509030e441b5a09ab7710505e61689f5c3' + and 'e8041a4e5953854532b9c7c81a7dbd8b944de281' + + Monotone-Parent: a713d0509030e441b5a09ab7710505e61689f5c3 + Monotone-Parent: e8041a4e5953854532b9c7c81a7dbd8b944de281 + Monotone-Revision: 43e7e47465a89cfa3fa751612c2e6e4afa685684 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-08-23T13:49:36 + Monotone-Branch: ca.inverse.sogo + commit cb2822f4de3770802b7910234afd249b99f96309 Author: Dominik Gehl Date: Thu Aug 23 13:00:27 2007 +0000 @@ -106068,6 +122935,22 @@ A UI/SOGoElements/SOGoIEConditional.h A UI/SOGoElements/SOGoIEConditional.m A UI/SOGoElements/bundle-info.plist +commit bce1519a9f6fba1e24bb08adbb2f061d7605a4d1 +Merge: 4c6149b e42964b +Author: Wolfgang Sourdeau +Date: Tue Aug 21 16:01:44 2007 +0000 + + merge of '94a1d0365a333120f4aa3a3d2b1eac63bb97797b' + and 'bd49b8f89c873201475aa9e23f9d1876e0f158f7' + + Monotone-Parent: 94a1d0365a333120f4aa3a3d2b1eac63bb97797b + Monotone-Parent: bd49b8f89c873201475aa9e23f9d1876e0f158f7 + Monotone-Revision: fc8e6bbe0cff3fd2f022a39f28fc8c57fac144e9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-08-21T16:01:44 + Monotone-Branch: ca.inverse.sogo + commit e42964b9aaae0e283f52e59bceddb9e83133e563 Author: Wolfgang Sourdeau Date: Tue Aug 21 16:01:32 2007 +0000 @@ -106845,6 +123728,22 @@ M ChangeLog M SoObjects/Mailer/SOGoDraftObject.h M SoObjects/Mailer/SOGoDraftObject.m +commit 4598af7651c5c235c1bf84930bd786232e10afcc +Merge: 6e5faee 0ec5c77 +Author: Wolfgang Sourdeau +Date: Thu Aug 16 22:12:12 2007 +0000 + + merge of '1cc8e4f0b5a7e08d0cdb102c7f221df7ec72af37' + and '3f6c57e715b0ee7af5182cb7a04ea8cc6df72a2a' + + Monotone-Parent: 1cc8e4f0b5a7e08d0cdb102c7f221df7ec72af37 + Monotone-Parent: 3f6c57e715b0ee7af5182cb7a04ea8cc6df72a2a + Monotone-Revision: 884877bd53c2d3dbf1a3a0b3b87f122ccdec9640 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-08-16T22:12:12 + Monotone-Branch: ca.inverse.sogo + commit 6e5faee3067cb31f023041ef893059fe7d5c4751 Author: Francis Lachapelle Date: Thu Aug 16 21:57:50 2007 +0000 @@ -107396,6 +124295,22 @@ Date: Thu Aug 9 02:30:41 2007 +0000 M ChangeLog M UI/MailerUI/UIxMailAccountActions.m +commit 7b4d9bf10f56b56b1b59d5ae328ccdcd720d7e14 +Merge: a7d1100 f540594 +Author: Wolfgang Sourdeau +Date: Wed Aug 8 21:37:02 2007 +0000 + + merge of '365c4aee2feb0d139dc0dd6cf54897162221b468' + and 'a7497a1857582a170a23018373da5f88ca29417c' + + Monotone-Parent: 365c4aee2feb0d139dc0dd6cf54897162221b468 + Monotone-Parent: a7497a1857582a170a23018373da5f88ca29417c + Monotone-Revision: 2dd7198ed0b85a818db7398882df4a764b930af6 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-08-08T21:37:02 + Monotone-Branch: ca.inverse.sogo + commit f5405945ca62bbb2ddd400ccd01d04ca3f24566a Author: Wolfgang Sourdeau Date: Wed Aug 8 21:36:17 2007 +0000 @@ -107578,6 +124493,22 @@ M SoObjects/Appointments/SOGoGroupAppointmentFolder.m M SoObjects/Appointments/SOGoTaskObject.m D SoObjects/Appointments/common.h +commit c3f8aa76c820625bb3d9d75e430bae4c27ae045f +Merge: 679ef1b b698595 +Author: Wolfgang Sourdeau +Date: Tue Aug 7 18:15:45 2007 +0000 + + merge of '4fb91535d64ab4fed607ffde0f99efdc1f92a6e6' + and 'c04765e5faa3be50bda54d32f06fb26120fc78e7' + + Monotone-Parent: 4fb91535d64ab4fed607ffde0f99efdc1f92a6e6 + Monotone-Parent: c04765e5faa3be50bda54d32f06fb26120fc78e7 + Monotone-Revision: 5f353cb4ef5483f5d16dbec9eea1e66fab15c916 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-08-07T18:15:45 + Monotone-Branch: ca.inverse.sogo + commit b698595743a17d24cc7425ca1e406da1ea9c4c76 Author: Wolfgang Sourdeau Date: Tue Aug 7 18:15:22 2007 +0000 @@ -107760,6 +124691,22 @@ Date: Thu Aug 2 21:18:35 2007 +0000 M ChangeLog M UI/Contacts/UIxContactFoldersView.m +commit e023ee3ea7ce00dcf76b2c87c891c6e78f0bca94 +Merge: 5192fe2 0cf4e79 +Author: Francis Lachapelle +Date: Thu Aug 2 21:13:05 2007 +0000 + + merge of '1131d818df86533353162d848ee381344c7ae377' + and '2221037a745efee3a1e109e40d7d44e79a62502f' + + Monotone-Parent: 1131d818df86533353162d848ee381344c7ae377 + Monotone-Parent: 2221037a745efee3a1e109e40d7d44e79a62502f + Monotone-Revision: 634dea34e91fc82d20a96d4ce002cbb9e2939243 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-08-02T21:13:05 + Monotone-Branch: ca.inverse.sogo + commit 0cf4e792ccf5007f755f2d4eff6ae689b8b6b58c Author: Francis Lachapelle Date: Thu Aug 2 21:12:42 2007 +0000 @@ -107790,6 +124737,22 @@ Date: Wed Aug 1 21:26:52 2007 +0000 M UI/MailerUI/UIxMailAccountActions.m +commit 3db57bfd3360970ef1a5dc71c0c62bc55a42b65f +Merge: c8567af 6b361fd +Author: Wolfgang Sourdeau +Date: Wed Aug 1 19:22:03 2007 +0000 + + merge of '2c8c5a98bffe88fbe33a7c879bc06a01553833bc' + and '759009bd466f9b73934029fb2e05ae98192c20f5' + + Monotone-Parent: 2c8c5a98bffe88fbe33a7c879bc06a01553833bc + Monotone-Parent: 759009bd466f9b73934029fb2e05ae98192c20f5 + Monotone-Revision: a4d6aa57206382ed0a706b96c2f9b59255df2cb3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-08-01T19:22:03 + Monotone-Branch: ca.inverse.sogo + commit 6b361fd2dca2eabf30b43bc770caf59084b2ac9b Author: Francis Lachapelle Date: Wed Aug 1 19:21:02 2007 +0000 @@ -108759,6 +125722,22 @@ Date: Fri Jul 20 20:25:56 2007 +0000 M SoObjects/Contacts/SOGoContactLDAPFolder.h +commit e0948698c11525baa63432d54da8731e8ef1829e +Merge: f4d8031 2b1e888 +Author: Wolfgang Sourdeau +Date: Fri Jul 20 20:24:01 2007 +0000 + + merge of '6c18461fde8c24d977a5536ff8d6c935f2d59268' + and '8c475ae12623cd98a9327714ee6321cf6526a51e' + + Monotone-Parent: 6c18461fde8c24d977a5536ff8d6c935f2d59268 + Monotone-Parent: 8c475ae12623cd98a9327714ee6321cf6526a51e + Monotone-Revision: c74a323dec423f5c6904633955f48fa82cac7f5f + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-07-20T20:24:01 + Monotone-Branch: ca.inverse.sogo + commit f4d8031101a4cee7182dc02297dd7cc3427db987 Author: Wolfgang Sourdeau Date: Fri Jul 20 20:22:16 2007 +0000 @@ -108922,6 +125901,22 @@ Date: Fri Jul 13 18:03:02 2007 +0000 M UI/WebServerResources/ContactsUI.js +commit 6984e4afaf62080e7a214f7f4bf904a0194f74e2 +Merge: 6309160 5a46d4f +Author: Francis Lachapelle +Date: Fri Jul 13 15:22:08 2007 +0000 + + merge of '875a3fc15e011173c22d5a90e998d65087950ddc' + and 'd6d341b84cbf1c54684b2a4f7b962733b4c3fe07' + + Monotone-Parent: 875a3fc15e011173c22d5a90e998d65087950ddc + Monotone-Parent: d6d341b84cbf1c54684b2a4f7b962733b4c3fe07 + Monotone-Revision: 4d2a9c69a460efd87841ca2c5b2669f38b77bec2 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-07-13T15:22:08 + Monotone-Branch: ca.inverse.sogo + commit b4ba638382886e1d1a5edcd69b07c7f2b34f2b41 Author: Wolfgang Sourdeau Date: Fri Jul 13 14:07:00 2007 +0000 @@ -109092,6 +126087,22 @@ M UI/Scheduler/UIxDatePicker.m M UI/Scheduler/UIxTaskProposal.m D UI/Scheduler/common.h +commit 63091606c3c19db3de8b9973ede645da8c9e71d8 +Merge: 956c4f2 4fa4053 +Author: Francis Lachapelle +Date: Thu Jul 12 14:35:38 2007 +0000 + + merge of 'a5370a41693bc2294eb25921c8e19dda7570a063' + and 'e0936e909247455078da70476a50abb9a47ecd91' + + Monotone-Parent: a5370a41693bc2294eb25921c8e19dda7570a063 + Monotone-Parent: e0936e909247455078da70476a50abb9a47ecd91 + Monotone-Revision: 875a3fc15e011173c22d5a90e998d65087950ddc + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-07-12T14:35:38 + Monotone-Branch: ca.inverse.sogo + commit 956c4f210953af86ffc9088617044d68daa896b9 Author: Wolfgang Sourdeau Date: Wed Jul 11 05:05:03 2007 +0000 @@ -111180,6 +128191,22 @@ Date: Tue Jun 12 20:59:29 2007 +0000 M UI/WebServerResources/JavascriptAPIExtensions.js +commit 9540242342b1941db526719b0d5ea6b85088bcda +Merge: cfec5c1 585da32 +Author: Wolfgang Sourdeau +Date: Tue Jun 12 20:06:07 2007 +0000 + + merge of 'da14c15993fb62fd47e157a66922cfad87c7cbe4' + and 'e2d09733a32053b0e8123fe4e81ab87021140781' + + Monotone-Parent: da14c15993fb62fd47e157a66922cfad87c7cbe4 + Monotone-Parent: e2d09733a32053b0e8123fe4e81ab87021140781 + Monotone-Revision: b418d8652d7c5f76fc2cae210e182fe2ab941ff0 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-06-12T20:06:07 + Monotone-Branch: ca.inverse.sogo + commit cfec5c10d239f4f1d04186bf7375a4acf092c454 Author: Wolfgang Sourdeau Date: Tue Jun 12 20:05:57 2007 +0000 @@ -111344,6 +128371,22 @@ Date: Tue Jun 12 15:43:51 2007 +0000 M UI/WebServerResources/SchedulerUI.css M UI/WebServerResources/SchedulerUI.js +commit 3babd4a347dfb1beeea6c6b5e268846624250338 +Merge: 59361b2 328c8f6 +Author: Wolfgang Sourdeau +Date: Tue Jun 12 15:40:14 2007 +0000 + + merge of '1cad98827a66e18891a4b93bbab5ccce88c61795' + and 'fa7e03f29012a5aa53494584d9d660effeab890f' + + Monotone-Parent: 1cad98827a66e18891a4b93bbab5ccce88c61795 + Monotone-Parent: fa7e03f29012a5aa53494584d9d660effeab890f + Monotone-Revision: fc65404103126a45384bce022216f93bcfda9947 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-06-12T15:40:14 + Monotone-Branch: ca.inverse.sogo + commit 328c8f630c443a06ba2d8d2e3eb0e39437bc0d6c Author: Wolfgang Sourdeau Date: Tue Jun 12 15:39:47 2007 +0000 @@ -111542,6 +128585,22 @@ Date: Mon Jun 11 21:34:07 2007 +0000 D UI/WebServerResources/mailer-toolbar.css +commit 4370527ebd8858080c37c65703e476fad443c06c +Merge: 4082b50 5faa76c +Author: Wolfgang Sourdeau +Date: Mon Jun 11 21:30:45 2007 +0000 + + merge of '7507ba8f285d4ba0e11270cb7a9dab563a554cbf' + and 'c61d92bb4f27310c5e538ea6a6361a5df3e85dfc' + + Monotone-Parent: 7507ba8f285d4ba0e11270cb7a9dab563a554cbf + Monotone-Parent: c61d92bb4f27310c5e538ea6a6361a5df3e85dfc + Monotone-Revision: 257276eeab3254ccae729ef188757348760688db + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-06-11T21:30:45 + Monotone-Branch: ca.inverse.sogo + commit 5faa76c0e8be0130c3b724984256bb31c712d0b9 Author: Wolfgang Sourdeau Date: Mon Jun 11 21:30:31 2007 +0000 @@ -111777,6 +128836,22 @@ Date: Fri Jun 8 21:31:25 2007 +0000 M UI/WebServerResources/SchedulerUI.js +commit a5819dbd4744b14ada8eaa6570e5ef85b4574b4f +Merge: 32f68a0 8a6a9e2 +Author: Wolfgang Sourdeau +Date: Fri Jun 8 20:41:33 2007 +0000 + + merge of 'a153aa6c9c909c630997557d6a4fc13b92a1dbae' + and 'a1be1c2cefed5c886fe140f7ffc630e56b32dd08' + + Monotone-Parent: a153aa6c9c909c630997557d6a4fc13b92a1dbae + Monotone-Parent: a1be1c2cefed5c886fe140f7ffc630e56b32dd08 + Monotone-Revision: c35b4b523a503d3e04dc1985bf5db52acbdcf780 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-06-08T20:41:33 + Monotone-Branch: ca.inverse.sogo + commit 8a6a9e2b23b7007d531a85e4ebd2049d5570eff5 Author: Francis Lachapelle Date: Fri Jun 8 20:33:24 2007 +0000 @@ -111829,6 +128904,22 @@ Date: Fri Jun 8 20:22:18 2007 +0000 M UI/WebServerResources/HTMLElement.js +commit c41d7bccd98822c5ec6959985ef2675165a66c70 +Merge: ecf8613 adc983a +Author: Francis Lachapelle +Date: Fri Jun 8 19:42:41 2007 +0000 + + merge of '745078eebfc65eb4d64f783cd18b84dd7dfc521e' + and 'b1db9e0afb3cef83b2163571fce22ed0438d1af9' + + Monotone-Parent: 745078eebfc65eb4d64f783cd18b84dd7dfc521e + Monotone-Parent: b1db9e0afb3cef83b2163571fce22ed0438d1af9 + Monotone-Revision: 58c44f5db87b77f0a5879b3cd2f1809094939877 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Date: 2007-06-08T19:42:41 + Monotone-Branch: ca.inverse.sogo + commit ecf8613d4ee1b2f1c47878770a62c710adda1888 Author: Francis Lachapelle Date: Fri Jun 8 18:20:30 2007 +0000 @@ -111881,6 +128972,22 @@ Date: Fri Jun 8 15:01:10 2007 +0000 M UI/WebServerResources/MailerUI.css +commit adc983ac492af9de7e4e852e73e4676c3df16059 +Merge: 5d933f5 063d2f6 +Author: Wolfgang Sourdeau +Date: Thu Jun 7 23:25:14 2007 +0000 + + merge of '8e91e5d3f8f29fee9018d49992181eb3b9eaa2e9' + and 'd0d6b4a5eda37be3f072033f5b46b9807f76a4e3' + + Monotone-Parent: 8e91e5d3f8f29fee9018d49992181eb3b9eaa2e9 + Monotone-Parent: d0d6b4a5eda37be3f072033f5b46b9807f76a4e3 + Monotone-Revision: b1db9e0afb3cef83b2163571fce22ed0438d1af9 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-06-07T23:25:14 + Monotone-Branch: ca.inverse.sogo + commit 063d2f6fdb7d8b86037008a509bcafdeb81be732 Author: Wolfgang Sourdeau Date: Thu Jun 7 23:24:39 2007 +0000 @@ -112072,6 +129179,22 @@ M SOPE/NGCards/iCalFreeBusy.m M SOPE/NGCards/iCalTimeZonePeriod.m M SOPE/NGCards/iCalToDo.m +commit 80da77c266d8d3b1053880913d0497eecb38e2c9 +Merge: 1518446 99066d3 +Author: Wolfgang Sourdeau +Date: Thu Jun 7 16:28:27 2007 +0000 + + merge of 'c1fde6184b467d9973431aa6c2c19a550609483b' + and 'f42fa8175185006d18851f3f65a8b51106ec4756' + + Monotone-Parent: c1fde6184b467d9973431aa6c2c19a550609483b + Monotone-Parent: f42fa8175185006d18851f3f65a8b51106ec4756 + Monotone-Revision: 11f90d05631a863d591c668b5d433e7735381723 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-06-07T16:28:27 + Monotone-Branch: ca.inverse.sogo + commit 1518446075f7d728bc6a5b81a19814827dd9bb3a Author: Wolfgang Sourdeau Date: Thu Jun 7 16:28:10 2007 +0000 @@ -113345,6 +130468,22 @@ Date: Wed May 30 20:02:27 2007 +0000 M ChangeLog M SoObjects/SOGo/NSString+Utilities.m +commit c4015cc9abe5a7d42006cfe2a73daf0236705416 +Merge: bccb467 12deac0 +Author: Wolfgang Sourdeau +Date: Tue May 29 19:57:48 2007 +0000 + + merge of '46e3af5f0c744f5d732638f9ea71cd2450747aad' + and 'd2c4e72f9d0f1afa7607853c20209e0b59e6c1d6' + + Monotone-Parent: 46e3af5f0c744f5d732638f9ea71cd2450747aad + Monotone-Parent: d2c4e72f9d0f1afa7607853c20209e0b59e6c1d6 + Monotone-Revision: e7c4dbba9509da25ddf92578482021c0d944d8f1 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-29T19:57:48 + Monotone-Branch: ca.inverse.sogo + commit 12deac0a5ddb3b3a82f1dfe3ce02f5f2fb2507c8 Author: Francis Lachapelle Date: Tue May 29 18:07:29 2007 +0000 @@ -113358,6 +130497,22 @@ Date: Tue May 29 18:07:29 2007 +0000 M UI/WebServerResources/SchedulerUI.js +commit bccb467077e378a9a30d4401fb5837ea4b0e2349 +Merge: 456515a 69b4739 +Author: Wolfgang Sourdeau +Date: Tue May 29 15:22:24 2007 +0000 + + merge of '6b660347be61a45d2d8fc0c15b01dd94e0d39c5c' + and 'c5f0b0acb95d3e825108b7746d4ae0598b713d8f' + + Monotone-Parent: 6b660347be61a45d2d8fc0c15b01dd94e0d39c5c + Monotone-Parent: c5f0b0acb95d3e825108b7746d4ae0598b713d8f + Monotone-Revision: 46e3af5f0c744f5d732638f9ea71cd2450747aad + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-29T15:22:24 + Monotone-Branch: ca.inverse.sogo + commit 69b47391db4379f0c51e0481248b145e2381d9d7 Author: Francis Lachapelle Date: Tue May 29 14:20:13 2007 +0000 @@ -113869,6 +131024,25 @@ Date: Fri May 25 17:25:26 2007 +0000 M UI/WebServerResources/dtree.js +commit ef1071f97e597e72af3a3e9579645de730979e93 +Merge: 516cb95 adfafc7 +Author: Francis Lachapelle +Date: Fri May 25 15:53:23 2007 +0000 + + merge of '49f34fbd1c71d08a025aff7ebece50001773fa8e' + and '92d5ab2719da70823dc4cd47a37ba4c74f093c11' + + Monotone-Parent: 49f34fbd1c71d08a025aff7ebece50001773fa8e + Monotone-Parent: 92d5ab2719da70823dc4cd47a37ba4c74f093c11 + Monotone-Revision: bdfa1641c55906ac04987ae50165889fa53c577b + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-25T15:53:23 + Monotone-Date: 2007-05-25T17:24:56 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit adfafc777b74ff9d78012455c5d88002c8393508 Author: Francis Lachapelle Date: Fri May 25 15:49:51 2007 +0000 @@ -113882,6 +131056,22 @@ Date: Fri May 25 15:49:51 2007 +0000 M UI/WebServerResources/generic.js +commit 516cb950f1ae1e93f02a42c336cd5516e6f62308 +Merge: ecba04d 3a82091 +Author: Wolfgang Sourdeau +Date: Fri May 25 15:46:07 2007 +0000 + + merge of '32ac613ce54828e76c41d1e1457a982917bf0b8e' + and 'bee60405e7b87d3e239c75247535e09b1a7e0943' + + Monotone-Parent: 32ac613ce54828e76c41d1e1457a982917bf0b8e + Monotone-Parent: bee60405e7b87d3e239c75247535e09b1a7e0943 + Monotone-Revision: 49f34fbd1c71d08a025aff7ebece50001773fa8e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-25T15:46:07 + Monotone-Branch: ca.inverse.sogo + commit 963a02d94dfde92b02a3bf2cfcdb6904854a7daf Author: Francis Lachapelle Date: Fri May 25 15:43:49 2007 +0000 @@ -114635,6 +131825,25 @@ Date: Fri May 18 16:15:01 2007 +0000 M UI/WebServerResources/generic.js +commit 4d5a7d476431aa036db35a6b8b6600839b53d66d +Merge: 8a8e27a 8b88e13 +Author: Francis Lachapelle +Date: Fri May 18 14:04:40 2007 +0000 + + merge of 'a07f7846d51ddaa898b21d99d37aa65bd1c74e96' + and 'd143cc48f74241285ec9dd377698e50a2be189f6' + + Monotone-Parent: a07f7846d51ddaa898b21d99d37aa65bd1c74e96 + Monotone-Parent: d143cc48f74241285ec9dd377698e50a2be189f6 + Monotone-Revision: f0a20e946b81f4ef75d6ab7e76faea2086c35780 + + Monotone-Author: flachapelle@inverse.ca + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-18T14:04:40 + Monotone-Date: 2007-05-18T14:07:15 + Monotone-Branch: ca.inverse.sogo + Monotone-Branch: ca.inverse.sogo + commit 8a8e27ae72432f5475653dd10c892138be6af7dd Author: Francis Lachapelle Date: Fri May 18 14:03:58 2007 +0000 @@ -114661,6 +131870,22 @@ Date: Thu May 17 23:18:38 2007 +0000 M SoObjects/Appointments/SOGoFreeBusyObject.m +commit 196e1e932271459fd5cb4d2bfd1cf31a1111df04 +Merge: 11b7693 39c6e49 +Author: Wolfgang Sourdeau +Date: Thu May 17 23:13:45 2007 +0000 + + merge of '6ce902c8df1995a79c1ab0e0d78013b688e25dbd' + and 'b2d0da06fffc88971705a5c6cf4b5a85fd76e93d' + + Monotone-Parent: 6ce902c8df1995a79c1ab0e0d78013b688e25dbd + Monotone-Parent: b2d0da06fffc88971705a5c6cf4b5a85fd76e93d + Monotone-Revision: 6705a0eaf721b2addcf26cc8ef50da0979eb563d + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-17T23:13:45 + Monotone-Branch: ca.inverse.sogo + commit 39c6e49c85586f1f25916d937ff4f20068992367 Author: Wolfgang Sourdeau Date: Thu May 17 23:13:28 2007 +0000 @@ -114835,6 +132060,22 @@ Date: Thu May 17 17:25:45 2007 +0000 M UI/Templates/MailerUI/UIxMailView.wox M UI/WebServerResources/MailerUI.js +commit 738cca05efe1c05eb00e2091b08acf26a9649049 +Merge: 537ffcd fe29404 +Author: Wolfgang Sourdeau +Date: Wed May 16 21:42:53 2007 +0000 + + merge of '2595a3bc44656d71f249d0059114c0bb7c6ec938' + and 'cb234862194e72608212740a10db0004798a152d' + + Monotone-Parent: 2595a3bc44656d71f249d0059114c0bb7c6ec938 + Monotone-Parent: cb234862194e72608212740a10db0004798a152d + Monotone-Revision: 6b1767e51b6a4a9ee800a715b9c31d92d2e7cfaa + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-16T21:42:53 + Monotone-Branch: ca.inverse.sogo + commit fe2940449139546df1caa05166935e942ec367b9 Author: Wolfgang Sourdeau Date: Wed May 16 21:42:47 2007 +0000 @@ -114905,6 +132146,22 @@ Date: Wed May 16 16:30:04 2007 +0000 M ChangeLog M SoObjects/SOGo/NSString+Utilities.m +commit 6d1a41efa5e06a944d1c24e7a66010e8894e3dd6 +Merge: 9d14322 e606fe2 +Author: Wolfgang Sourdeau +Date: Wed May 16 16:04:15 2007 +0000 + + merge of 'c6255287239acf53aaad227885cb7b5e32ab68af' + and 'e582b1fdc5748b1cb3f1cf14d9019773a5ffa746' + + Monotone-Parent: c6255287239acf53aaad227885cb7b5e32ab68af + Monotone-Parent: e582b1fdc5748b1cb3f1cf14d9019773a5ffa746 + Monotone-Revision: abba53838baf14abe32e7df33d5c776a643f81fe + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-16T16:04:15 + Monotone-Branch: ca.inverse.sogo + commit e606fe2495d3cebd58624a29ed8a218ad3d75bad Author: Francis Lachapelle Date: Wed May 16 16:02:46 2007 +0000 @@ -114931,6 +132188,22 @@ Date: Wed May 16 15:56:53 2007 +0000 M SoObjects/SOGo/NSString+Utilities.m +commit f4a43ef3f85b2d4a2733c6cef240df15f6a3f357 +Merge: a331bb0 7fba072 +Author: Wolfgang Sourdeau +Date: Wed May 16 15:56:42 2007 +0000 + + merge of '0193e734423622669c9a35b762faeb7b87bf37a3' + and 'ddaf07867b0f161d9eebfac93b391dc46e28f964' + + Monotone-Parent: 0193e734423622669c9a35b762faeb7b87bf37a3 + Monotone-Parent: ddaf07867b0f161d9eebfac93b391dc46e28f964 + Monotone-Revision: b5db024de6e6693dcb4d17a96067ab63c35b81dc + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-16T15:56:42 + Monotone-Branch: ca.inverse.sogo + commit 7fba072e29a415daad162e302338ec44eac6ac3f Author: Francis Lachapelle Date: Wed May 16 15:40:08 2007 +0000 @@ -114944,6 +132217,22 @@ Date: Wed May 16 15:40:08 2007 +0000 M UI/Templates/ContactsUI/UIxContactsListView.wox +commit a331bb00939139acbc3d65e6cf20daae8b40b7bf +Merge: c5b2d9b 07db8e5 +Author: Wolfgang Sourdeau +Date: Wed May 16 15:32:49 2007 +0000 + + merge of '2017072eb2f586bc9fc1688e6be46830a9c33f6b' + and 'f3605f01ea6da31a633098cdb75fec27bb102212' + + Monotone-Parent: 2017072eb2f586bc9fc1688e6be46830a9c33f6b + Monotone-Parent: f3605f01ea6da31a633098cdb75fec27bb102212 + Monotone-Revision: 0193e734423622669c9a35b762faeb7b87bf37a3 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-16T15:32:49 + Monotone-Branch: ca.inverse.sogo + commit 07db8e5bab12f38e3a78fd92aef1b01db6c39f5c Author: Francis Lachapelle Date: Wed May 16 15:24:50 2007 +0000 @@ -114957,6 +132246,22 @@ Date: Wed May 16 15:24:50 2007 +0000 M UI/WebServerResources/SchedulerUI.css +commit c5b2d9b41b50d9689e1a4bb1f91ff3167762ca5b +Merge: 84a9208 23c4d14 +Author: Wolfgang Sourdeau +Date: Wed May 16 15:14:44 2007 +0000 + + merge of '4b822e668e3eba0adc2d24daa8e1cea1b81b23fe' + and 'f2cbdceabe70afea4ba64e1147d1c712474b43d5' + + Monotone-Parent: 4b822e668e3eba0adc2d24daa8e1cea1b81b23fe + Monotone-Parent: f2cbdceabe70afea4ba64e1147d1c712474b43d5 + Monotone-Revision: 2017072eb2f586bc9fc1688e6be46830a9c33f6b + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-16T15:14:44 + Monotone-Branch: ca.inverse.sogo + commit 23c4d14248c3ee491fa4ca4c98278d3931a65444 Author: Francis Lachapelle Date: Wed May 16 14:26:47 2007 +0000 @@ -115012,6 +132317,22 @@ Date: Tue May 15 21:49:50 2007 +0000 M ChangeLog M SoObjects/Appointments/SOGoAppointmentFolder.m +commit 06230336b7e7dfc505cf5f2e6367968c66b41559 +Merge: f9a2255 efefc06 +Author: Wolfgang Sourdeau +Date: Tue May 15 20:52:53 2007 +0000 + + merge of '0417738db917e76880a84c6d4e6d8721c51cd310' + and '18a1868903a3a17e253ed75c8d0312ab8c957834' + + Monotone-Parent: 0417738db917e76880a84c6d4e6d8721c51cd310 + Monotone-Parent: 18a1868903a3a17e253ed75c8d0312ab8c957834 + Monotone-Revision: e0a0e733ec72e96531ad1b2538744ad47d1f3f4e + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-15T20:52:53 + Monotone-Branch: ca.inverse.sogo + commit f9a225549a220eaf9fa270c61d5f6d7b8e41a6fb Author: Wolfgang Sourdeau Date: Tue May 15 20:52:38 2007 +0000 @@ -115374,6 +132695,22 @@ Date: Thu May 10 15:52:45 2007 +0000 M SoObjects/SOGo/AgenorUserDefaults.m +commit bf1a75973ac1db3c5faea9ea22a67c11e5076cde +Merge: 634e342 1b42d71 +Author: Wolfgang Sourdeau +Date: Thu May 10 15:00:18 2007 +0000 + + merge of '6cfba12fb94b5901b149e029c710bdc53dd3d3f1' + and '8fac7610f102d5ac190598b120634569a69ec344' + + Monotone-Parent: 6cfba12fb94b5901b149e029c710bdc53dd3d3f1 + Monotone-Parent: 8fac7610f102d5ac190598b120634569a69ec344 + Monotone-Revision: 6975183caaa2bc330ccc07a7a79c21531387d774 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-05-10T15:00:18 + Monotone-Branch: ca.inverse.sogo + commit 1b42d71b1d5db383a667f5ad08cf0329a0ddca05 Author: Wolfgang Sourdeau Date: Thu May 10 14:59:17 2007 +0000 @@ -121109,6 +138446,22 @@ M SOPE/NGCards/CardGroup.m M SOPE/NGCards/ChangeLog M SOPE/NGCards/versitCardsSaxDriver/GNUmakefile +commit da4ff68c0f12f15f8ef6910f98e738d5e5dd08d1 +Merge: 505d962 aed07d8 +Author: Wolfgang Sourdeau +Date: Thu Feb 8 21:51:18 2007 +0000 + + merge of '7e8193075678dc0552c70be8e294ff1b3ce46b40' + and 'c443c4725dc53c9efb233042a3e2a3a33ff9b294' + + Monotone-Parent: 7e8193075678dc0552c70be8e294ff1b3ce46b40 + Monotone-Parent: c443c4725dc53c9efb233042a3e2a3a33ff9b294 + Monotone-Revision: 6b671acbd7feafaefa796eb983a298d042a67053 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2007-02-08T21:51:18 + Monotone-Branch: ca.inverse.sogo + commit 505d9621d3c94f3b796cb177120c0eaee60b83ae Author: Ludovic Marcotte Date: Thu Feb 8 21:55:47 2007 +0000 @@ -130291,6 +147644,22 @@ Date: Tue Sep 19 15:39:44 2006 +0000 M .mtn-ignore +commit 150c19e23f68e62ac618ceb8a78d05ad8087ae24 +Merge: 2b2161c 5c6e18b +Author: Wolfgang Sourdeau +Date: Tue Sep 19 15:36:03 2006 +0000 + + merge of '031984b557650859a910a3514084f8eb19b77b6d' + and 'cf3bacd77b08f56b9e8a219124225b7f4a5a9d4a' + + Monotone-Parent: 031984b557650859a910a3514084f8eb19b77b6d + Monotone-Parent: cf3bacd77b08f56b9e8a219124225b7f4a5a9d4a + Monotone-Revision: 7e77770c07adaadb54d51bda81ce7804c86d2125 + + Monotone-Author: wsourdeau@inverse.ca + Monotone-Date: 2006-09-19T15:36:03 + Monotone-Branch: ca.inverse.sogo + commit 2b2161c0b0ec88536bb74370ba0e12db1c5371aa Author: Ludovic Marcotte Date: Tue Sep 19 15:20:03 2006 +0000 diff --git a/NEWS b/NEWS index 0e0e117ed..ff118632f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,29 @@ +2.0.2 (2012-10-24) +------------------ + +New features + - added support for SMTP AUTH + - sogo configuration can now be set in /etc/sogo/sogo.conf + - added support for GNU TLS + +Enhancements + - speed up of the parsing of IMAP traffic + - minor speed up of the web interface + - speed up the scrolling of the message list in the mail module + - speed up the deletion of a large amounts of entries in the contacts module + - updated the timezone files to the 2012.g edition + - openchange backend: miscellaneous speed up of the synchronization + operations + +Bug fixes + + - the parameters included in the url of remote calendars are now taken into + account + - fixed an issue occurring with timezone definitions providing multiple entries + - openchange backend: miscellaneous crashes during certain Outlook + operations, which have appeared in version 2.0.0, have been fixed + - fixed issues occuring on OpenBSD and potentially other BSD flavours + 2.0.1 (2012-10-10) -------------------