[commits] Horde branch imp_6_1 updated. 52d5686eb26f9c6171e2c4a1e3550b4504a7800c
Michael M Slusarz
slusarz at horde.org
Tue Jan 8 22:38:01 UTC 2013
The branch "imp_6_1" has been updated.
The following is a summary of the commits.
from: 0534bc74759f1addcf3669b98921aa3d0f4e350a
603008f Add missing/accidently removed changelog entry.
c719f9c Bug #11884: Don't attempt to parse empty multipart/related parts
fb11ec5 German translation: Fix small grammar glitch
079af23 Save horde alarms methods in Kolab event XML like we do for nag
a4cbf5f Add form ID.
2cf5356 [jan] Fix generating cache key for generated URLs (remi at famillecollet.com, Bug #11894).
6cd87ff Fix Debian watchfile in template
ca3eb1a Debian: Replace horde4 references by horde and by move config and apps in resp. /etc/horde and /usr/share/horde
c1626af Kronolith has been removed from webmail and groupware configs
ad6bf103 components: Small fixes in Debian template
9a6c71e Specific debian/rules file for ansel, gollem, sesha and whups configs
ef70d44 Package name and directory name should correspond
7c20d03 Add optionnal dependency File_Fstab to Horde, as mentionned in INSTALL
14ab584 Another non-failing test case
ce6e6d4 Coding style.
fad8f02 Fix notice about unset property.
ae502c9 [jan] Fix setting default start time in new event dialog of basic view (Bug #11861).
204a04a [jan] Fix setting menu refresh rate to none (Bug #11867).
66f47b6 This might fix setting default vacation addresses (Bug #11871).
efcaddf Fix getFromAddress().
e531e9c Fix 2nd parameter to unseenMessages()
52d5686 Merge branch 'master' into imp_6_1
-----------------------------------------------------------------------
commit 603008fffe7812b7a06a4b6b756476e3cd4feaae
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Jan 6 20:10:28 2013 -0500
Add missing/accidently removed changelog entry.
framework/ActiveSync/package.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/603008fffe7812b7a06a4b6b756476e3cd4feaae
-----------------------------------------------------------------------
commit c719f9c8c68c10e5c787e965f7e301f76b6842be
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Jan 6 21:34:00 2013 -0700
Bug #11884: Don't attempt to parse empty multipart/related parts
imp/lib/Mime/Viewer/Related.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/c719f9c8c68c10e5c787e965f7e301f76b6842be
-----------------------------------------------------------------------
commit fb11ec548736a2fee4abffb396dce4b35520c430
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date: Thu Dec 13 17:40:48 2012 +0100
German translation: Fix small grammar glitch
Bug: 11881
Signed-off-by: Thomas Jarosch <thomas.jarosch at intra2net.com>
Signed-off-by: Jan Schneider <jan at horde.org>
turba/locale/de/LC_MESSAGES/turba.po | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/fb11ec548736a2fee4abffb396dce4b35520c430
-----------------------------------------------------------------------
commit 079af2301bbf8adc85d139eb5ea08f6e268aac42
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date: Thu Dec 13 17:23:34 2012 +0100
Save horde alarms methods in Kolab event XML like we do for nag
Bug: 11880
Signed-off-by: Thomas Jarosch <thomas.jarosch at intra2net.com>
Signed-off-by: Jan Schneider <jan at horde.org>
framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php | 1 +
kronolith/docs/CHANGES | 2 ++
kronolith/lib/Event/Kolab.php | 7 +++++++
kronolith/package.xml | 2 ++
4 files changed, 12 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/079af2301bbf8adc85d139eb5ea08f6e268aac42
-----------------------------------------------------------------------
commit a4cbf5f4f23b56d9e7017947ce31079dd2d3b735
Author: Jan Schneider <jan at horde.org>
Date: Tue Jan 8 00:13:24 2013 +0100
Add form ID.
Fixes notifications (Bug #11892).
passwd/templates/index.html.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/a4cbf5f4f23b56d9e7017947ce31079dd2d3b735
-----------------------------------------------------------------------
commit 2cf53565d5283a8d9d4b08a512d269d5931f8430
Author: Jan Schneider <jan at horde.org>
Date: Tue Jan 8 00:21:20 2013 +0100
[jan] Fix generating cache key for generated URLs (remi at famillecollet.com, Bug #11894).
framework/Routes/lib/Horde/Routes/Mapper.php | 2 +-
framework/Routes/package.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/2cf53565d5283a8d9d4b08a512d269d5931f8430
-----------------------------------------------------------------------
commit 6cd87ff159baa018b3bf269452e0222925bd8fbd
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri Dec 7 18:48:40 2012 +0100
Fix Debian watchfile in template
Fixes:
- http://pear.horde.org/get/ is not browsable anymore
- Properly mangle "~debian" from Debian version if needed
components/data/distribute/debian/templates/watch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/6cd87ff159baa018b3bf269452e0222925bd8fbd
-----------------------------------------------------------------------
commit ca3eb1abcd6578cbfdc1782ea65d9c9beb39b940
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri Dec 7 19:15:32 2012 +0100
Debian: Replace horde4 references by horde and by move config and apps in resp. /etc/horde and /usr/share/horde
.../data/distribute/debian/templates-php-horde-content/rules | 6 +-
.../data/distribute/debian/templates-php-horde-groupware/rules | 14 +-
components/data/distribute/debian/templates-php-horde-imp/rules | 6 +-
components/data/distribute/debian/templates-php-horde-ingo/rules | 6 +-
components/data/distribute/debian/templates-php-horde-jonah/rules | 6 +-
.../distribute/debian/templates-php-horde-kolab-webmail/rules | 30 ++--
.../data/distribute/debian/templates-php-horde-kronolith/rules | 6 +-
components/data/distribute/debian/templates-php-horde-mnemo/rules | 6 +-
components/data/distribute/debian/templates-php-horde-nag/rules | 6 +-
.../data/distribute/debian/templates-php-horde-passwd/rules | 6 +-
components/data/distribute/debian/templates-php-horde-turba/rules | 6 +-
.../data/distribute/debian/templates-php-horde-ulaform/rules | 6 +-
.../data/distribute/debian/templates-php-horde-webmail/rules | 18 ++--
.../data/distribute/debian/templates-php-horde-wicked/rules | 6 +-
components/data/distribute/debian/templates-php-horde/rules | 6 +-
components/data/distribute/debian/templates/pearrc | 2 +-
.../test/distribute/debian/templates-php-horde-content/rules | 6 +-
.../Components/test/distribute/debian/templates-php-horde/rules | 6 +-
18 files changed, 74 insertions(+), 74 deletions(-)
http://git.horde.org/horde-git/-/commit/ca3eb1abcd6578cbfdc1782ea65d9c9beb39b940
-----------------------------------------------------------------------
commit c1626af27d7acbcf7ec75fe4c7fa45afb92970b6
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri Dec 7 19:23:34 2012 +0100
Kronolith has been removed from webmail and groupware configs
So, we don't need to create the symlinks
.../data/distribute/debian/templates-php-horde-groupware/rules | 3 ---
.../data/distribute/debian/templates-php-horde-webmail/rules | 3 ---
2 files changed, 0 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/c1626af27d7acbcf7ec75fe4c7fa45afb92970b6
-----------------------------------------------------------------------
commit ad6bf103dfe43b551426f238a7271c9bc136946c
Author: Mathieu Parent <math.parent at gmail.com>
Date: Fri Dec 7 19:32:25 2012 +0100
components: Small fixes in Debian template
- Standards-Version -> 3.9.4
- hardcode Upstream Homepage (dynamic fields in sources only replaced in binary packages)
components/data/distribute/debian/templates/changelog | 2 +-
components/data/distribute/debian/templates/control | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/ad6bf103dfe43b551426f238a7271c9bc136946c
-----------------------------------------------------------------------
commit 9a6c71ebdc8a4a32c1f9ea629b443d4d3cb8c17b
Author: Mathieu Parent <math.parent at gmail.com>
Date: Sat Dec 8 21:50:41 2012 +0100
Specific debian/rules file for ansel, gollem, sesha and whups configs
components/data/distribute/debian/templates-php-horde-ansel/rules | 16 +++++
.../data/distribute/debian/templates-php-horde-gollem/rules | 16 +++++
components/data/distribute/debian/templates-php-horde-sesha/rules | 16 +++++
components/data/distribute/debian/templates-php-horde-whups/rules | 16 +++++
4 files changed, 64 insertions(+), 0 deletions(-)
create mode 100644 components/data/distribute/debian/templates-php-horde-ansel/rules
create mode 100644 components/data/distribute/debian/templates-php-horde-gollem/rules
create mode 100644 components/data/distribute/debian/templates-php-horde-sesha/rules
create mode 100644 components/data/distribute/debian/templates-php-horde-whups/rules
http://git.horde.org/horde-git/-/commit/9a6c71ebdc8a4a32c1f9ea629b443d4d3cb8c17b
-----------------------------------------------------------------------
commit ef70d449e2981ddd1e119ce44d19b9236cdb3505
Author: Mathieu Parent <math.parent at gmail.com>
Date: Sun Dec 9 17:31:55 2012 +0100
Package name and directory name should correspond
components/package.xml | 2 +-
koward/package.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/ef70d449e2981ddd1e119ce44d19b9236cdb3505
-----------------------------------------------------------------------
commit 7c20d03d515b609a3898a3f99edc0c3c87916c4d
Author: Mathieu Parent <math.parent at gmail.com>
Date: Tue Dec 11 19:42:46 2012 +0100
Add optionnal dependency File_Fstab to Horde, as mentionned in INSTALL
horde/package.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/7c20d03d515b609a3898a3f99edc0c3c87916c4d
-----------------------------------------------------------------------
commit 14ab58465afeddffecddcc9bfe8852b19d1e81e2
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 8 13:02:31 2013 -0700
Another non-failing test case
framework/Util/test/Horde/Util/StringTest.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/14ab58465afeddffecddcc9bfe8852b19d1e81e2
-----------------------------------------------------------------------
commit ce6e6d4940071974e59e3a631a6a9d6329e29871
Author: Jan Schneider <jan at horde.org>
Date: Tue Jan 8 21:17:38 2013 +0100
Coding style.
sesha/lib/Entity/Value.php | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
http://git.horde.org/horde-git/-/commit/ce6e6d4940071974e59e3a631a6a9d6329e29871
-----------------------------------------------------------------------
commit fad8f027262ff84bbca5ddabce366a2a81d6a3f9
Author: Jan Schneider <jan at horde.org>
Date: Tue Jan 8 21:22:34 2013 +0100
Fix notice about unset property.
kronolith/lib/Driver/Ical.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/fad8f027262ff84bbca5ddabce366a2a81d6a3f9
-----------------------------------------------------------------------
commit ae502c9c78312be59d75222c370a52a294f0e3ab
Author: Jan Schneider <jan at horde.org>
Date: Tue Jan 8 21:28:11 2013 +0100
[jan] Fix setting default start time in new event dialog of basic view (Bug #11861).
kronolith/docs/CHANGES | 2 ++
kronolith/new.php | 6 ++++--
kronolith/package.xml | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/ae502c9c78312be59d75222c370a52a294f0e3ab
-----------------------------------------------------------------------
commit 204a04a8fdd38772eb9bf97fc366269c1c9d600c
Author: Jan Schneider <jan at horde.org>
Date: Tue Jan 8 21:34:50 2013 +0100
[jan] Fix setting menu refresh rate to none (Bug #11867).
horde/docs/CHANGES | 1 +
horde/js/topbar.js | 6 ++++--
horde/lib/View/Topbar.php | 2 +-
horde/package.xml | 2 ++
4 files changed, 8 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/204a04a8fdd38772eb9bf97fc366269c1c9d600c
-----------------------------------------------------------------------
commit 66f47b65773601a81d72cc0b08ba5e3d4f46e49c
Author: Jan Schneider <jan at horde.org>
Date: Tue Jan 8 21:49:39 2013 +0100
This might fix setting default vacation addresses (Bug #11871).
ingo/vacation.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/66f47b65773601a81d72cc0b08ba5e3d4f46e49c
-----------------------------------------------------------------------
commit efcaddf7fc783cb16cd5224b45098086c9f4be56
Author: Jan Schneider <jan at horde.org>
Date: Tue Jan 8 21:50:31 2013 +0100
Fix getFromAddress().
Get the address from the requested identity, and fall back to the user name.
framework/Core/lib/Horde/Core/Prefs/Identity.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/efcaddf7fc783cb16cd5224b45098086c9f4be56
-----------------------------------------------------------------------
commit e531e9c6e6fe6f5916804706f7b12e55e9073ad3
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 8 16:11:29 2013 -0700
Fix 2nd parameter to unseenMessages()
imp/lib/Ajax/Application/ListMessages.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/e531e9c6e6fe6f5916804706f7b12e55e9073ad3
-----------------------------------------------------------------------
commit 52d5686eb26f9c6171e2c4a1e3550b4504a7800c
Merge: 0534bc7 e531e9c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 8 16:12:14 2013 -0700
Merge branch 'master' into imp_6_1
components/data/distribute/debian/templates-php-horde-ansel/rules | 16 ++
.../data/distribute/debian/templates-php-horde-content/rules | 6 +-
.../data/distribute/debian/templates-php-horde-gollem/rules | 16 ++
.../data/distribute/debian/templates-php-horde-groupware/rules | 13 +-
components/data/distribute/debian/templates-php-horde-imp/rules | 6 +-
components/data/distribute/debian/templates-php-horde-ingo/rules | 6 +-
components/data/distribute/debian/templates-php-horde-jonah/rules | 6 +-
.../distribute/debian/templates-php-horde-kolab-webmail/rules | 30 ++--
.../data/distribute/debian/templates-php-horde-kronolith/rules | 6 +-
components/data/distribute/debian/templates-php-horde-mnemo/rules | 6 +-
components/data/distribute/debian/templates-php-horde-nag/rules | 6 +-
.../data/distribute/debian/templates-php-horde-passwd/rules | 6 +-
components/data/distribute/debian/templates-php-horde-sesha/rules | 16 ++
components/data/distribute/debian/templates-php-horde-turba/rules | 6 +-
.../data/distribute/debian/templates-php-horde-ulaform/rules | 6 +-
.../data/distribute/debian/templates-php-horde-webmail/rules | 17 +--
components/data/distribute/debian/templates-php-horde-whups/rules | 16 ++
.../data/distribute/debian/templates-php-horde-wicked/rules | 6 +-
components/data/distribute/debian/templates-php-horde/rules | 6 +-
components/data/distribute/debian/templates/changelog | 2 +-
components/data/distribute/debian/templates/control | 4 +-
components/data/distribute/debian/templates/pearrc | 2 +-
components/data/distribute/debian/templates/watch | 4 +-
components/package.xml | 2 +-
.../test/distribute/debian/templates-php-horde-content/rules | 6 +-
.../Components/test/distribute/debian/templates-php-horde/rules | 6 +-
framework/ActiveSync/package.xml | 6 +-
framework/Core/lib/Horde/Core/Prefs/Identity.php | 6 +-
framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php | 1 +
framework/Routes/lib/Horde/Routes/Mapper.php | 2 +-
framework/Routes/package.xml | 4 +-
framework/Util/test/Horde/Util/StringTest.php | 3 +-
horde/docs/CHANGES | 1 +
horde/js/topbar.js | 6 +-
horde/lib/View/Topbar.php | 2 +-
horde/package.xml | 6 +
imp/lib/Ajax/Application/ListMessages.php | 4 +-
imp/lib/Mime/Viewer/Related.php | 6 +-
ingo/vacation.php | 2 +-
koward/package.xml | 2 +-
kronolith/docs/CHANGES | 4 +
kronolith/lib/Driver/Ical.php | 3 +-
kronolith/lib/Event/Kolab.php | 7 +
kronolith/new.php | 6 +-
kronolith/package.xml | 4 +
passwd/templates/index.html.php | 2 +-
sesha/lib/Entity/Value.php | 37 +++--
turba/locale/de/LC_MESSAGES/turba.po | 2 +-
48 files changed, 221 insertions(+), 117 deletions(-)
http://git.horde.org/horde-git/-/commit/52d5686eb26f9c6171e2c4a1e3550b4504a7800c
More information about the commits
mailing list