[koha-commits] main Koha release repository branch 3.4.x updated. v3.04.04-117-gd7aa3a4

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.4.x has been updated
       via  d7aa3a4434e3236ec623af92037284f205001ec6 (commit)
       via  4d97f7ee09eb750f6d0eb5edc13cddc7a78df493 (commit)
       via  8fc80fcec9d3d792167dc8b0047fae28d0cff5c7 (commit)
       via  2aca7cfd491b1ff1b293c1430331fd922d3d9bb2 (commit)
       via  1bd17707e8ed31c204b37f13d2fcbced94ae77d4 (commit)
      from  8411cf6b309653101cb99d33781c512771ae8abf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d7aa3a4434e3236ec623af92037284f205001ec6
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Mon Sep 5 20:44:14 2011 +1200

    bug_6318: Always give predefined fields drop downs on label layout edit
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d43aa87d35561266275d840fe890009d8a231772)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 4d97f7ee09eb750f6d0eb5edc13cddc7a78df493
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 13 09:51:01 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in
    messaging preferences include.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7cc412d337245b5ffbbb94b5c503e6afd989a3ed)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8fc80fcec9d3d792167dc8b0047fae28d0cff5c7
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 11:14:50 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in MARC
    editor. Modifying script to stop tag attribute markup from being
    passed to the template directly in favor of using template logic.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7e8381c78c6ccffbe6d41d700fa46aa3ed8025ff)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2aca7cfd491b1ff1b293c1430331fd922d3d9bb2
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 13 08:57:25 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Correcting doc-head-open.inc (again?).
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 143e3e6541b829c8c7e476526348502b05b204ee)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 1bd17707e8ed31c204b37f13d2fcbced94ae77d4
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Aug 25 15:11:09 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Correction for opac-messaging.tt tops tag attribute markup from
    being passed to the template directly in favor of using template
    logic.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 4324377c55f3c82f724fc08c364eb678ab0f5ffa)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/Creators/Layout.pm                              |    3 +-
 C4/Form/MessagingPreferences.pm                    |    4 +-
 cataloguing/addbiblio.pl                           |    2 +-
 .../prog/en/includes/doc-head-open.inc             |    2 +-
 .../prog/en/includes/messaging-preference-form.inc |   68 ++++++++++++++++----
 .../prog/en/modules/cataloguing/addbiblio.tt       |    8 ++-
 .../prog/en/modules/labels/label-edit-layout.tt    |   28 ++++----
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |   49 +++++++++++---
 labels/label-edit-layout.pl                        |   60 ++++++-----------
 9 files changed, 139 insertions(+), 85 deletions(-)


hooks/post-receive
-- 
main Koha release repository