[commits] Horde branch develop updated. 3a84256a21aba069db1a371e05b7b70ef198eb69

Michael J. Rubinsky mrubinsk at horde.org
Wed Jan 11 18:18:50 UTC 2012


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

from: 51d9ae6b656d8b3f226e48a5fc9c304b22985737

9d7556f Fix viral class name typo (Bug #10917).
81a5f20 Fix resetting page titles after returning from a different view/dialog.
ac66a97 Show title when displaying tasks list.
0d5c34b Ensure we are talking about the same timezones.
3a84256 Merge branch 'master' into develop

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

commit 9d7556fa615893f8d9ebaf7c174edfaef2419d4a
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 11 14:01:52 2012 +0100

    Fix viral class name typo (Bug #10917).

 nag/lib/Api.php |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/9d7556fa615893f8d9ebaf7c174edfaef2419d4a

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

commit 81a5f20f215e49be0f3491ee2cc3bc184bd76656
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 11 16:12:33 2012 +0100

    Fix resetting page titles after returning from a different view/dialog.

 kronolith/docs/CHANGES    |    1 +
 kronolith/js/kronolith.js |   45 +++++++++++++++++++++++++++++++++++++++------
 kronolith/package.xml     |    2 ++
 3 files changed, 42 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/81a5f20f215e49be0f3491ee2cc3bc184bd76656

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

commit ac66a97a72ac251a32a9d984f1e444d2f5391aa3
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 11 16:15:04 2012 +0100

    Show title when displaying tasks list.

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

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

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

commit 0d5c34b6b1dfda9a2639c1f0a44628f6c0848e1e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Jan 11 12:20:15 2012 -0500

    Ensure we are talking about the same timezones.
    
    Fixes a bug that causes incorrect exceptions to be created when
    drag/dropping an event in dynamic month view.

 kronolith/docs/CHANGES             |    2 ++
 kronolith/lib/Ajax/Application.php |   11 +++++++++--
 kronolith/package.xml              |    2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

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

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

commit 3a84256a21aba069db1a371e05b7b70ef198eb69
Merge: 51d9ae6 0d5c34b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Jan 11 12:25:28 2012 -0500

    Merge branch 'master' into develop
    
    Conflicts:
    	kronolith/js/kronolith.js
    	kronolith/package.xml

 kronolith/docs/CHANGES             |    3 ++
 kronolith/js/kronolith.js          |   55 ++++++++++++++++++++++++++++--------
 kronolith/lib/Ajax/Application.php |   11 ++++++-
 kronolith/lib/Kronolith.php        |    1 +
 kronolith/package.xml              |    7 ++++-
 nag/lib/Api.php                    |   16 +++++-----
 6 files changed, 70 insertions(+), 23 deletions(-)

http://git.horde.org/horde-git/-/commit/3a84256a21aba069db1a371e05b7b70ef198eb69




More information about the commits mailing list