[commits] Horde branch horde_5_2 updated. d7d06476e3964aacd95a57bfb65f137f0b5cf721

Michael J. Rubinsky mrubinsk at horde.org
Tue Dec 17 17:37:41 UTC 2013


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

from: 86dd92cace0c07fafa65bbf69672a3a7b36f6076

5501c97 [jan] Don't return future tasks from cost objects API.
c58ff5d Support displaying tag columns.
36faf2b [jan] Add show API link.
3af55ba ws
e42b879 Revert "Chrome, at least, requires .show() to be called."
3010b3f Avoid 'undefined' text in notification.
4f708f8 Delay notifications:
f4c015a Open the event view on clicking the desktop notification.
5fd8876 Snooze onclose, and dismiss onclick for desktop notifications.
3dd7feb Snooze onclick and ignore onclose.
f8f007e Open a new window if a url is available in the notification.
8d439d5 Merge branch 'master' into horde_5_2
e294879 Dismiss it, since we are opening the corresponding item.
d7d0647 Not needed.

Summary: http://github.com/horde/horde/compare/86dd92cace0c07fafa65bbf69672a3a7b36f6076...d7d06476e3964aacd95a57bfb65f137f0b5cf721

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

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 3af55ba805a12cd5a6cef63f4d3212a2eb3b0fb4
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 10:13:25 2013 -0500

    ws

 framework/Core/lib/Horde/Core/Alarm/Handler/Desktop.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/3af55ba805a12cd5a6cef63f4d3212a2eb3b0fb4
http://git.horde.org/horde-git/-/commit/3af55ba805a12cd5a6cef63f4d3212a2eb3b0fb4

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

commit e42b879bdae8f8a09714856c95ecd65e64fb6be4
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 10:24:34 2013 -0500

    Revert "Chrome, at least, requires .show() to be called."
    
    This function doesn't exist in all browsers.
    
    This reverts commit 86dd92cace0c07fafa65bbf69672a3a7b36f6076.

 framework/Core/js/hordecore.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit 3010b3faa799543f666c08b074049def676bee64
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 13:03:00 2013 -0500

    Avoid 'undefined' text in notification.

 framework/Core/js/hordecore.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/3010b3faa799543f666c08b074049def676bee64
http://git.horde.org/horde-git/-/commit/3010b3faa799543f666c08b074049def676bee64

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

commit 4f708f8727e947bee09ee155af3e69234bfaf217
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 13:03:17 2013 -0500

    Delay notifications:
    
    This is needed for Chrome. For some reason, when there are
    other, non desktop  notifications to be output using growler.js,
    the desktop notification gets lost in Chrome if it's not delayed.

 framework/Core/js/hordecore.js |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/4f708f8727e947bee09ee155af3e69234bfaf217
http://git.horde.org/horde-git/-/commit/4f708f8727e947bee09ee155af3e69234bfaf217

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

commit f4c015a3c65c09d96b149f76125f2d1dcba7471c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 13:41:39 2013 -0500

    Open the event view on clicking the desktop notification.

 framework/Core/js/hordecore.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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

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

commit 5fd88768f789a62ead16464b5fffca11e75a1922
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 2 14:59:06 2013 -0500

    Snooze onclose, and dismiss onclick for desktop notifications.

 framework/Core/js/hordecore.js          |   33 ++++++++++++++++++++++++++----
 framework/Core/lib/Horde/PageOutput.php |    4 ++-
 2 files changed, 31 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/5fd88768f789a62ead16464b5fffca11e75a1922
http://git.horde.org/horde-git/-/commit/5fd88768f789a62ead16464b5fffca11e75a1922

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

commit 3dd7febfc6fcd7da6b36f43bfd70b9b7d89dbe9c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 10:28:37 2013 -0500

    Snooze onclick and ignore onclose.
    
    There is no way to differentiate between a notification timing out
    and closing vs a user explicitly dismissing it, so we can't attach
    an action to the onclose event. Instead, snooze the alarm onclick.

 framework/Core/js/hordecore.js |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

http://github.com/horde/horde/commit/3dd7febfc6fcd7da6b36f43bfd70b9b7d89dbe9c
http://git.horde.org/horde-git/-/commit/3dd7febfc6fcd7da6b36f43bfd70b9b7d89dbe9c

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

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

    Open a new window if a url is available in the notification.

 framework/Core/js/hordecore.js |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

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

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

commit 8d439d50e860d68927dffa75f672e0d527c628b3
Merge: f8f007e 36faf2b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 10:52:22 2013 -0500

    Merge branch 'master' into horde_5_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/8d439d50e860d68927dffa75f672e0d527c628b3
http://git.horde.org/horde-git/-/commit/8d439d50e860d68927dffa75f672e0d527c628b3

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

commit e29487967c5c2c093115be30b7f2a95929561019
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 11:00:29 2013 -0500

    Dismiss it, since we are opening the corresponding item.

 framework/Core/js/hordecore.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit d7d06476e3964aacd95a57bfb65f137f0b5cf721
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 3 11:00:58 2013 -0500

    Not needed.

 framework/Core/lib/Horde/PageOutput.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

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




More information about the commits mailing list