[commits] Horde branch kronolith_4_2 updated. b39469e90b0392c92104ad0f42e3b9a210151f3e

[Michael J. Rubinsky]

The branch "kronolith_4_2" has been updated.
The following is a summary of the commits.

from: 3df8b9c44d3ce887dc31436704f5e2df0a7a8bde

5501c97 [jan] Don't return future tasks from cost objects API.
c58ff5d Support displaying tag columns.
36faf2b [jan] Add show API link.
45bb683 Include the view url in the alarm notification.
ce84b68 Revert "Include the view url in the alarm notification."
29b186d Revert "Revert "Include the view url in the alarm notification.""
b39469e Merge branch 'master' into kronolith_4_2

Summary: http://github.com/horde/horde/compare/3df8b9c44d3ce887dc31436704f5e2df0a7a8bde...b39469e90b0392c92104ad0f42e3b9a210151f3e

-----------------------------------------------------------------------

commit 5501c97d23c4206a4de228aa7bc18d8a0f87d953
Author: Jan Schneider <jan at horde.org>
Date:   Thu Nov 28 12:18:07 2013 +0100

    [jan] Don't return future tasks from cost objects API.

 nag/docs/CHANGES |    1 +
 nag/lib/Api.php  |    6 ++++--
 nag/package.xml  |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/5501c97d23c4206a4de228aa7bc18d8a0f87d953
http://git.horde.org/horde-git/-/commit/5501c97d23c4206a4de228aa7bc18d8a0f87d953

-----------------------------------------------------------------------

commit c58ff5db7a661df5211a796aeab4e728bd4b03dd
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 25 19:59:04 2013 +0100

    Support displaying tag columns.

 turba/lib/Turba.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/c58ff5db7a661df5211a796aeab4e728bd4b03dd
http://git.horde.org/horde-git/-/commit/c58ff5db7a661df5211a796aeab4e728bd4b03dd

-----------------------------------------------------------------------

commit 36faf2b2f6296e7e520c06ec41c466b804c3534f
Author: Jan Schneider <jan at horde.org>
Date:   Fri Nov 29 13:37:48 2013 +0100

    [jan] Add show API link.

 whups/docs/CHANGES |    1 +
 whups/lib/Api.php  |    9 +++++++++
 whups/package.xml  |    4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/36faf2b2f6296e7e520c06ec41c466b804c3534f
http://git.horde.org/horde-git/-/commit/36faf2b2f6296e7e520c06ec41c466b804c3534f

-----------------------------------------------------------------------

commit 45bb68381386b9e05639ec2f821170bbda485bde
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 13:35:46 2013 -0500

    Include the view url in the alarm notification.

 kronolith/lib/Event.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/45bb68381386b9e05639ec2f821170bbda485bde
http://git.horde.org/horde-git/-/commit/45bb68381386b9e05639ec2f821170bbda485bde

-----------------------------------------------------------------------

commit ce84b681d810d44ef9879bd69a9ab4e391e4875e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 15:00:22 2013 -0500

    Revert "Include the view url in the alarm notification."
    
    This reverts commit 45bb68381386b9e05639ec2f821170bbda485bde.

 kronolith/lib/Event.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/ce84b681d810d44ef9879bd69a9ab4e391e4875e
http://git.horde.org/horde-git/-/commit/ce84b681d810d44ef9879bd69a9ab4e391e4875e

-----------------------------------------------------------------------

commit 29b186d0c04e9b2d123f0fd0f65db4825ef83822
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 10:32:54 2013 -0500

    Revert "Revert "Include the view url in the alarm notification.""
    
    This reverts commit ce84b681d810d44ef9879bd69a9ab4e391e4875e.

 kronolith/lib/Event.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/29b186d0c04e9b2d123f0fd0f65db4825ef83822
http://git.horde.org/horde-git/-/commit/29b186d0c04e9b2d123f0fd0f65db4825ef83822

-----------------------------------------------------------------------

commit b39469e90b0392c92104ad0f42e3b9a210151f3e
Merge: 29b186d 36faf2b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 10:52:45 2013 -0500

    Merge branch 'master' into kronolith_4_2

 nag/docs/CHANGES    |    1 +
 nag/lib/Api.php     |    6 ++++--
 nag/package.xml     |    4 ++--
 turba/lib/Turba.php |    3 ++-
 whups/docs/CHANGES  |    1 +
 whups/lib/Api.php   |    9 +++++++++
 whups/package.xml   |    4 ++--
 7 files changed, 21 insertions(+), 7 deletions(-)

http://github.com/horde/horde/commit/b39469e90b0392c92104ad0f42e3b9a210151f3e
http://git.horde.org/horde-git/-/commit/b39469e90b0392c92104ad0f42e3b9a210151f3e