[commits] Horde branch master updated. 9b9d329bb7513145d1d00512760927f56c8a67c0
Jan Schneider
jan at horde.org
Fri Feb 18 13:33:15 UTC 2011
The branch "master" has been updated.
The following is a summary of the commits.
from: 435aede031ac4f60530dfe5c871cd86bd9855303
c3d8097 Revert "Revert "Disable backends entry via property, not conf.php value""
c83c39d Use a flag to enable/disable backends.
daccd1d Remove CVS left-overs.
9b9d329 Load .local.php files in Horde::loadConfiguration() and always load configuration files through loadConfiguration().
-----------------------------------------------------------------------
commit c3d8097e11cd5d60dd6f1aa88f6212ff44254215
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 18 12:20:24 2011 +0100
Revert "Revert "Disable backends entry via property, not conf.php value""
This reverts commit 7079a9ff554e1ea8b2e17678512c463fadbf80b2.
imp/config/backends.php | 12 ++++++++++++
imp/config/conf.xml | 5 -----
imp/lib/Application.php | 17 -----------------
imp/lib/Imap.php | 3 +--
4 files changed, 13 insertions(+), 24 deletions(-)
http://git.horde.org/horde-git/-/commit/c3d8097e11cd5d60dd6f1aa88f6212ff44254215
-----------------------------------------------------------------------
commit c83c39de64f63ec8e812be98d1da022cee9963b4
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 18 12:39:39 2011 +0100
Use a flag to enable/disable backends.
imp/config/backends.php | 2 +-
ingo/config/backends.php | 16 ++++++++++++++++
ingo/config/conf.xml | 10 ----------
ingo/lib/Application.php | 11 -----------
ingo/lib/Ingo.php | 3 +--
turba/config/backends.php | 23 +++++++++++++++++++++--
turba/config/conf.xml | 10 ----------
turba/lib/Application.php | 7 -------
turba/lib/Turba.php | 2 +-
9 files changed, 40 insertions(+), 44 deletions(-)
http://git.horde.org/horde-git/-/commit/c83c39de64f63ec8e812be98d1da022cee9963b4
-----------------------------------------------------------------------
commit daccd1d474a7f109cf611abed369b82d3659c973
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 18 14:18:23 2011 +0100
Remove CVS left-overs.
hermes/config/.cvsignore | 3 ---
hermes/po/.cvsignore | 1 -
hylax/config/.cvsignore | 4 ----
jonah/config/.cvsignore | 5 -----
operator/config/.cvsignore | 3 ---
operator/po/.cvsignore | 1 -
passwd/config/.cvsignore | 4 ----
passwd/po/.cvsignore | 1 -
trean/config/.cvsignore | 3 ---
9 files changed, 0 insertions(+), 25 deletions(-)
delete mode 100644 hermes/config/.cvsignore
delete mode 100644 hermes/po/.cvsignore
delete mode 100644 hylax/config/.cvsignore
delete mode 100644 jonah/config/.cvsignore
delete mode 100644 operator/config/.cvsignore
delete mode 100644 operator/po/.cvsignore
delete mode 100644 passwd/config/.cvsignore
delete mode 100644 passwd/po/.cvsignore
delete mode 100644 trean/config/.cvsignore
http://git.horde.org/horde-git/-/commit/daccd1d474a7f109cf611abed369b82d3659c973
-----------------------------------------------------------------------
commit 9b9d329bb7513145d1d00512760927f56c8a67c0
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 18 14:28:54 2011 +0100
Load .local.php files in Horde::loadConfiguration() and always load
configuration files through loadConfiguration().
agora/config/prefs.php | 5 -
ansel/config/prefs.php | 5 -
ansel/config/styles.php | 5 -
ansel/migration/3_ansel_upgrade_style.php | 76 ++++++------
ansel/migration/7_ansel_upgrade_stylefix.php | 76 ++++++------
beatnik/config/prefs.php | 5 -
chora/config/mime_drivers.php | 5 -
chora/config/prefs.php | 5 -
content/config/routes.php | 6 -
folks/config/prefs.php | 5 -
framework/Core/lib/Horde.php | 49 ++++----
framework/Core/lib/Horde/Core/Controller/RequestMapper.php | 3 +
framework/Core/lib/Horde/Registry.php | 4 +-
gollem/config/mime_drivers.php | 5 -
gollem/config/prefs.php | 5 -
hermes/config/prefs.php | 5 -
hippo/config/routes.php | 6 -
horde/config/mime_drivers.php | 5 -
horde/config/motd.php | 5 -
horde/config/nls.php | 5 -
horde/config/prefs.php | 6 -
horde/config/registry.php | 5 -
horde/config/spelling.php | 5 -
hydra/config/routes.php | 6 -
hylax/config/prefs.php | 5 -
imp/config/backends.php | 5 -
imp/config/mime_drivers.php | 5 -
imp/config/portal.php | 5 -
imp/config/prefs.php | 5 -
imp/lib/Ajax/Application.php | 2 +-
imp/templates/dimp/javascript_defs.php | 2 +-
ingo/config/backends.php | 5 -
ingo/config/fields.php | 5 -
ingo/config/prefs.php | 5 -
ingo/lib/Ingo.php | 2 +-
ingo/lib/Storage/Mock.php | 2 +-
ingo/rule.php | 2 +-
jonah/config/routes.php | 6 -
jonah/config/templates.php | 5 -
jonah/dispatcher.php | 5 +-
jonah/feed.php | 3 +-
jonah/lib/Block/News.php | 3 +-
jonah/lib/Block/NewsPopular.php | 3 +-
jonah/lib/Driver.php | 2 +-
jonah/lib/View/DeliveryHtml.php | 2 +-
kronolith/config/prefs.php | 5 -
luxor/config/languages.php | 5 -
luxor/config/mime_drivers.php | 5 -
luxor/lib/Lang.php | 2 +-
luxor/lib/Lang/Generic.php | 2 +-
mnemo/config/prefs.php | 5 -
nag/config/prefs.php | 5 -
operator/config/prefs.php | 5 -
pastie/config/prefs.php | 5 -
skeleton/config/prefs.php | 5 -
trean/config/prefs.php | 5 -
turba/config/attributes.php | 5 -
turba/config/backends.php | 5 -
turba/config/mime_drivers.php | 5 -
turba/config/prefs.php | 5 -
turba/lib/Driver.php | 2 +-
turba/lib/Turba.php | 2 +-
vilma/config/prefs.php | 5 -
whups/config/mime_drivers.php | 5 -
whups/config/prefs.php | 5 -
whups/config/reminders.php | 5 -
whups/config/templates.php | 5 -
whups/data.php | 4 +-
whups/lib/Scheduler/Whups.php | 3 +-
whups/lib/Whups.php | 2 +-
wicked/config/prefs.php | 5 -
71 files changed, 121 insertions(+), 377 deletions(-)
http://git.horde.org/horde-git/-/commit/9b9d329bb7513145d1d00512760927f56c8a67c0
More information about the commits
mailing list