[koha-commits] main Koha release repository branch, master, updated. v3.02.00-248-g00408e2

Git repo owner gitmaster at git.koha-community.org
Wed Dec 1 21:21:06 CET 2010


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, master has been updated
       via  00408e262fbe58f4c6a3fbb722a0cb56d3d22f6c (commit)
       via  9f0495238de31cbdcacabe8f3986081f150ae2cb (commit)
       via  0287080cdcea7edafd836967c58fe754c88cf1ea (commit)
       via  f7b3b0c75b3dd21dd9c1899f0e5103c3b8798810 (commit)
      from  9753368626e631ebb06929278d408453186c2528 (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 00408e262fbe58f4c6a3fbb722a0cb56d3d22f6c
Merge: 0287080cdcea7edafd836967c58fe754c88cf1ea 9f0495238de31cbdcacabe8f3986081f150ae2cb
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Dec 2 09:20:14 2010 +1300

    Merge remote branch 'kc/new/bug_5030' into kcmaster

commit 0287080cdcea7edafd836967c58fe754c88cf1ea
Merge: 9753368626e631ebb06929278d408453186c2528 f7b3b0c75b3dd21dd9c1899f0e5103c3b8798810
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Dec 2 09:14:49 2010 +1300

    Merge remote branch 'kc/new/bug_5029' into kcmaster

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

Summary of changes:
 .../intranet-tmpl/prog/en/css/staff-global.css     |   17 +++-
 .../prog/en/modules/members/borrowers_details.tmpl |   63 -------------
 .../prog/en/modules/members/deletemem.tmpl         |   10 +-
 .../prog/en/modules/members/memberentrygen.tmpl    |   25 ++---
 .../prog/en/modules/members/moremember-brief.tmpl  |   97 ++++++++++++++++++++
 koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png   |  Bin 0 -> 205 bytes
 members/borrowers_details.pl                       |   75 ---------------
 members/deletemem.pl                               |   24 +++++-
 members/moremember.pl                              |    3 +
 9 files changed, 154 insertions(+), 160 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png
 delete mode 100755 members/borrowers_details.pl


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list