The branch "master" has been updated. The following is a summary of the commits.
from: a3c86ab32aa2e1946f3aca8982f83b25a3281057 f06e9a9 Make configSQL a public method. 15eefd5 Add Horde_Cli wrapper class. 805fa2a We want an unpopulated Horde_Variables object. e906fcb Require Horde_Core 1.2.0. ba2f225 Load and merge configuration definitions from conf.d/*.xml 6a9e22c Convert conf.d/*.php files to conf.d/*.xml. 8ab68d2 Fix author. 4582b4c Add base class for all Horde_Bundle classes, implementing most of the bundle installation tasks. 285502a Extend Horde_Core_Bundle, implement _configAuth(). 30c221a Add conflict with Horde Groupware. 5bbafe6 Add dependencies and conflict with Webmail. d25c5c8 Add install script. ----------------------------------------------------------------------- commit f06e9a9e1993b813c73c08741367a1fe19728d15 Author: Jan Schneider <[email protected]> Date: Mon May 30 16:14:12 2011 +0200 Make configSQL a public method. framework/Core/lib/Horde/Config.php | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/f06e9a9e1993b813c73c08741367a1fe19728d15 ----------------------------------------------------------------------- commit 15eefd5aff2ac406b0626f591235e027c64996f0 Author: Jan Schneider <[email protected]> Date: Mon May 30 16:16:57 2011 +0200 Add Horde_Cli wrapper class. framework/Core/lib/Horde/Core/Cli.php | 104 +++++++++++++++++++++++++++++++++ framework/Core/package.xml | 14 +++-- 2 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 framework/Core/lib/Horde/Core/Cli.php http://git.horde.org/horde-git/-/commit/15eefd5aff2ac406b0626f591235e027c64996f0 ----------------------------------------------------------------------- commit 805fa2a5bd348e81be14f13483ec74c047de88d8 Author: Jan Schneider <[email protected]> Date: Mon May 30 16:17:37 2011 +0200 We want an unpopulated Horde_Variables object. horde/admin/config/index.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/805fa2a5bd348e81be14f13483ec74c047de88d8 ----------------------------------------------------------------------- commit e906fcb2baf09033f7491fbdb0372a61ff81340c Author: Jan Schneider <[email protected]> Date: Mon May 30 16:18:44 2011 +0200 Require Horde_Core 1.2.0. bundles/webmail/package.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/e906fcb2baf09033f7491fbdb0372a61ff81340c ----------------------------------------------------------------------- commit ba2f2257e7f833b6943b19bc307bf58c0f68cc8c Author: Jan Schneider <[email protected]> Date: Tue May 31 13:56:38 2011 +0200 Load and merge configuration definitions from conf.d/*.xml framework/Core/lib/Horde/Config.php | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/ba2f2257e7f833b6943b19bc307bf58c0f68cc8c ----------------------------------------------------------------------- commit 6a9e22cd0d29cfb9a35535fa8db725d6a86daeef Author: Jan Schneider <[email protected]> Date: Tue May 31 17:58:51 2011 +0200 Convert conf.d/*.php files to conf.d/*.xml. bundles/groupware/package.xml | 8 ++++---- bundles/groupware/turba/config/conf.d/10-groupware.php | 2 -- bundles/groupware/turba/config/conf.d/10-groupware.xml | 7 +++++++ bundles/webmail/imp/config/conf.d/10-webmail.php | 2 -- bundles/webmail/imp/config/conf.d/10-webmail.xml | 12 ++++++++++++ bundles/webmail/kronolith/config/conf.d/10-webmail.php | 2 -- bundles/webmail/kronolith/config/conf.d/10-webmail.xml | 12 ++++++++++++ bundles/webmail/package.xml | 12 ++++++------ bundles/webmail/turba/config/conf.d/10-webmail.php | 2 -- bundles/webmail/turba/config/conf.d/10-webmail.xml | 7 +++++++ 10 files changed, 48 insertions(+), 18 deletions(-) delete mode 100644 bundles/groupware/turba/config/conf.d/10-groupware.php create mode 100644 bundles/groupware/turba/config/conf.d/10-groupware.xml delete mode 100644 bundles/webmail/imp/config/conf.d/10-webmail.php create mode 100644 bundles/webmail/imp/config/conf.d/10-webmail.xml delete mode 100644 bundles/webmail/kronolith/config/conf.d/10-webmail.php create mode 100644 bundles/webmail/kronolith/config/conf.d/10-webmail.xml delete mode 100644 bundles/webmail/turba/config/conf.d/10-webmail.php create mode 100644 bundles/webmail/turba/config/conf.d/10-webmail.xml http://git.horde.org/horde-git/-/commit/6a9e22cd0d29cfb9a35535fa8db725d6a86daeef ----------------------------------------------------------------------- commit 8ab68d2cbaa5bfb27087ef403139a864e4ded356 Author: Jan Schneider <[email protected]> Date: Tue May 31 18:05:03 2011 +0200 Fix author. framework/Core/lib/Horde/Core/Cli.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/8ab68d2cbaa5bfb27087ef403139a864e4ded356 ----------------------------------------------------------------------- commit 4582b4cdd04593643a8c68d777b62f77cb60bfe8 Author: Jan Schneider <[email protected]> Date: Tue May 31 19:23:29 2011 +0200 Add base class for all Horde_Bundle classes, implementing most of the bundle installation tasks. framework/Core/lib/Horde/Core/Bundle.php | 176 ++++++++++++++++++++++++++++++ framework/Core/package.xml | 12 ++- 2 files changed, 184 insertions(+), 4 deletions(-) create mode 100644 framework/Core/lib/Horde/Core/Bundle.php http://git.horde.org/horde-git/-/commit/4582b4cdd04593643a8c68d777b62f77cb60bfe8 ----------------------------------------------------------------------- commit 285502a0fd3422545e5bfb360857cd0c19fc385b Author: Jan Schneider <[email protected]> Date: Tue May 31 19:29:25 2011 +0200 Extend Horde_Core_Bundle, implement _configAuth(). bundles/groupware/lib/Bundle.php | 51 ++++++++++++++++++++++++++++++++- bundles/kolab_webmail/lib/Bundle.php | 2 +- bundles/webmail/lib/Bundle.php | 16 +++++++++- 3 files changed, 64 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/285502a0fd3422545e5bfb360857cd0c19fc385b ----------------------------------------------------------------------- commit 30c221ac7502b8ab17ebd7a25e3da9e5d83dfdda Author: Jan Schneider <[email protected]> Date: Tue May 31 19:30:10 2011 +0200 Add conflict with Horde Groupware. bundles/webmail/package.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/30c221ac7502b8ab17ebd7a25e3da9e5d83dfdda ----------------------------------------------------------------------- commit 5bbafe643c6c856ae1c3238aabdf0f1649986b69 Author: Jan Schneider <[email protected]> Date: Tue May 31 19:30:31 2011 +0200 Add dependencies and conflict with Webmail. bundles/groupware/package.xml | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/5bbafe643c6c856ae1c3238aabdf0f1649986b69 ----------------------------------------------------------------------- commit d25c5c8986351e1b0a69b9087d8dd692c5df9269 Author: Jan Schneider <[email protected]> Date: Mon May 30 16:19:11 2011 +0200 Add install script. bundles/webmail/bin/webmail-install | 39 +++++++++++++++++++++++++++++++++++ bundles/webmail/package.xml | 10 ++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100755 bundles/webmail/bin/webmail-install http://git.horde.org/horde-git/-/commit/d25c5c8986351e1b0a69b9087d8dd692c5df9269 __ commits mailing list Frequently Asked Questions: http://horde.org/faq/ To unsubscribe, mail: [email protected]
