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

from: fb4ac49a813a4910e8add007b0c46b58d78ba7dd

76aa2e0 [mms] Fix Horde_Domhtml#returnBody().
1f9b5e6 Fix due dates of recurring tasks in portal block too.
0cc65e4 [jan] Fix listing alarms of recurring tasks.
2884204 [mms] SECURITY: Fix token validation of AJAX actions.
c71cb85 Fix XSS on SmartMobile portal
642f9c1 [mms] SECURITY: Fix XSS vulnerability on smartmobile portal page (João 
Machado <[email protected]>).
6a6e5c7 Better way of iterating through rulesets
448a39e _syncStatus() data doesn't have any meaning outside of the Sync class
7645610 Merge branch 'master' into imp_6_1

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

commit 76aa2e0fb77f4e0b8ee53a671f0ce24bd5b0969f
Author: Michael M Slusarz <[email protected]>
Date:   Wed Mar 27 22:47:58 2013 -0600

    [mms] Fix Horde_Domhtml#returnBody().

 framework/Util/lib/Horde/Domhtml.php |    2 +-
 framework/Util/package.xml           |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/76aa2e0fb77f4e0b8ee53a671f0ce24bd5b0969f

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

commit 1f9b5e6e3a68e6d053a78bbabdbd2791b3ed2bd7
Author: Jan Schneider <[email protected]>
Date:   Thu Mar 28 09:51:13 2013 +0100

    Fix due dates of recurring tasks in portal block too.

 nag/docs/CHANGES          |    5 +++--
 nag/lib/Block/Summary.php |   16 ++++++++--------
 nag/package.xml           |    2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/1f9b5e6e3a68e6d053a78bbabdbd2791b3ed2bd7

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

commit 0cc65e4212f65a223089cf995e8d80c937c765fa
Author: Jan Schneider <[email protected]>
Date:   Thu Mar 28 09:52:42 2013 +0100

    [jan] Fix listing alarms of recurring tasks.

 nag/docs/CHANGES       |    1 +
 nag/lib/Driver.php     |    3 ++-
 nag/lib/Driver/Sql.php |    5 ++++-
 nag/package.xml        |    4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/0cc65e4212f65a223089cf995e8d80c937c765fa

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

commit 2884204d9b175d8729c1e662ba53cbeb9c03e7e6
Author: Michael M Slusarz <[email protected]>
Date:   Thu Mar 28 11:58:10 2013 -0600

    [mms] SECURITY: Fix token validation of AJAX actions.
    
    Mea culpa.  This commit broke things:
    
    commit 83dcfa1448ba2b142623839aee78a2160eb25cb0
    Author: Michael M Slusarz <[email protected]>
    Date:   Wed Oct 17 13:27:10 2012 -0600
    
        [mms] Allow AJAX handler methods to be marked externally accessible
        (i.e. no session token checking) (Bug #11538).
    
    This commit failed to extend the injector to pass the token argument to
    the AJAX Application handler.  Although we should always do this check,
    regardless of whether the token is empty anyway.

 framework/Core/lib/Horde/Core/Ajax/Application.php |    5 ++---
 framework/Core/lib/Horde/Core/Factory/Ajax.php     |    5 +++--
 framework/Core/package.xml                         |    2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/2884204d9b175d8729c1e662ba53cbeb9c03e7e6

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

commit c71cb8590098ea4e1da4a183cc26fd5ac5d412c0
Author: João Machado <[email protected]>
Date:   Thu Mar 28 10:31:26 2013 +0000

    Fix XSS on SmartMobile portal
    
    Signed-off-by: Michael M Slusarz <[email protected]>

 horde/templates/portal/smartmobile.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/c71cb8590098ea4e1da4a183cc26fd5ac5d412c0

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

commit 642f9c1b80e5ae384fe7b817270b2af596bf8c7f
Author: Michael M Slusarz <[email protected]>
Date:   Thu Mar 28 12:02:01 2013 -0600

    [mms] SECURITY: Fix XSS vulnerability on smartmobile portal page (João 
Machado <[email protected]>).

 horde/docs/CHANGES |    2 ++
 horde/package.xml  |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/642f9c1b80e5ae384fe7b817270b2af596bf8c7f

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

commit 6a6e5c71858d5f50cdad33005558857cc660b566
Author: Michael M Slusarz <[email protected]>
Date:   Thu Mar 28 12:39:34 2013 -0600

    Better way of iterating through rulesets

 framework/Core/lib/Horde/Themes/Css.php |   32 ++++++++++++++++--------------
 1 files changed, 17 insertions(+), 15 deletions(-)

http://git.horde.org/horde-git/-/commit/6a6e5c71858d5f50cdad33005558857cc660b566

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

commit 448a39e3f4363d657a6c147fe6e42ffc44aa48d5
Author: Michael M Slusarz <[email protected]>
Date:   Thu Mar 28 14:03:23 2013 -0600

    _syncStatus() data doesn't have any meaning outside of the Sync class

 framework/Imap_Client/lib/Horde/Imap/Client/Base.php |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/448a39e3f4363d657a6c147fe6e42ffc44aa48d5

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

commit 7645610db382478a041dd474223298974ddabb3f
Merge: fb4ac49 448a39e
Author: Michael M Slusarz <[email protected]>
Date:   Thu Mar 28 15:29:55 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/Core/lib/Horde/Core/Ajax/Application.php   |    5 +--
 framework/Core/lib/Horde/Core/Factory/Ajax.php       |    5 ++-
 framework/Core/lib/Horde/Themes/Css.php              |   32 +++++++++--------
 framework/Core/package.xml                           |    2 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php |    7 +---
 framework/Util/lib/Horde/Domhtml.php                 |    2 +-
 framework/Util/package.xml                           |    4 +-
 horde/docs/CHANGES                                   |    2 +
 horde/package.xml                                    |    2 +
 horde/templates/portal/smartmobile.inc               |    2 +-
 nag/docs/CHANGES                                     |    6 ++-
 nag/lib/Block/Summary.php                            |   16 ++++----
 nag/lib/Driver.php                                   |    3 +-
 nag/lib/Driver/Sql.php                               |    5 ++-
 nag/package.xml                                      |    6 ++-
 15 files changed, 56 insertions(+), 43 deletions(-)

http://git.horde.org/horde-git/-/commit/7645610db382478a041dd474223298974ddabb3f


-- 
commits mailing list
Frequently Asked Questions: http://wiki.horde.org/FAQ
To unsubscribe, mail: [email protected]

Reply via email to