sogo: master 9b0a2c5f

Diff Back to Repository
Author Committer Branch Timestamp Parent
Ludovic Marcotte Ludovic Marcotte master 2015-12-03 11:16 master 9445315b
Changeset

Merge branch 'master' into feature/addMissingStrings2

Conflicts:
UI/AdministrationUI/English.lproj/Localizable.strings
UI/PreferencesUI/English.lproj/Localizable.strings
UI/Templates/PreferencesUI/UIxFilterEditor.wox
mod - .gitignore Diff File
mod - ActiveSync/GNUmakefile.preamble Diff File
mod - ActiveSync/NGDOMElement+ActiveSync.m Diff File
mod - ActiveSync/NGVCard+ActiveSync.m Diff File
mod - ActiveSync/SOGoActiveSyncDispatcher+Sync.m Diff File
mod - ActiveSync/SOGoActiveSyncDispatcher.h Diff File
mod - ActiveSync/SOGoActiveSyncDispatcher.m Diff File
mod - ActiveSync/SOGoMailObject+ActiveSync.m Diff File
mod - ActiveSync/SOGoSyncCacheObject.h Diff File
mod - ActiveSync/SOGoSyncCacheObject.m Diff File
mod - ActiveSync/iCalAlarm+ActiveSync.m Diff File
mod - ActiveSync/iCalEvent+ActiveSync.m Diff File
mod - ActiveSync/iCalRecurrenceRule+ActiveSync.m Diff File
mod - ActiveSync/iCalToDo+ActiveSync.m Diff File
mod - ChangeLog Diff File
mod - Documentation/SOGoInstallationGuide.asciidoc Diff File
mod - Documentation/SOGoNativeOutlookConfigurationGuide.asciidoc Diff File
mod - Main/SOGo+DAV.m Diff File
mod - NEWS Diff File
mod - OpenChange/MAPIStoreAuthenticator.h Diff File
mod - OpenChange/MAPIStoreAuthenticator.m Diff File
mod - OpenChange/MAPIStoreCalendarMessage.m Diff File
mod - OpenChange/MAPIStoreDBMessage.m Diff File
mod - OpenChange/MAPIStoreFolder.h Diff File
mod - OpenChange/MAPIStoreFolder.m Diff File
mod - OpenChange/MAPIStoreGCSFolder.h Diff File
mod - OpenChange/MAPIStoreGCSFolder.m Diff File
mod - OpenChange/MAPIStoreGCSMessage.m Diff File
mod - OpenChange/MAPIStoreMailAttachment.m Diff File
mod - OpenChange/MAPIStoreMailContext.m Diff File
mod - OpenChange/MAPIStoreMailFolder.h Diff File
mod - OpenChange/MAPIStoreMailFolder.m Diff File
mod - OpenChange/MAPIStoreMailMessage.m Diff File
mod - OpenChange/MAPIStoreMailMessageTable.m Diff File
mod - OpenChange/MAPIStoreMailVolatileMessage.m Diff File
mod - OpenChange/MAPIStoreMessage.h Diff File
mod - OpenChange/MAPIStoreMessage.m Diff File
mod - OpenChange/MAPIStoreSOGo.m Diff File
mod - OpenChange/MAPIStoreTasksMessage.m Diff File
mod - OpenChange/NSData+MAPIStore.h Diff File
mod - OpenChange/NSData+MAPIStore.m Diff File
mod - SOPE/GDLContentStore/GCSChannelManager.m Diff File
mod - SOPE/NGCards/CardElement.m Diff File
mod - SOPE/NGCards/CardGroup.m Diff File
mod - SOPE/NGCards/NSCalendarDate+NGCards.m Diff File
mod - SOPE/NGCards/NSString+NGCards.m Diff File
mod - SOPE/NGCards/iCalEntityObject.m Diff File
mod - SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m Diff File
mod - SOPE/NGCards/iCalPerson.m Diff File
mod - SOPE/NGCards/iCalRecurrenceRule.m Diff File
mod - SOPE/NGCards/iCalTimeZonePeriod.m Diff File
mod - SOPE/NGCards/iCalTrigger.m Diff File
mod - SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m Diff File
rm - Scripts/openchange_user_cleanup Diff
mod - SoObjects/Appointments/MSExchangeFreeBusy.m Diff File
mod - SoObjects/Appointments/SOGoAppointmentFolder.m Diff File
mod - SoObjects/Appointments/SOGoAppointmentObject.m Diff File
mod - SoObjects/Appointments/SOGoCalendarComponent.m Diff File
mod - SoObjects/Appointments/iCalAlarm+SOGo.m Diff File
mod - SoObjects/Appointments/iCalEvent+SOGo.m Diff File
mod - SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m Diff File
mod - SoObjects/Appointments/iCalToDo+SOGo.m Diff File
mod - SoObjects/Contacts/NGVCard+SOGo.m Diff File
mod - SoObjects/Contacts/SOGoContactEntryPhoto.m Diff File
mod - SoObjects/Contacts/SOGoContactFolders.m Diff File
mod - SoObjects/Contacts/SOGoContactGCSEntry.m Diff File
mod - SoObjects/Contacts/SOGoContactGCSList.m Diff File
mod - SoObjects/Contacts/SOGoContactSourceFolder.m Diff File
mod - SoObjects/Contacts/SOGoFolder+CardDAV.h Diff File
mod - SoObjects/Contacts/SOGoFolder+CardDAV.m Diff File
mod - SoObjects/Mailer/NSDictionary+Mail.m Diff File
mod - SoObjects/Mailer/NSString+Mail.m Diff File
mod - SoObjects/Mailer/SOGoDraftObject.m Diff File
mod - SoObjects/Mailer/SOGoMailAccount.m Diff File
mod - SoObjects/Mailer/SOGoMailBaseObject.m Diff File
mod - SoObjects/Mailer/SOGoMailBodyPart.m Diff File
mod - SoObjects/Mailer/SOGoMailFolder.h Diff File
mod - SoObjects/Mailer/SOGoMailFolder.m Diff File
mod - SoObjects/Mailer/SOGoMailForward.m Diff File
mod - SoObjects/Mailer/SOGoMailLabel.m Diff File
mod - SoObjects/Mailer/SOGoMailObject.m Diff File
mod - SoObjects/SOGo/BSONCodec.m Diff File
mod - SoObjects/SOGo/LDAPSource.m Diff File
mod - SoObjects/SOGo/NSArray+Utilities.h Diff File
mod - SoObjects/SOGo/NSArray+Utilities.m Diff File
mod - SoObjects/SOGo/NSCalendarDate+SOGo.m Diff File
mod - SoObjects/SOGo/NSData+Crypto.m Diff File
mod - SoObjects/SOGo/NSDictionary+DAV.m Diff File
mod - SoObjects/SOGo/NSString+Utilities.m Diff File
mod - SoObjects/SOGo/SOGoCache.h Diff File
mod - SoObjects/SOGo/SOGoCacheGCSFolder.h Diff File
mod - SoObjects/SOGo/SOGoCacheGCSFolder.m Diff File
mod - SoObjects/SOGo/SOGoCacheGCSObject.h Diff File
mod - SoObjects/SOGo/SOGoCacheGCSObject.m Diff File
mod - SoObjects/SOGo/SOGoCacheObject.h Diff File
mod - SoObjects/SOGo/SOGoContentObject.m Diff File
mod - SoObjects/SOGo/SOGoDefaults.plist Diff File
mod - SoObjects/SOGo/SOGoFolder.m Diff File
mod - SoObjects/SOGo/SOGoGCSFolder.h Diff File
mod - SoObjects/SOGo/SOGoGCSFolder.m Diff File
mod - SoObjects/SOGo/SOGoGroup.m Diff File
mod - SoObjects/SOGo/SOGoObject.m Diff File
mod - SoObjects/SOGo/SOGoParentFolder.m Diff File
mod - SoObjects/SOGo/SOGoUserDefaults.h Diff File
mod - SoObjects/SOGo/SOGoUserDefaults.m Diff File
mod - SoObjects/SOGo/SQLSource.m Diff File
mod - SoObjects/SOGo/WORequest+SOGo.m Diff File
mod - Tests/Integration/carddav.py Diff File
mod - Tests/Integration/preferences.py Diff File
mod - Tests/Integration/test-carddav.py Diff File
mod - Tests/Integration/test-prevent-invitations.py Diff File
mod - Tests/Unit/GNUmakefile Diff File
mod - Tests/Unit/SOGoTest.h Diff File
mod - Tests/Unit/SOGoTest.m Diff File
add - Tests/Unit/TestNGMailAddressParser.m Diff File
mod - Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m Diff File
add - Tests/Unit/TestNGMimeMessageGenerator.m Diff File
mod - Tests/Unit/TestNSString+URLEscaping.m Diff File
mod - Tests/Unit/TestVersit.m Diff File
mod - Tests/Unit/TestiCalRecurrenceCalculator.m Diff File
mod - Tests/Unit/TestiCalTimeZonePeriod.m Diff File
mod - Tools/SOGoEAlarmsNotifier.m Diff File
mod - Tools/SOGoSockDOperation.m Diff File
mod - Tools/SOGoToolCreateFolder.m Diff File
mod - Tools/SOGoToolExpireUserSessions.m Diff File
mod - Tools/SOGoToolManageEAS.m Diff File
mod - Tools/SOGoToolRemove.m Diff File
mod - Tools/SOGoToolRemoveDoubles.m Diff File
mod - Tools/SOGoToolRenameUser.m Diff File
mod - Tools/SOGoToolRestore.m Diff File
mod - Tools/SOGoToolUserPreferences.m Diff File
mod - Tools/sogo-tool.m Diff File
mod - UI/AdministrationUI/English.lproj/Localizable.strings Diff File
mod - UI/AdministrationUI/GNUmakefile Diff File
mod - UI/AdministrationUI/UIxAdministration.m Diff File
add - UI/AdministrationUI/UIxAdministrationAclEditor.h Diff File
add - UI/AdministrationUI/UIxAdministrationAclEditor.m Diff File
mod - UI/AdministrationUI/product.plist Diff File
mod - UI/Common/UIxPageFrame.m Diff File
mod - UI/Common/UIxToolbar.m Diff File
mod - UI/Common/WODirectAction+SOGo.m Diff File
mod - UI/Contacts/English.lproj/Localizable.strings Diff File
mod - UI/Contacts/GNUmakefile Diff File
mod - UI/Contacts/UIxContactActions.m Diff File
mod - UI/Contacts/UIxContactEditor.m Diff File
mod - UI/Contacts/UIxContactFolderActions.m Diff File
add - UI/Contacts/UIxContactFolderProperties.h Diff File
add - UI/Contacts/UIxContactFolderProperties.m Diff File
mod - UI/Contacts/UIxContactFoldersView.m Diff File
mod - UI/Contacts/UIxContactView.h Diff File
mod - UI/Contacts/UIxContactView.m Diff File
mod - UI/Contacts/product.plist Diff File
mod - UI/MailPartViewers/UIxMailPartHTMLViewer.m Diff File
mod - UI/MailPartViewers/UIxMailPartICalActions.m Diff File
mod - UI/MailPartViewers/UIxMailPartMessageViewer.m Diff File
mod - UI/MailPartViewers/UIxMailPartMixedViewer.h Diff File
mod - UI/MailPartViewers/UIxMailPartMixedViewer.m Diff File
mod - UI/MailPartViewers/UIxMailPartTextViewer.h Diff File
mod - UI/MailPartViewers/UIxMailPartTextViewer.m Diff File
mod - UI/MailPartViewers/UIxMailPartViewer.m Diff File
mod - UI/MailerUI/English.lproj/Localizable.strings Diff File
mod - UI/MailerUI/UIxMailEditor.m Diff File
mod - UI/MailerUI/UIxMailFolderActions.m Diff File
mod - UI/MailerUI/UIxMailListActions.m Diff File
mod - UI/MailerUI/UIxMailMainFrame.m Diff File
mod - UI/MailerUI/UIxMailView.m Diff File
mod - UI/MailerUI/product.plist Diff File
mod - UI/MainUI/SOGoMicrosoftActiveSyncActions.m Diff File
mod - UI/MainUI/SOGoUserHomePage.m Diff File
mod - UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings Diff File
mod - UI/PreferencesUI/English.lproj/Localizable.strings Diff File
mod - UI/PreferencesUI/UIxJSONPreferences.m Diff File
mod - UI/PreferencesUI/UIxPreferences.m Diff File
mod - UI/SOGoUI/SOGoAptFormatter.m Diff File
mod - UI/SOGoUI/UIxComponent.m Diff File
mod - UI/Scheduler/English.lproj/Localizable.strings Diff File
mod - UI/Scheduler/SpanishSpain.lproj/Localizable.strings Diff File
mod - UI/Scheduler/UIxAppointmentActions.m Diff File
mod - UI/Scheduler/UIxAppointmentEditor.m Diff File
mod - UI/Scheduler/UIxCalDateSelector.m Diff File
mod - UI/Scheduler/UIxCalDayTable.h Diff File
mod - UI/Scheduler/UIxCalDayTable.m Diff File
add - UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox Diff File
add - UI/Templates/ContactsUI/UIxContactFolderProperties.wox Diff File
add - UI/Templates/SOGoACLSlovenianModificationAdvisory.wox Diff File
rm - UI/Templates/SOGoACLSolvenianModificationAdvisory.wox Diff
add - UI/WebServerResources/js/Administration.js Diff File
add - UI/WebServerResources/js/Administration.js.map Diff File
add - UI/WebServerResources/js/Administration.services.js Diff File
add - UI/WebServerResources/js/Administration.services.js.map Diff File
add - UI/WebServerResources/js/Administration/Administration.app.js Diff File
add - UI/WebServerResources/js/Administration/Administration.service.js Diff File
add - UI/WebServerResources/js/Administration/AdministrationAclController.js Diff File
add - UI/WebServerResources/js/Administration/AdministrationController.js Diff File
add - UI/WebServerResources/js/Common/ensureTarget.filter.js Diff File
add - UI/WebServerResources/js/Common/mdColors.app.js Diff File
add - UI/WebServerResources/js/Common/sgPlaceholder.directive.js Diff File
add - UI/WebServerResources/js/Common/sgTimepicker.directive.js Diff File
add - UI/WebServerResources/js/Mailer.app.popup.js Diff File
add - UI/WebServerResources/js/Mailer.app.popup.js.map Diff File
add - UI/WebServerResources/js/Mailer/Mailer.popup.js Diff File
add - UI/WebServerResources/js/Mailer/VirtualMailbox.service.js Diff File
add - UI/WebServerResources/js/Mailer/sgZoomableImage.directive.js Diff File