summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-04-30Consolidate all graphics in www/admin/imagesChristoph Wickert35-81/+94
2011-04-28Apply small update from Georg (adds a picture for the ActiveSync config to ↵2.3.1Christoph Wickert4-1/+6
the user's welcome page)
2011-04-27Remove Thomas and Sascha from the credits (by their very own request)Christoph Wickert1-2/+0
2011-04-21Merge branch 'master' of ssh://git.kolabsys.com/git/kolab-webadminBogomil Shopov2-1/+4
2011-04-21Fixing error on ActiveSync configuration screen: ↵Bogomil Shopov1-10/+16
https://bugzilla.kolabsys.com/show_bug.cgi?id=92
2011-04-21Really include activesync in package.xmlChristoph Wickert1-0/+2
2011-04-21Add note on country fieldChristoph Wickert1-1/+2
2011-04-21package.xml: fix file nameChristoph Wickert1-2/+2
2011-04-21Fix syntax error in package.xmlChristoph Wickert1-1/+1
2011-04-20ActiveSync settings in package.xmlBogomil Shopov1-0/+27
2011-04-20Fixing addressbook problems and LDAP bug: ↵Bogomil Shopov2-7/+5
https://bugzilla.kolabsys.com/show_bug.cgi?id=76
2011-04-20Include welcome-domain-maintainer.tpl in package.xmlChristoph Wickert1-1/+18
2011-04-20Fix permissionsChristoph Wickert3-0/+0
2011-04-20New welcome screen fixes. https://bugzilla.kolabsys.com/show_bug.cgi?id=87Bogomil Shopov6-17/+49
2011-04-20Fixing the UID problem in user.php.Bogomil Shopov1-2/+2
2011-04-20Fix paths of includes in the new About sectionChristoph Wickert2-10/+10
2011-04-19Bump version to 2.3.0.1, include all developers and update changelogChristoph Wickert1-3/+45
2011-04-19Fix #75: Problems with new UID based dnBogomil Shopov1-1/+7
2011-04-19Merge branch '2.3-stable'Jeroen van Meeuwen (Kolab Systems)3-3/+527
2011-04-19Revert "Fixing the UID bug. See : ↵Jeroen van Meeuwen (Kolab Systems)1-5/+1
https://bugzilla.kolabsys.com/show_bug.cgi?id=75" This reverts commit 6af61f8c3c46aa032a1f0bb7ff70e939ca4f0454.
2011-04-19update package.xml for Bogo's new skinwork/merge-2.3-stableChristoph Wickert1-0/+44
2011-04-19Check in COPYING and remove INSTALL from package.xmlChristoph Wickert2-1/+481
2011-04-19Update About section from GeorgChristoph Wickert20-85/+411
2011-04-19ActiveSync management screenBogomil Shopov17-1/+1113
2011-04-19Fixing problem with multi-language: ↵Bogomil Shopov1-2/+3
https://bugzilla.kolabsys.com/show_bug.cgi?id=69
2011-04-19New webadmin skinBogomil Shopov23-52/+506
2011-04-19Check in server.git changes to cn->uid naming attributeJeroen van Meeuwen (Ergo Project)1-2/+2
2011-04-19Update About section from GeorgChristoph Wickert20-85/+411
2011-04-19ActiveSync management screenBogomil Shopov17-1/+1113
2011-04-18Fixing the UID bug. See : https://bugzilla.kolabsys.com/show_bug.cgi?id=75Bogomil Shopov1-1/+5
2011-04-15Fixing problem with multi-language: ↵Bogomil Shopov1-2/+3
https://bugzilla.kolabsys.com/show_bug.cgi?id=69
2011-04-13New webadmin skinBogomil Shopov23-52/+506
2010-10-11remerge refactor-kolabd (including recorded renames)2.3-alphaThomas Arendsen Hein0-0/+0
2010-10-11merge refactor-kolabd (including recorded renames) with old branchThomas Arendsen Hein0-0/+0
2010-10-11merge headsThomas Arendsen Hein83-769/+620
2010-10-11Dummy merge: Mark 2.2-stable as merged into default up to point of migrationThomas Arendsen Hein0-0/+0
Development in the Mercurial repository started after b291c29ca994 (for default) and 82733a4020a0 (for 2.2-stable). There are still some changesets in the 2.2-stable branch that need to be ported to default, this can be determined by comparing release-notes.txt.
2010-09-23Merged refactor-kolabd.Gunnar Wrobel0-0/+0
2010-09-23Merged refactor-kolab-webadmin.Gunnar Wrobel0-0/+0
2010-09-15Finalize the PEAR based installation. The kolab-webadmin source directory ↵refactor-kolab-webadminGunnar Wrobel3-16/+114
should be ready to be removed.
2010-09-14Merge with remote fix.Gunnar Wrobel1-11/+1
2010-09-14Initial draft of a package.xml.Gunnar Wrobel5-396/+342
This is now a broken intermediate stage.
2010-09-14Fix typo.Gunnar Wrobel1-11/+1
2010-09-14Move the locale directory into dataGunnar Wrobel9-21/+18
2010-09-14Move the templates in the data directory in preparation of moving this to a ↵Gunnar Wrobel34-36/+36
PEAR based package.
2010-09-13Removed the last of the dist_conf calls.Gunnar Wrobel6-35/+22
page.tpl and the version information get displayed configuration based now.
2010-09-13Remove dist_conf from page.tpl and logout.php.Gunnar Wrobel4-19/+15
2010-09-13Avoid the use of two include directories.Gunnar Wrobel38-303/+168
This is the major change in order to get rid of the dist_conf approach for the web admin: This moves all includes into the KolabAdmin/include directory. The top directory KolabAdmin needs to be in the include path. Should be a sane setup for all distributions.
2010-09-13Remove dist_conf from the headers.php include.Gunnar Wrobel2-12/+2
2010-09-13Move the smarty handling into the config file. Having a configuration based ↵Gunnar Wrobel2-11/+6
inclusion path is still bad but smarty still seems to have different install paths on the different distributions.
2010-09-13Merged branch 'default'Gunnar Wrobel0-0/+0