Merge branch 'master' of ssh://git.kolab.org/diffusion/KS
Description
Description
Details
Details
- Provenance
machniak Authored on Aug 26 2015, 4:34 PM mollekopf Pushed on Aug 21 2023, 6:45 PM - Parents
- R4:7d2bcc93bc7f: Integrate kolabResource objectclass type definition of #3464
R4:01e8d5f42b92: Fix Class 'Syncroton_Exception_Status_MeetingMeeting' not found (#3961) - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- AuthorJeroen van Meeuwen (Kolab Systems)
- AuthorJeroen van Meeuwen (Kolab Systems)
- AuthorJeroen van Meeuwen (Kolab Systems)
- fad1722d88d7 Fix typo: kolab2 -> kolab3Author
- 6e28aa003136 Remove rootDSE, rename kolab2 => kolab3AuthorJeroen van Meeuwen (Kolab Systems)
- AuthorJeroen van Meeuwen (Kolab Systems)
- AuthorJeroen van Meeuwen (Kolab Systems)
- AuthorJeroen van Meeuwen (Kolab Systems)
- 2dc298f59a21 Add attributeType kolabTargetFolderAuthorJeroen van Meeuwen (Kolab Systems)
- AuthorJeroen van Meeuwen (Ergo Project)
- AuthorJeroen van Meeuwen (Ergo Project)
- AuthorJeroen van Meeuwen (Ergo Project)
- AuthorJeroen van Meeuwen (Ergo Project)
- 6c15376d3dea remerge refactor-kolabd (including recorded renames)AuthorThomas Arendsen Hein
- AuthorThomas Arendsen Hein
- f27ad2f6e050 merge headsAuthorThomas Arendsen Hein
- AuthorThomas Arendsen Hein
- 754e830b715a Merged refactor-kolabd.AuthorGunnar Wrobel
- 9f645eec8696 Merged refactor-kolab-webadmin.AuthorGunnar Wrobel
- e949e1b27e4b Merge with remote fix.AuthorGunnar Wrobel
- 86a305d2bb9d Merged branch 'default'AuthorGunnar Wrobel
- d68d0552fa32 MergeAuthorGunnar Wrobel
- AuthorGunnar Wrobel
- 0a616a7348f3 Fix broken commits on the kolab schema.AuthorGunnar Wrobel
- AuthorMartin Konold
- AuthorMartin Konold
- dd4f409171ee *** empty log message ***AuthorMathieu Parent
- AuthorThomas Arendsen Hein
- AuthorThomas Arendsen Hein
- AuthorThomas Arendsen Hein
- AuthorMartin Konold
- AuthorThomas Arendsen Hein
- 1175ca57de04 kolab2.schema consistency fix: no tabsAuthorThomas Arendsen Hein
- AuthorMartin Konold
- AuthorMartin Konold
- AuthorRichard Bos
- f3ae6ddd4285 Upgrading from Kolab server 2.1 is documentedAuthorThomas Arendsen Hein
- AuthorGunnar Wrobel
- AuthorThomas Arendsen Hein
- 183cafb38acf Add kolabAllowSMTPRecipient changes to LDAP again.AuthorThomas Arendsen Hein
- AuthorGunnar Wrobel
- AuthorMartin Konold
- AuthorMartin Konold
- 73d09cb99b2b 2007-05-07 Gunnar Wrobel <p@rdus.de>AuthorGunnar Wrobel
- AuthorThomas Arendsen Hein
- AuthorMartin Konold
- AuthorBernhard Reiter
- 7d2608118dd6 Martin Konold: Some clarificationsAuthorMartin Konold
- AuthorMartin Konold
- AuthorMartin Konold