summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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
2010-09-13MergeGunnar Wrobel0-0/+0
2010-09-13Started the process of removing the dist_conf based build process from ↵Gunnar Wrobel3-17/+4
kolab-webadmin. Two includes (auth.class.php and ldap.class.php) modified to use the configuration file.
2010-09-06Replaced all cvsignore files with one fresh hgignore file.Sascha Wilde7-7/+0
This is no 1:1 conversion but was created from scratch and tested with a full build of the 2.2-stable branch.
2010-09-06Replaced all cvsignore files with one fresh hgignore file.2.2-stableSascha Wilde7-7/+0
This is no 1:1 conversion but was created from scratch and tested with a full build of the 2.2-stable branch.
2010-08-23Mark the new template as configuration file.Gunnar Wrobel1-0/+1
2010-08-23kolab/issue4516 (Various logic/spelling fixes for the web admin)Gunnar Wrobel8-5/+32
2010-08-23Complete kolab/issue4512 (Allow to hide the admin mail settings in the web ↵Gunnar Wrobel2-5/+7
admin)
2010-08-23Complete kolab/issue4512 (Allow to hide the admin mail settings in the web ↵Gunnar Wrobel2-1/+5
admin)
2010-08-23kolab/issue4512 (Allow to hide the admin mail settings in the web admin)Gunnar Wrobel4-44/+10
2010-08-23kolab/issue4510 (Fix the kolab web admin display for Firefox)Gunnar Wrobel2-1/+5
2010-08-23kolab/issue4515 (Sort some additional lists in the web admin)Gunnar Wrobel3-1/+9
2010-08-23kolab/issue4511 (Correct the German web admin translation)Gunnar Wrobel2-52/+58
2010-07-12kolab/issue4430 (Modify User reply page contains user password in plain text)Gunnar Wrobel6-1/+19
2010-06-28kolab/issue606 (It is not possible to register people with middlename correctly)Gunnar Wrobel3-2/+25
2010-06-24Bump version numbers to 2.2.42.2.4Thomas Arendsen Hein1-1/+1
2010-05-21Configurable sieve port (l10n part of issue4373)Mathieu Parent7-11/+16
2010-04-13The old script names are not required anymore.Gunnar Wrobel3-8/+0
2010-04-13Update testing and fix an upgrade bug with the new forward segment script. ↵Gunnar Wrobel4-4/+12
Strict testing is no longer possible because we use the old Horde String library.
2010-04-13Fix delivery to folders containing umlauts for the cyrus server. Do not ↵Gunnar Wrobel6-5/+11
duplicate mails when activating forwarding and delivery at the same time (and keeping mails on the server).
2010-04-07kolab/issue1446 (Webinterface for setting vacation, email-delivery and ↵Gunnar Wrobel6-0/+1200
forwarding (rt#5033)) This also adds the tests that drove the implementation.
2010-04-07If the redirection is not activated then the address is missing now. Adapt ↵Gunnar Wrobel1-1/+1
keep check.
2010-04-07Full escaping of deactivated script segments.Gunnar Wrobel2-1/+13
2010-04-07Add check for unknown script.Gunnar Wrobel4-0/+33
2010-04-07Ensure we always generate valid sieve.Gunnar Wrobel2-5/+16
2010-04-06Do not check for PEAR-Net_Sieve in the code. The package dependencies should ↵Gunnar Wrobel3-42/+6
ensure that it is installed. In addition remove some unused functions.
2010-04-06And finally replace the code in the controllers with the new script generator.Gunnar Wrobel6-84/+68
2010-04-06Fix some minor sieve script issues.Gunnar Wrobel3-9/+17
2010-04-06Fix segment detection and add functionality to generate the combined script.Gunnar Wrobel1-6/+21
2010-04-06The new handler reads the old forward and vacation scripts just fine.Gunnar Wrobel3-51/+28
In addition this switches from the patched PEAR-Net_Sieve in kolab-webadmin/php/admin/include/Sieve.php to the standard PEAR-Net_Sieve package. The patched version was imported as is into Kolab CVS. There is no hint if there was anything specific that needed patching or what has actually been patched. The diff to the current PEAR-Net_Sieve also did not indicate anything that looked like it might be specific to the Kolab server. The patched version did however fail to work with the new handler as it was not able to load several sieve scripts in succession (which is necessary to avoid loosing data).
2010-04-06Import code that was misplaced in the controller.Gunnar Wrobel1-0/+17
2010-04-06The new handler reads the old delivery script just fine.Gunnar Wrobel1-11/+8
2010-04-06PHP5.3 strict, WSGunnar Wrobel1-109/+110