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

[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  8411cf6b309653101cb99d33781c512771ae8abf (commit)
       via  593a4d9b06d720a0952e8391f030be0c0c1649bb (commit)
       via  3b56a0f8a9b62b362452a3fa3732200771e422c8 (commit)
      from  cfd7bc00924c93b28abd398fcbe8725021f5f80d (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 8411cf6b309653101cb99d33781c512771ae8abf
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date:   Wed Aug 11 02:27:39 2010 +0200

    Fix for Bug 6458 Follow-up for memberentrygen.tt
    
    The registration date field would show up twice after applying the first
    patch for memberentrygen.tt.
    
    This patch fixes the problem.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 8a4dbae0efee89728de8bc5a63339828498f9798)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 593a4d9b06d720a0952e8391f030be0c0c1649bb
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 09:07:15 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in
    member entry form.
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Fixes lots of problems. Spotted one small problem. I am sending a follow-up.
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit e8a876614eddde3025477e228d4ccf533d3cc683)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 3b56a0f8a9b62b362452a3fa3732200771e422c8
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Tue Aug 9 11:20:47 2011 -0400

    Bug 5252 - Phone labels on patron creation
    
    The labels for emails on the patron forms say 'primary' and
    'secondary.' This patch does the same thing for the phones.
    phone is now 'Primary phone', mobile is now 'Secondary phone',
    and 'phonepro' is now 'Other phone'. This way the type of phone
    does not matter and the phone that the patron wants to be called
    at the most is the 'primary.'
    
    This is just a step in the direction of fixing Bug 5252, not a
    complete fix.
    
    This patch also updated a stray reference to Home Email.  Both the
    OPAC and staff client are updated with this patch.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 0a71367dc2113de860ca25f735a4996e170e44d6)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 .../prog/en/modules/members/memberentrygen.tt      |  278 ++++++++++++++++----
 .../prog/en/modules/members/moremember-brief.tt    |   14 +-
 .../prog/en/modules/members/moremember.tt          |   14 +-
 .../opac-tmpl/prog/en/modules/opac-userdetails.tt  |    4 +-
 .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |   12 +-
 5 files changed, 251 insertions(+), 71 deletions(-)


hooks/post-receive
-- 
main Koha release repository