From gitmaster at git.koha-community.org  Thu Sep  1 10:51:43 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 08:51:43 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6528
	created. v3.04.00-426-gff4b179
Message-ID: <E1Qz2zv-0000Fr-Gm@git.koha-community.org>

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, new/bug_6528 has been created
        at  ff4b179e14ab15bf5d20852a37e2b0a2dca45800 (commit)

- Log -----------------------------------------------------------------
commit ff4b179e14ab15bf5d20852a37e2b0a2dca45800
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 29 14:14:58 2011 +1200

    Bug 6528 : Cataloguing search not showing location for available items
    
    Cataloging search now shows holdings information.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  1 10:56:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 08:56:28 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5524
	created. v3.04.00-427-ge39de04
Message-ID: <E1Qz34W-0000Iu-Ee@git.koha-community.org>

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, new/bug_5524 has been created
        at  e39de040206eae26e22d6375479b548017cb7217 (commit)

- Log -----------------------------------------------------------------
commit e39de040206eae26e22d6375479b548017cb7217
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Aug 26 13:42:44 2011 +1200

    Bug 5524 : Cant delete list from the second page of lists
    
    Includes follow up fixing deleting lists in OPAC
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  1 10:58:31 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 08:58:31 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-427-ge39de04
Message-ID: <E1Qz36V-0000KV-1n@git.koha-community.org>

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  e39de040206eae26e22d6375479b548017cb7217 (commit)
       via  ff4b179e14ab15bf5d20852a37e2b0a2dca45800 (commit)
      from  390d1d5be6e59990bee85ed6e44f117a8cd19c54 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/VirtualShelves/Page.pm                          |    2 +-
 .../prog/en/modules/cataloguing/addbooks.tt        |    4 ++--
 .../prog/en/modules/virtualshelves/shelves.tt      |    6 ++++--
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  1 11:02:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 09:02:50 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6794
	created. v3.04.00-428-g6756581
Message-ID: <E1Qz3Ag-0000Nh-OB@git.koha-community.org>

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, new/bug_6794 has been created
        at  6756581cf88bcbe40203722bb29aef6abe9283f6 (commit)

- Log -----------------------------------------------------------------
commit 6756581cf88bcbe40203722bb29aef6abe9283f6
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Sat Aug 27 09:09:46 2011 +1200

    Bug 6794 : Fixing a bug with member flags in IE
    
    Rebased for template toolkit
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  1 11:07:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 09:07:30 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6656
	created. v3.04.00-429-g5a2fc68
Message-ID: <E1Qz3FC-0000QT-Tf@git.koha-community.org>

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, new/bug_6656 has been created
        at  5a2fc683d842ca964b42c8ae68b15aba2526ef30 (commit)

- Log -----------------------------------------------------------------
commit 5a2fc683d842ca964b42c8ae68b15aba2526ef30
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 29 15:35:45 2011 +1200

    Bug 6656 : Fix for advanced search not respecting default sort order
    
    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>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  1 11:10:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 09:10:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6704
	created. v3.04.00-430-g720e301
Message-ID: <E1Qz3IA-0000S3-8n@git.koha-community.org>

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, new/bug_6704 has been created
        at  720e3012a87ca437c17e864f159138304ed0c006 (commit)

- Log -----------------------------------------------------------------
commit 720e3012a87ca437c17e864f159138304ed0c006
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 29 16:46:11 2011 +1200

    Bug 6704 : Escaping html in the merging records, so " don't break the merge
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  1 11:11:08 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 09:11:08 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-430-g720e301
Message-ID: <E1Qz3Ii-0000T9-Hq@git.koha-community.org>

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  720e3012a87ca437c17e864f159138304ed0c006 (commit)
       via  5a2fc683d842ca964b42c8ae68b15aba2526ef30 (commit)
       via  6756581cf88bcbe40203722bb29aef6abe9283f6 (commit)
      from  e39de040206eae26e22d6375479b548017cb7217 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 catalogue/search.pl                                |    2 +-
 .../prog/en/modules/cataloguing/merge.tt           |   10 +++++-----
 .../prog/en/modules/members/member-flags.tt        |   10 ++++------
 opac/opac-search.pl                                |    3 +--
 4 files changed, 11 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  1 11:26:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 09:26:57 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6351
	updated. v3.04.00-60-gcb6c40f
Message-ID: <E1Qz3Y1-0000cD-0Y@git.koha-community.org>

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, new/bug_6351 has been updated
       via  cb6c40faf78fa25b752c3c51abc98435e9afe4cb (commit)
      from  eba64bf25d8da0f091ce0b5d8329385638fb1fe1 (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 cb6c40faf78fa25b752c3c51abc98435e9afe4cb
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Aug 30 13:49:51 2011 -0400

    Bug 6351: Cannot delete library-specific holds polices and checkout limits
    
    Template::Toolkit scope error on delete links on Checkout Limit by Patron Category
    and Holds Policy by Item Type areas.
    
    Testing Results:
    Tested adding and removing Checkout Limits by Patron Category - both work
    Tested adding and removing Holds Policies by ItemTypes - both work
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../prog/en/modules/admin/smart-rules.tt           |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  1 11:39:27 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 09:39:27 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6822
	created. v3.04.00-433-ga2a9bc5
Message-ID: <E1Qz3k7-0000h7-5O@git.koha-community.org>

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, new/bug_6822 has been created
        at  a2a9bc522035c17a24aa48badc5184b015197826 (commit)

- Log -----------------------------------------------------------------
commit a2a9bc522035c17a24aa48badc5184b015197826
Author: Steven Callender <stevecallender at esilibrary.com>
Date:   Tue Aug 30 15:19:23 2011 -0400

    Bug 6822: fix RIS export from OPAC
    
    Prior to this patch, RIS export was producing
    effectively empty output.
    
    Signed-off-by: Steven Callender <stevecallender at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 6be9d2b27dd47c859eb6ab0cfd873b2059206986
Merge: 720e301 cb6c40f
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Sep 1 21:28:41 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  1 11:39:55 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 01 Sep 2011 09:39:55 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-433-ga2a9bc5
Message-ID: <E1Qz3kZ-0000ht-71@git.koha-community.org>

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  a2a9bc522035c17a24aa48badc5184b015197826 (commit)
       via  6be9d2b27dd47c859eb6ab0cfd873b2059206986 (commit)
       via  cb6c40faf78fa25b752c3c51abc98435e9afe4cb (commit)
      from  720e3012a87ca437c17e864f159138304ed0c006 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/admin/smart-rules.tt           |    4 ++--
 opac/opac-export.pl                                |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 03:22:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 01:22:45 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-434-ge8f654f
Message-ID: <E1QzISy-0005Co-T9@git.koha-community.org>

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  e8f654fcd206a98ad1a9222e17bffe2bdb32747d (commit)
      from  a2a9bc522035c17a24aa48badc5184b015197826 (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 e8f654fcd206a98ad1a9222e17bffe2bdb32747d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Sep 2 13:22:20 2011 +1200

    Revert "Bug 5630 CAS improvements"
    
    This reverts commit 9a3950f673c28688a2ead6514c3320e34ec0cc4c.

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

Summary of changes:
 C4/Auth.pm                                       |  127 ++++++---------
 C4/Auth_cas_servers.yaml.orig                    |   12 --
 C4/Auth_with_cas.pm                              |  181 +++++-----------------
 docs/CAS/CAS/README                              |    8 -
 docs/CAS/CASProxy/README                         |    9 -
 docs/CAS/CASProxy/examples/casSession.tmp        |  Bin 134 -> 0 bytes
 docs/CAS/CASProxy/examples/koha_webservice.pl    |   58 -------
 docs/CAS/CASProxy/examples/proxy_cas.pl          |   91 -----------
 docs/CAS/CASProxy/examples/proxy_cas_callback.pl |   62 --------
 docs/CAS/CASProxy/examples/proxy_cas_data.pl     |   80 ----------
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt |   14 +--
 11 files changed, 92 insertions(+), 550 deletions(-)
 delete mode 100644 C4/Auth_cas_servers.yaml.orig
 delete mode 100644 docs/CAS/CAS/README
 delete mode 100644 docs/CAS/CASProxy/README
 delete mode 100644 docs/CAS/CASProxy/examples/casSession.tmp
 delete mode 100755 docs/CAS/CASProxy/examples/koha_webservice.pl
 delete mode 100755 docs/CAS/CASProxy/examples/proxy_cas.pl
 delete mode 100755 docs/CAS/CASProxy/examples/proxy_cas_callback.pl
 delete mode 100755 docs/CAS/CASProxy/examples/proxy_cas_data.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 20:28:00 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 18:28:00 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_2539
	created. v3.04.00-435-gf9413ca
Message-ID: <E1QzYTA-00079Y-BI@git.koha-community.org>

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, new/bug_2539 has been created
        at  f9413ca2d20199a366928926ad8321dde50d12c1 (commit)

- Log -----------------------------------------------------------------
commit f9413ca2d20199a366928926ad8321dde50d12c1
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 22 16:09:05 2011 -0400

    Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
    
    Removing unused script.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 20:28:31 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 18:28:31 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-435-gf9413ca
Message-ID: <E1QzYTf-0007AQ-OP@git.koha-community.org>

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  f9413ca2d20199a366928926ad8321dde50d12c1 (commit)
      from  e8f654fcd206a98ad1a9222e17bffe2bdb32747d (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 misc/spellcheck_suggest/make_spellcheck_suggest.pl |  240 --------------------
 1 files changed, 0 insertions(+), 240 deletions(-)
 delete mode 100755 misc/spellcheck_suggest/make_spellcheck_suggest.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 20:39:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 18:39:47 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6834
	created. v3.04.00-439-g1ce78a0
Message-ID: <E1QzYeZ-0007OG-TV@git.koha-community.org>

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, new/bug_6834 has been created
        at  1ce78a0c225224a41638da15bbc9de31e08d2e85 (commit)

- Log -----------------------------------------------------------------
commit 1ce78a0c225224a41638da15bbc9de31e08d2e85
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date:   Fri Sep 2 10:36:29 2011 +0200

    bug 6834 followup removing param_map
    
    param_map was still to be found in two files.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 0dbad3efce01a4bf04e9a0e01fc04330c9d9aba1
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Sep 2 15:31:28 2011 +1200

    Bug 6834 : Removing last of the $template->{param_map}
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit afa94246d3d13993b7add9b34b40be977945f8fd
Merge: f9413ca acc684b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Sep 3 06:35:17 2011 +1200

    Merge branch 'new/bug_6479' into kcmaster

commit acc684bc01fca37615009a778ba5927e40f52d29
Author: Fr?d?rick Capovilla <frederick.capovilla at sys-tech.net>
Date:   Tue Jun 7 14:03:08 2011 -0400

    Bug 6479 Converts all the serialseq variables to UTF-8.
    
    Corrects a problem when an UTF-8 character is used in the serial
    numbering formula. The encoding became incorrect when concatenating the
    number in the subscriptionhistory table.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    To reproduce:
    - Create subscription with numbering pattern N? {X}
    - Receive 2 or more issues
    - Check subscription summary page and manual history fields on the edit screen
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 20:40:08 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 18:40:08 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-439-g1ce78a0
Message-ID: <E1QzYeu-0007Pv-CE@git.koha-community.org>

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  1ce78a0c225224a41638da15bbc9de31e08d2e85 (commit)
       via  0dbad3efce01a4bf04e9a0e01fc04330c9d9aba1 (commit)
       via  afa94246d3d13993b7add9b34b40be977945f8fd (commit)
       via  acc684bc01fca37615009a778ba5927e40f52d29 (commit)
      from  f9413ca2d20199a366928926ad8321dde50d12c1 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 acqui/acqui-home.pl     |    2 +-
 acqui/basket.pl         |    2 +-
 admin/aqbudgets.pl      |    4 ++--
 admin/aqplan.pl         |    6 +++---
 serials/serials-edit.pl |    5 +++++
 5 files changed, 12 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 20:50:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 18:50:47 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6595
	created. v3.04.00-441-g6ba4419
Message-ID: <E1QzYpD-0007Yp-HN@git.koha-community.org>

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, new/enh/bug_6595 has been created
        at  6ba4419be0826f9535e92d1bbf3612f7bf0695b7 (commit)

- Log -----------------------------------------------------------------
commit 6ba4419be0826f9535e92d1bbf3612f7bf0695b7
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Jul 17 17:18:47 2011 +0200

    Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)
    
    Patch fixes some translation issues and address formatting for printed
    hold notices.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit ba78d6a8503d9340797eeabf2f9655efaee6f993
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Jul 17 16:20:00 2011 +0200

    Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
    
    Translates the purchase suggestion mails in sample_notices.sql from English to German.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 20:51:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 18:51:19 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-441-g6ba4419
Message-ID: <E1QzYpj-0007a9-F1@git.koha-community.org>

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  6ba4419be0826f9535e92d1bbf3612f7bf0695b7 (commit)
       via  ba78d6a8503d9340797eeabf2f9655efaee6f993 (commit)
      from  1ce78a0c225224a41638da15bbc9de31e08d2e85 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../data/mysql/de-DE/mandatory/sample_notices.sql  |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 21:01:35 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 19:01:35 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_4966
	created. v3.04.00-444-gca1906f
Message-ID: <E1QzYzf-0007gI-7a@git.koha-community.org>

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, new/bug_4966 has been created
        at  ca1906f9c6d584434825cc9891e816da014a8c4e (commit)

- Log -----------------------------------------------------------------
commit ca1906f9c6d584434825cc9891e816da014a8c4e
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Fri Sep 2 14:36:21 2011 +0200

    Bug 4966 - follow up - add xhtml closure for input tags
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit bb958cc6135a3ab8e83068b67ac0da345d20a0a0
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 5 10:09:21 2011 -0400

    bug4966 - follow up to 4966 changes language from 'end' to 'finish'
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 955450dd1b64f37df01a6ef3bcdfaa1063b52ae8
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Fri Aug 5 15:47:16 2011 +0200

    bug 4966: Add a button in parcel.pl for confirm end receiving
    
    Signed-off-by: Nicole Engard <nengard at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 21:10:25 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 19:10:25 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-444-gca1906f
Message-ID: <E1QzZ8D-00084y-5F@git.koha-community.org>

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  ca1906f9c6d584434825cc9891e816da014a8c4e (commit)
       via  bb958cc6135a3ab8e83068b67ac0da345d20a0a0 (commit)
       via  955450dd1b64f37df01a6ef3bcdfaa1063b52ae8 (commit)
      from  6ba4419be0826f9535e92d1bbf3612f7bf0695b7 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 21:24:02 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 19:24:02 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-39-g5cc224c
Message-ID: <E1QzZLO-0008PD-ED@git.koha-community.org>

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  5cc224c2b9c2e4e56743f47f01e7203129d98674 (commit)
       via  f8b236cf41bb94e23092ecd7719104655f327e8a (commit)
       via  ea13523f39b64876aeecc55bf5b272aac20be9d8 (commit)
       via  d40172304337df6ac767603f12ba8c9aac088652 (commit)
       via  26c8351e0824aae59b33a1f175a5f5b5658c2d61 (commit)
       via  b2b850e196494446c7a576e3c7616b38b8114754 (commit)
       via  23a289c8fc338e60c31e1c9ace5cd2578190453a (commit)
       via  3e24de6743b8a679120d8a6f3e6d9a4b75b2ffb5 (commit)
       via  ad588f2d30ef706aceb6a5cb86733da8089ca52c (commit)
       via  95e47cd9490f3471cc5f90039fa90910684107ef (commit)
       via  c03df35867e6df5d2ce45d6423434c6fceddd079 (commit)
       via  85f5f84f0161e2ee57e8302215580a3e747b0ddc (commit)
       via  e934c2fb99d482456ae9cb6421046037f345cefe (commit)
       via  2346f0e97a4ff5d8062e1c6f09f94512dee84847 (commit)
       via  86b844adf21e49fa8779211b149de0390cf4d072 (commit)
       via  f7622034a9ec700de0f2da0a7524df7583693853 (commit)
       via  4849fa64f5278b305f5334e600ff05448e2f2e09 (commit)
       via  de601feb6ba95de66bff008e6e00d24b367f23d6 (commit)
       via  3bfed2b838893dbca336a042405a77eb93b21100 (commit)
       via  d879db93bd81a9f0a54fdf1d56a76f451a22795e (commit)
       via  d4ade6fcb20b07c0da38b9d4067ba9ed6b0cfea8 (commit)
       via  80ffc7e53cc7262a1b0502f689af0fe43d3123ba (commit)
       via  b4ad543173782db98443b03e3ed099859c99e02a (commit)
       via  21c4438cceeb490a1bd46ddf11ed9df3fe330fd8 (commit)
       via  5f5a782666dd2005e8cb7ee679eda281e807df18 (commit)
       via  0dfdb05c8892f070da27a94f15fad47d24c26e2a (commit)
       via  1cc389269cf536c9ca580199c1dc1f878b4af555 (commit)
       via  503bed73705c124c76b66de0539bb1608b94bb48 (commit)
       via  09010c20383fc1f592d0376559765024b302ebac (commit)
       via  f1e7a9f019cb82c555711129b63b06282f0b397d (commit)
       via  d729e75b0d1c21178fe988cc1b66b567ff45dd1b (commit)
       via  862df3d8461a7a6455b606a7ee595334a93c59cf (commit)
       via  85f4ca591ee6cd1d672e251dc416bc86a3e92142 (commit)
       via  31b326c7507a1b0a6d475d3576ccc88af4c89efd (commit)
       via  c587b2e8548578365c244ec699e4fe471a42ce4d (commit)
       via  807b5ef4c78179498096c2494797f0a57363a6a9 (commit)
       via  bfed019c2006d8268a99c8bdfa9f3b5b288d7b00 (commit)
       via  624d79e99f9a29494a5c664343d1151f4c7cb81e (commit)
       via  2912b144cd6703286e4c6d60d25b9d1606fc2b45 (commit)
      from  de9926a99c8cbd940abd20279f8af0413fa79593 (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 5cc224c2b9c2e4e56743f47f01e7203129d98674
Author: Steven Callender <stevecallender at esilibrary.com>
Date:   Tue Aug 30 15:19:23 2011 -0400

    Bug 6822: fix RIS export from OPAC
    
    Prior to this patch, RIS export was producing
    effectively empty output.
    
    Signed-off-by: Steven Callender <stevecallender at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a2a9bc522035c17a24aa48badc5184b015197826)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f8b236cf41bb94e23092ecd7719104655f327e8a
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Aug 30 13:49:51 2011 -0400

    Bug 6351: Cannot delete library-specific holds polices and checkout limits
    
    Template::Toolkit scope error on delete links on Checkout Limit by Patron Category
    and Holds Policy by Item Type areas.
    
    Testing Results:
    Tested adding and removing Checkout Limits by Patron Category - both work
    Tested adding and removing Holds Policies by ItemTypes - both work
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit cb6c40faf78fa25b752c3c51abc98435e9afe4cb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ea13523f39b64876aeecc55bf5b272aac20be9d8
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 29 16:46:11 2011 +1200

    Bug 6704 : Escaping html in the merging records, so " don't break the merge
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 720e3012a87ca437c17e864f159138304ed0c006)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d40172304337df6ac767603f12ba8c9aac088652
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Sat Aug 27 09:09:46 2011 +1200

    Bug 6794 : Fixing a bug with member flags in IE
    
    Rebased for template toolkit
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    (cherry picked from commit 6756581cf88bcbe40203722bb29aef6abe9283f6)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 26c8351e0824aae59b33a1f175a5f5b5658c2d61
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Aug 26 13:42:44 2011 +1200

    Bug 5524 : Cant delete list from the second page of lists
    
    Includes follow up fixing deleting lists in OPAC
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit e39de040206eae26e22d6375479b548017cb7217)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b2b850e196494446c7a576e3c7616b38b8114754
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 29 14:14:58 2011 +1200

    Bug 6528 : Cataloguing search not showing location for available items
    
    Cataloging search now shows holdings information.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit ff4b179e14ab15bf5d20852a37e2b0a2dca45800)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 23a289c8fc338e60c31e1c9ace5cd2578190453a
Author: preprod34 <preprod34 at koha.ccsr.qc.ca>
Date:   Fri Aug 12 11:44:33 2011 -0400

    Bug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct language directory.
    
    xmlControlfield.js was always fetching the "en" xml file, preventing the translations
    from working.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6715
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - Apply patch
    - Install language files, example: perl translate install de-DE
    - Edit .xml files for value builders 006 and 008
    - Test by creating a new record and using value builders
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 390d1d5be6e59990bee85ed6e44f117a8cd19c54)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 3e24de6743b8a679120d8a6f3e6d9a4b75b2ffb5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Aug 28 19:47:22 2011 +1200

    Updating about page and history
    (cherry picked from commit 61758c8bcbd6d8c2a03e39ca196e944470520c97)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ad588f2d30ef706aceb6a5cb86733da8089ca52c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Aug 11 15:21:35 2011 -0400

    Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    To test:
    1) Make sure syspref memberofinstitution is turned on
    2) Add a new patron of organisation category (example: library)
    3) Check that there is no field set 'organisation' showing up
    4) Checkout books to any borrower
    5) Renew books until no longer possible
    6) Scan barcode from renewed book to force renewal
    6) Check that the 'no more renewals' message has no empty pull below text message
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit bd744e6f2af85110cefa8d9e613393a0a517185b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 95e47cd9490f3471cc5f90039fa90910684107ef
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Aug 10 11:44:37 2011 -0400

    Fix for Bug 6696, New category button broken when no categories defined
    
    The javascript tablesorter will trigger an error if we try
    to apply it to a table with no <tbody>. That error prevented
    the YUI button script to complete properly, hence the broken
    button.
    
    This patch hides the table in cases where there are no
    categories and displays an error message instead.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - Deleted all patron categories and checked button was broken
    - Applied patch and checked again - button shows up
    - Nice: There is a note now that you have to create categories
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a94a9f745556d42e5018695dbaa70a72129cc993)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c03df35867e6df5d2ce45d6423434c6fceddd079
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 1 07:51:18 2011 -0400

    Fix for Bug 6652, Zip showing in funny place on libraries admin
    
    This fixes display of Zip code relative to the city and state if
    you're in the USA and you like to do it this way. At the very
    least this matches how we display addresses elsewhere in Koha.
    
    It should be noted that this makes it incorrect for anyone who
    wants to see addresses like this:
    
    [name]
    [street address]
    [postal code + city]
    
    ...or any other variation of course.
    
    While I'm in there, also making branch URLs and emails clickable.
    
    Signed-off-by: Nicole Engard <nengard at gmail.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 3731ec80fc407ba4668450b48c9c81b8c0a98460)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 85f5f84f0161e2ee57e8302215580a3e747b0ddc
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 15:14:48 2011 -0400

    Fix for Bug 6791 - editing list with apostrophe loses text
    
    Markup used single quotes around value attribute. Since single
    quotes aren't escaped by the template's HTML filter these
    quotes conflicted with the one in the text.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit e73965c62f3895d5bdf5ad0a52c89e54e248f8f1)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e934c2fb99d482456ae9cb6421046037f345cefe
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Fri Aug 26 17:14:25 2011 +0100

    Bug 6733 - Change return page after printing routing slip
    
    Previously printing a routing slip returned the user to
    the top level in serials this change maintains the context
    in the current subscription
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 99b51e03183ec79f6ce46834207511702c2599d6)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2346f0e97a4ff5d8062e1c6f09f94512dee84847
Author: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
Date:   Fri Jul 29 16:35:40 2011 +0200

    Bug 6765: sip2 unicode checksum
    
    Changes checksum calculation method, as per Dan Scott's fix in openncip.
    see http://sourceforge.net/tracker/?func=detail&aid=2925760&group_id=161781&atid=821216
    
    http://bugs.koha-community.org/show_bug.cgi?id=6765
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 8a7c9167660493bc1a01a93dddba37a1a3683bc0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 86b844adf21e49fa8779211b149de0390cf4d072
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 22 11:08:59 2011 -0400

    Fix for Bug 4419 - cannot change module for notice templates
    
    Adding a hidden form field to contain the original module
    so that it can be used in the check for an existing entry.
    
    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 eb7456c685db962f0c1c3d1d88421711a7ec4a7d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f7622034a9ec700de0f2da0a7524df7583693853
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sat Aug 20 19:33:18 2011 -0400

    Bug 6662: Remove Dewey Specific References in Sort
    
    The sort option used to include tooltips for call number
    that were Dewey specific.   This patch removes references
    to Fiction and Nonfiction so that it can apply to any
    classification.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 57a0fcb475ff7e353329ba9a7e5963a22351b4c9)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 4849fa64f5278b305f5334e600ff05448e2f2e09
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 22 14:02:03 2011 +0200

    6747 Checks in opac-export
    
    Added check on returned marc. If record does not exist, generate 404. (Prevents 500 errors by Googlebot on deleted records.)
    Fixed typo, whitespace. Removed if on op=export. Added check on format.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 223156ea74233122c35d16100724eddbcd69d66a)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit de601feb6ba95de66bff008e6e00d24b367f23d6
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Fri Sep 2 15:07:38 2011 -0400

    Updating Version Number to 3.04.04.001

commit 3bfed2b838893dbca336a042405a77eb93b21100
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Aug 25 15:21:01 2011 +1200

    Bug 5866 : Updated patch to speed up holds awaiting pickup
    
    This reduced execution time on the report from timeout (1400 holds waiting + 200 holds over) to 6 or so seconds, with 1566 holds over (test data, no holds waiting).
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d879db93bd81a9f0a54fdf1d56a76f451a22795e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 19 10:23:58 2011 -0400

    Follow-up fix for Bug 6753, Markup corrections and improvements for label export window
    
    Making the same changes to the patron card export window.
    Now that all references are removed, the old icons and CSS
    have been removed as well.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    (cherry picked from commit 63d300191efb3207b7ebb95b98db0d86ca371f16)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d4ade6fcb20b07c0da38b9d4067ba9ed6b0cfea8
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Aug 24 09:50:19 2011 -0400

    Follow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
    
    Corresponding fix for the OPAC
    
    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 666a2316d8adbd8fadba263c42dba71fe992532c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 80ffc7e53cc7262a1b0502f689af0fe43d3123ba
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Aug 26 13:00:54 2011 +1200

    Fixing typo in history doc
    (cherry picked from commit 9c346e25269ada0b3fa5f5a6934986970c6b9a9f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b4ad543173782db98443b03e3ed099859c99e02a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Aug 26 12:49:50 2011 +1200

    150th developer!!!
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 21c4438cceeb490a1bd46ddf11ed9df3fe330fd8
Author: Ward van Wanrooij <wvanwanrooij at nextfactory.nl>
Date:   Mon Aug 15 14:38:40 2011 +0200

    Bug 6723 : import-framework-crlf
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    (cherry picked from commit 07838bfcb16bf329bbc4953dff5b624005a8a734)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 5f5a782666dd2005e8cb7ee679eda281e807df18
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Mon Jul 4 16:20:59 2011 +0100

    Bug 6562: Silence runtime error in reserve/request.pl
    
    Not defining action just causes logging of noisy
    runtime warnings.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit bb251a484fb9acbce9b162213278d7f5a49fa269)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0dfdb05c8892f070da27a94f15fad47d24c26e2a
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Tue Jun 28 15:24:45 2011 -0400

    bug 6538 update letter.pl help file
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 13fd914b086d32c69c190a6fa0279fc2b2054780)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 1cc389269cf536c9ca580199c1dc1f878b4af555
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Aug 10 11:16:42 2011 -0400

    Fix for Bug 6695 - Layout of patron category add/edit form slightly broken
    
    The markup for the fields for enrollment period "in months" and "until date"
    was non-standard I think because the two fields are supposed to be visually
    and functionally linked (having the same purpose and being mutually
    exclusive).
    
    This patch changes the markup so that the two fields share a fieldset
    having "choose one" as the legend. The "hint" is now hidden unless
    it is triggered by the javascript validation on submit.
    
    I wanted to trigger the validation of the two fields onblur instead
    of just onsubmit, but found that the datepicker widget doesn't
    consistently trigger a change or a blur event on that field.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - Layout problems are fixed
    - Layout is more clear about choosing either 'In months' or 'Until date'
    - Clear error message shows when you enter values in both fields
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 54e0667b23466043de2ddd73b0b0e37f9632ea06)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 503bed73705c124c76b66de0539bb1608b94bb48
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 15 15:22:21 2011 -0400

    Follow-up to Bug 4868, Improve controls for cloning and deleting subfields
    
    - Adding similar icons for cloning and deleting tags
    - Adding icon for the "Tag editor" links ("...")
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    (cherry picked from commit 7b2cd8e636a5b2eda0c405c2198eb09c2c35e22c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 09010c20383fc1f592d0376559765024b302ebac
Author: Salvador Zaragoza Rubio <salvazm at masmedios.com>
Date:   Fri Aug 19 12:33:05 2011 +0200

    Bug 6727 - Change on exporting and importing csv to deal with spurious CR/LF
    
    Function _export_table_csv modified to remove CR/LF in the data
    from the database to built a correct csv file.
    
    Function _import_table_csv modified to deal with CR/LF in the data
    field. When a line is found with an unproper end (a data field has not
    end quote), it's concatenated to a temporary buffer until the next
    line ends ok and then it's proccessed.
    
    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 6b69260fbd75f80b1831341b9bb5b18b54fef56b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f1e7a9f019cb82c555711129b63b06282f0b397d
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 19 14:40:48 2011 -0400

    Follow-up fix for Bug 5498, Standardize markup and style of pagination menus
    
    Missed a couple of instances of the pagination menu on the
    lists page. Previously the pagination links on the page
    listing lists (/cgi-bin/koha/virtualshelves/shelves.pl) was
    unstyled. After this patch the links should be styled.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7f884128f67125c542daae77b32108e6cf14a5a5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d729e75b0d1c21178fe988cc1b66b567ff45dd1b
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Jul 18 15:38:13 2011 -0400

    Fix for Bug 6602 - Reports dictionary doesn't properly recognize text columns
    
    Reports dictionary won't let you set a comparison for MEDIUMTEXT columns. To
    test, choose a MEDIUMTEXT column like borrowers.surname in Step 3 of adding
    a new dictionary definition. Before the patch, in Step 4 you would not see
    any kind of form field for entering a comparison. After patching Step 4 will
    offer you a field labeled "Search string matches."
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Fixes described problem with mediumtext columns.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit df2a3a9a3cf138bc11e2a39b4aad591d17359830)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 862df3d8461a7a6455b606a7ee595334a93c59cf
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Mon Aug 15 09:00:07 2011 +0200

    Bug 6540 - Followup - koha-create would die without --configfile
    
    koha-create would fail to check that --configfile was set on the
    commandline, before either including it if it existed or dying if
    it did not. This patch should make sure the existence of a
    configfile is only tested if --config is set.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    
    This should apply against 3.4 and master.
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 31bb901e2b31748dd86e7da45672c42a5359c5a4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 85f4ca591ee6cd1d672e251dc416bc86a3e92142
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 16 08:38:21 2011 -0400

    Fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
    
    The SMS section of the template was commented out in the patch
    pushed for Bug 5889, 'Allow message names to be translatable'
    with the comment 'fixing columns overflow.' That seems to have been
    a cosmetic fix for what I can only imagine was a different bug?
    
    Also fixing a T:T variable scope error.
    
    After applying this patch the "SMS" column in the Patron messaging
    preferences should appear when the SMSSendDriver preference is not empty.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 3270d384c53c04eee44fa54ed065eebb0741df22)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 31b326c7507a1b0a6d475d3576ccc88af4c89efd
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Aug 17 16:04:55 2011 -0400

    Fix for Bug 6728, Table sorter for receiving acquisitions
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit cbdb5a823aa6387e77adb63e3ff389103ce8f603)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c587b2e8548578365c244ec699e4fe471a42ce4d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 22 14:05:05 2011 +1200

    Bug 6703 : Link to invoice broken
    (cherry picked from commit b78004c8e1e4c01ec44feede84bca58a9921664c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 807b5ef4c78179498096c2494797f0a57363a6a9
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Aug 18 16:25:32 2011 -0400

    Fix for Bug 6753, Markup corrections and improvements for label export window
    
    The most visible change in this patch is the conversion of image-only
    links to text links combined with icons. Other changes include
    markup corrections and standardization and language corrections.
    
    To test, go to Labels > Manage Batches. Select a batch and click
    'Export' to see the revised interface.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 77e1a62efa6814b1beaefd5f8dd99b31643182bc)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit bfed019c2006d8268a99c8bdfa9f3b5b288d7b00
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 19 14:38:37 2011 -0400

    Fix for Bug 6754, Improve breadcrumbs on lists pages
    
    Breadcrumb navigation on the lists pages should give the user links back to the
    category of list they're viewing, public or private.
    
    Patch changes this:
    
    Lists -> Contents of (Your list)
    
    To this:
    
    Lists -> Your lists -> Contents of (Your list)
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 02f1058a80c4bd4f28331ce389c71a32b3fe1294)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 624d79e99f9a29494a5c664343d1151f4c7cb81e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 2 15:23:00 2011 -0400

    Fix for Bug 6640, Locations not showing in circ reports
    
    An invalid template syntax for defining a variable's default
    value is found in the circ report template and several
    others:
    
    [% DEFAULT LibraryNameTitle="Koha Online" %]
    
    Based on the T:T docs this appears to be the correct way of defining
    a default value:
    
    [% LibraryNameTitle or "Koha Online" %]
    
    Reference:
    
    http://template-toolkit.org/docs/manual/Syntax.html#section_Implicit_Directives_GET_and_SET
    
    Signed-off-by: Nicole Engard <nengard at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 714c8b924ede922971086597e382364bf4d79312)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2912b144cd6703286e4c6d60d25b9d1606fc2b45
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Wed Aug 17 13:45:34 2011 -0300

    Bug 6744 - Acknowledge the actual es-ES translators
    
    es-ES translator credits are way outdated as of http://translate.koha-community.org/es/34
    
    Regards
    To+
    
    Signed-off-by: Federico Rinaudo <frinaudo at infocpt.com.ar>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit bc5aa5281d4bc29c8398d3411db4b03e1601ad4f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/ImportExportFramework.pm                        |   17 ++-
 C4/SIP/Sip/Checksum.pm                             |    4 +-
 C4/VirtualShelves/Page.pm                          |   18 ++-
 cataloguing/addbiblio.pl                           |   10 +-
 circ/waitingreserves.pl                            |    3 +-
 debian/scripts/koha-create                         |   11 +-
 docs/history.txt                                   |    7 +-
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |    6 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |   75 +++-------
 .../prog/en/includes/messaging-preference-form.inc |    6 +-
 .../intranet-tmpl/prog/en/includes/resort_form.inc |    8 +-
 .../intranet-tmpl/prog/en/js/xmlControlfield.js    |    6 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    8 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   13 ++-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |    2 +-
 .../prog/en/modules/admin/branches.tt              |   10 +-
 .../prog/en/modules/admin/categorie.tt             |   34 +++--
 .../prog/en/modules/admin/preferences.tt           |    6 +-
 .../prog/en/modules/admin/smart-rules.tt           |    4 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |    5 +-
 .../prog/en/modules/cataloguing/addbooks.tt        |    4 +-
 .../prog/en/modules/cataloguing/merge.tt           |   10 +-
 .../cataloguing/value_builder/marc21_field_006.tt  |    2 +-
 .../cataloguing/value_builder/marc21_field_008.tt  |    2 +-
 .../prog/en/modules/circ/circulation.tt            |    4 -
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    4 +-
 .../prog/en/modules/circ/reserveratios.tt          |    4 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    2 +-
 .../prog/en/modules/circ/selectbranchprinter.tt    |    8 +-
 .../prog/en/modules/help/tools/letter.tt           |  131 ++++++++++++----
 .../prog/en/modules/labels/label-print.tt          |  162 ++++++-------------
 .../prog/en/modules/members/member-flags.tt        |   10 +-
 .../prog/en/modules/members/memberentrygen.tt      |   20 ---
 .../prog/en/modules/patroncards/members-search.tt  |    2 +-
 .../prog/en/modules/patroncards/print.tt           |  144 +++++++-----------
 .../en/modules/reports/guided_reports_start.tt     |    4 +-
 .../prog/en/modules/reports/issues_stats.tt        |   10 +-
 .../prog/en/modules/reports/reserves_stats.tt      |   10 +-
 .../prog/en/modules/serials/routing-preview.tt     |    4 +-
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |    1 +
 .../prog/en/modules/virtualshelves/shelves.tt      |   15 +-
 koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif      |  Bin 1315 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/delete-tag.png    |  Bin 0 -> 244 bytes
 koha-tmpl/intranet-tmpl/prog/img/edit-tag.png      |  Bin 0 -> 264 bytes
 .../img}/famfamfam/silk/page_white_acrobat.png     |  Bin 591 -> 591 bytes
 .../prog/img}/famfamfam/silk/page_white_code.png   |  Bin 603 -> 603 bytes
 .../prog/img}/famfamfam/silk/page_white_excel.png  |  Bin 663 -> 663 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif      |  Bin 1239 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif |  Bin 434 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png    |  Bin 0 -> 244 bytes
 .../opac-tmpl/prog/en/includes/resort_form.inc     |    8 +-
 koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt       |    2 +-
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |    6 +-
 .../prog/en/modules/opac-readingrecord.tt          |    2 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt |    2 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    2 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt   |    2 +-
 .../opac-tmpl/prog/en/modules/opac-tags_subject.tt |    2 +-
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    2 +-
 kohaversion.pl                                     |    2 +-
 opac/opac-export.pl                                |  105 ++++++-------
 reports/dictionary.pl                              |    2 +-
 reserve/request.pl                                 |    1 +
 tools/letter.pl                                    |   18 ++-
 66 files changed, 472 insertions(+), 493 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/delete-tag.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/edit-tag.png
 copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_acrobat.png (100%)
 copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_code.png (100%)
 copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_excel.png (100%)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 21:35:40 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 19:35:40 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-40-gebd4f65
Message-ID: <E1QzZWe-0000AZ-6n@git.koha-community.org>

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  ebd4f65cd2e890aac461047b00d7c4aa57d6b06b (commit)
      from  5cc224c2b9c2e4e56743f47f01e7203129d98674 (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 ebd4f65cd2e890aac461047b00d7c4aa57d6b06b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 29 15:35:45 2011 +1200

    Bug 6656 : Fix for advanced search not respecting default sort order
    
    Rebase for 3.4.x
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 catalogue/search.pl |   10 +++++++---
 opac/opac-search.pl |   11 +++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  2 21:36:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 02 Sep 2011 19:36:44 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-41-g9a7346e
Message-ID: <E1QzZXg-0000Dt-6H@git.koha-community.org>

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  9a7346e96bcd022b5c0191307ce148506142a0b3 (commit)
      from  ebd4f65cd2e890aac461047b00d7c4aa57d6b06b (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 9a7346e96bcd022b5c0191307ce148506142a0b3
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Apr 28 15:21:04 2011 +1200

    Bug 6275 - allow automated backups for packages
    
    This causes backups for the last two days to be stored by default. The
    backups will go into /var/spool/koha.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 3e34c65f92e2695773238da3e3ddb54afc12a10c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 debian/koha-common.cron.daily   |    1 +
 debian/koha-common.install      |    1 +
 debian/scripts/koha-run-backups |   93 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 0 deletions(-)
 create mode 100755 debian/scripts/koha-run-backups


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep  3 10:44:40 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 03 Sep 2011 08:44:40 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6768
	created. v3.04.00-445-g7146449
Message-ID: <E1QzlqC-0008D3-ET@git.koha-community.org>

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, new/bug_6768 has been created
        at  7146449ace983a92221601057e04825b6403d698 (commit)

- Log -----------------------------------------------------------------
commit 7146449ace983a92221601057e04825b6403d698
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 23 14:52:37 2011 -0400

    Fix for Bug 6768, Two unused include files can be removed
    
    Removing error-top.inc and error-bottom.inc
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep  3 10:47:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 03 Sep 2011 08:47:44 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5028
	created. v3.04.00-446-gca16532
Message-ID: <E1QzltA-0008F6-GU@git.koha-community.org>

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, new/bug_5028 has been created
        at  ca16532ea8270b14178ab47cb26f48c53f64a20a (commit)

- Log -----------------------------------------------------------------
commit ca16532ea8270b14178ab47cb26f48c53f64a20a
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 23 14:57:02 2011 -0400

    Fix for Bug 5028 - Remove references to catmaintain.pl
    
    catmaintain.pl doesn't exist anymore. References to it in the
    templates should be removed.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep  3 10:48:21 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 03 Sep 2011 08:48:21 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-446-gca16532
Message-ID: <E1Qzltl-0008Fy-Ae@git.koha-community.org>

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  ca16532ea8270b14178ab47cb26f48c53f64a20a (commit)
       via  7146449ace983a92221601057e04825b6403d698 (commit)
      from  ca1906f9c6d584434825cc9891e816da014a8c4e (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/includes/error-bottom.inc              |   16 ---
 .../intranet-tmpl/prog/en/includes/error-top.inc   |   65 -----------
 .../prog/en/modules/catalogue/detail.tt            |    3 -
 .../prog/en/modules/maint/catmaintain.tt           |  122 --------------------
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    3 -
 5 files changed, 0 insertions(+), 209 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep  4 10:04:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 04 Sep 2011 08:04:57 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6121
	created. v3.04.00-448-gf6d3cb0
Message-ID: <E1R07hJ-0004is-J3@git.koha-community.org>

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, new/bug_6121 has been created
        at  f6d3cb05dde6f7e8e9f25a1c4c547e414bbf2d76 (commit)

- Log -----------------------------------------------------------------
commit f6d3cb05dde6f7e8e9f25a1c4c547e414bbf2d76
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Aug 10 13:46:18 2011 +0200

    Bug 6121: follow-up = using overloo instead of reserveloo
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit b2138a7ec64dead316286df4a822bf89d051f4cb
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date:   Tue Feb 8 17:58:54 2011 +0100

    Bug 6121: Holds awaiting pickup
    
    On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.
    
    BibLibre MT5647
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep  4 10:05:27 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 04 Sep 2011 08:05:27 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-448-gf6d3cb0
Message-ID: <E1R07hn-0004k5-Rc@git.koha-community.org>

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  f6d3cb05dde6f7e8e9f25a1c4c547e414bbf2d76 (commit)
       via  b2138a7ec64dead316286df4a822bf89d051f4cb (commit)
      from  ca16532ea8270b14178ab47cb26f48c53f64a20a (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 circ/waitingreserves.pl                            |    3 ++-
 .../prog/en/modules/circ/waitingreserves.tt        |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep  4 10:15:26 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 04 Sep 2011 08:15:26 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6722
	created. v3.04.00-449-ga57b692
Message-ID: <E1R07rS-0004wN-NP@git.koha-community.org>

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, new/bug_6722 has been created
        at  a57b692a60947569e57b26862c17d517bf461128 (commit)

- Log -----------------------------------------------------------------
commit a57b692a60947569e57b26862c17d517bf461128
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Jun 22 18:00:24 2011 +1200

    Bug 6722: [SIGNED-OFF] Cause build output to appear on the screen
    
    This allows the build information to not be suppressed when using
    build-git-snapshot. This makes seeing where problems are substantially
    easier.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep  4 10:15:39 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 04 Sep 2011 08:15:39 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-449-ga57b692
Message-ID: <E1R07rf-0004x9-56@git.koha-community.org>

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  a57b692a60947569e57b26862c17d517bf461128 (commit)
      from  f6d3cb05dde6f7e8e9f25a1c4c547e414bbf2d76 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/build-git-snapshot |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep  4 10:18:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 04 Sep 2011 08:18:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6516
	created. v3.04.00-450-g8d8d2e6
Message-ID: <E1R07uU-000505-3f@git.koha-community.org>

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, new/bug_6516 has been created
        at  8d8d2e6b441415724e667af95fefd9b0ea9c1bbc (commit)

- Log -----------------------------------------------------------------
commit 8d8d2e6b441415724e667af95fefd9b0ea9c1bbc
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Tue Aug 9 10:22:20 2011 +0200

    Bug 6516 - Make borrowernumber of staff user configurable in koha-create
    
    Sets the default borrowernumber of staff user to 1 and makes it possible
    to override this with ADMINUSER in /etc/koha/koha-sites.conf or with the
    --adminuser and -a command line options.
    
    Remember to update the wiki if this gets pushed!
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep  4 10:22:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 04 Sep 2011 08:22:50 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_4877
	created. v3.04.00-452-g6534b5c
Message-ID: <E1R07yc-00053T-LC@git.koha-community.org>

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, new/enh/bug_4877 has been created
        at  6534b5cf29ea044f405af976447fe67262780a0d (commit)

- Log -----------------------------------------------------------------
commit 6534b5cf29ea044f405af976447fe67262780a0d
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Mon Aug 29 12:24:45 2011 +1200

    Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 1c6cdaf162591892cc8a4318044482563fe47bdc
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Sun Aug 28 15:02:09 2011 +0200

    Bug 4877 [ENH] - Update man page for koha-create
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    (to be followed by another patch that I think helps too)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep  4 10:24:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 04 Sep 2011 08:24:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-452-g6534b5c
Message-ID: <E1R080b-00056n-FS@git.koha-community.org>

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  6534b5cf29ea044f405af976447fe67262780a0d (commit)
       via  1c6cdaf162591892cc8a4318044482563fe47bdc (commit)
       via  8d8d2e6b441415724e667af95fefd9b0ea9c1bbc (commit)
      from  a57b692a60947569e57b26862c17d517bf461128 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/scripts/koha-create   |   15 ++++-
 debian/scripts/koha-create.8 |  127 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 121 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep  4 10:49:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 04 Sep 2011 08:49:23 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-453-g9e93266
Message-ID: <E1R08OJ-0005YQ-Ua@git.koha-community.org>

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  9e9326671426dbd41384a70d7e59c27632c890a3 (commit)
      from  6534b5cf29ea044f405af976447fe67262780a0d (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 9e9326671426dbd41384a70d7e59c27632c890a3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Sep 4 20:49:09 2011 +1200

    Updating history and about file

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

Summary of changes:
 docs/history.txt                                 |    5 ++++-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    2 ++
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep  5 03:15:41 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 05 Sep 2011 01:15:41 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-58-ge8da692
Message-ID: <E1R0Nmm-0003to-Vl@git.koha-community.org>

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  e8da6929b668b786d3ddb099056f6da7bb5c3580 (commit)
       via  69e368bcd1a6d0fb6dfe3ba849fa792b5e5cef05 (commit)
       via  552a686e98b46d24f393a0dcd09e08e7f82dc091 (commit)
       via  dedc0e1e1c1e79d8e72f1c52d05979031b1acb3c (commit)
       via  c67a9cebc59174b9add834e853cbf6ffa5ff1047 (commit)
       via  224b2dd460eed0d0192ef929c27033f8078b0cf7 (commit)
       via  54f798a60ddc3a4e3810d9ec74702aa6c1e3b5aa (commit)
       via  c44fe3d1b81ec6a79deb6d1203586da719c35d57 (commit)
       via  9a0ad2fbd749cfdece88b6e2c8f472e5bf76ec61 (commit)
       via  a1b4cc61af7ab966de77d222c52fe5374dc7428a (commit)
       via  93a2047974b982555011138d85a24f5e658b0a10 (commit)
       via  af4fa67db0289e09e8420119f5ce860767ab5646 (commit)
       via  dde11c152132d49102bb27d7bd2c8a4778bc6595 (commit)
       via  17f4f401e7b04d0d0391cfaeca8d42fba0e8b973 (commit)
       via  b13253f1673b38de6f05ea2eda7a22a494516ba3 (commit)
       via  2c28ce57648063655b69a1dab9801c8e7212fbdc (commit)
       via  fb55aa8e0deb59390d0fda0c9619a0537151ba6b (commit)
      from  9a7346e96bcd022b5c0191307ce148506142a0b3 (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 e8da6929b668b786d3ddb099056f6da7bb5c3580
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Sep 4 20:49:09 2011 +1200

    Updating history and about file
    (cherry picked from commit 9e9326671426dbd41384a70d7e59c27632c890a3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 69e368bcd1a6d0fb6dfe3ba849fa792b5e5cef05
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Mon Aug 29 12:24:45 2011 +1200

    Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 6534b5cf29ea044f405af976447fe67262780a0d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 552a686e98b46d24f393a0dcd09e08e7f82dc091
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Sun Aug 28 15:02:09 2011 +0200

    Bug 4877 [ENH] - Update man page for koha-create
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    (to be followed by another patch that I think helps too)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1c6cdaf162591892cc8a4318044482563fe47bdc)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit dedc0e1e1c1e79d8e72f1c52d05979031b1acb3c
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Tue Aug 9 10:22:20 2011 +0200

    Bug 6516 - Make borrowernumber of staff user configurable in koha-create
    
    Sets the default borrowernumber of staff user to 1 and makes it possible
    to override this with ADMINUSER in /etc/koha/koha-sites.conf or with the
    --adminuser and -a command line options.
    
    Remember to update the wiki if this gets pushed!
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 8d8d2e6b441415724e667af95fefd9b0ea9c1bbc)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c67a9cebc59174b9add834e853cbf6ffa5ff1047
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Aug 10 13:46:18 2011 +0200

    Bug 6121: follow-up = using overloo instead of reserveloo
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f6d3cb05dde6f7e8e9f25a1c4c547e414bbf2d76)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 224b2dd460eed0d0192ef929c27033f8078b0cf7
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date:   Tue Feb 8 17:58:54 2011 +0100

    Bug 6121: Holds awaiting pickup
    
    On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.
    
    BibLibre MT5647
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit b2138a7ec64dead316286df4a822bf89d051f4cb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 54f798a60ddc3a4e3810d9ec74702aa6c1e3b5aa
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 23 14:57:02 2011 -0400

    Fix for Bug 5028 - Remove references to catmaintain.pl
    
    catmaintain.pl doesn't exist anymore. References to it in the
    templates should be removed.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit ca16532ea8270b14178ab47cb26f48c53f64a20a)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c44fe3d1b81ec6a79deb6d1203586da719c35d57
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 23 14:52:37 2011 -0400

    Fix for Bug 6768, Two unused include files can be removed
    
    Removing error-top.inc and error-bottom.inc
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7146449ace983a92221601057e04825b6403d698)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9a0ad2fbd749cfdece88b6e2c8f472e5bf76ec61
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Fri Sep 2 14:36:21 2011 +0200

    Bug 4966 - follow up - add xhtml closure for input tags
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit ca1906f9c6d584434825cc9891e816da014a8c4e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a1b4cc61af7ab966de77d222c52fe5374dc7428a
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 5 10:09:21 2011 -0400

    bug4966 - follow up to 4966 changes language from 'end' to 'finish'
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit bb958cc6135a3ab8e83068b67ac0da345d20a0a0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 93a2047974b982555011138d85a24f5e658b0a10
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Fri Aug 5 15:47:16 2011 +0200

    bug 4966: Add a button in parcel.pl for confirm end receiving
    
    Signed-off-by: Nicole Engard <nengard at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 955450dd1b64f37df01a6ef3bcdfaa1063b52ae8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit af4fa67db0289e09e8420119f5ce860767ab5646
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Jul 17 17:18:47 2011 +0200

    Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)
    
    Patch fixes some translation issues and address formatting for printed
    hold notices.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 6ba4419be0826f9535e92d1bbf3612f7bf0695b7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit dde11c152132d49102bb27d7bd2c8a4778bc6595
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Jul 17 16:20:00 2011 +0200

    Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
    
    Translates the purchase suggestion mails in sample_notices.sql from English to German.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit ba78d6a8503d9340797eeabf2f9655efaee6f993)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 17f4f401e7b04d0d0391cfaeca8d42fba0e8b973
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date:   Fri Sep 2 10:36:29 2011 +0200

    bug 6834 followup removing param_map
    
    param_map was still to be found in two files.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1ce78a0c225224a41638da15bbc9de31e08d2e85)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b13253f1673b38de6f05ea2eda7a22a494516ba3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Sep 2 15:31:28 2011 +1200

    Bug 6834 : Removing last of the $template->{param_map}
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 0dbad3efce01a4bf04e9a0e01fc04330c9d9aba1)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2c28ce57648063655b69a1dab9801c8e7212fbdc
Author: Fr?d?rick Capovilla <frederick.capovilla at sys-tech.net>
Date:   Tue Jun 7 14:03:08 2011 -0400

    Bug 6479 Converts all the serialseq variables to UTF-8.
    
    Corrects a problem when an UTF-8 character is used in the serial
    numbering formula. The encoding became incorrect when concatenating the
    number in the subscriptionhistory table.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    To reproduce:
    - Create subscription with numbering pattern N? {X}
    - Receive 2 or more issues
    - Check subscription summary page and manual history fields on the edit screen
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit acc684bc01fca37615009a778ba5927e40f52d29)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fb55aa8e0deb59390d0fda0c9619a0537151ba6b
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 22 16:09:05 2011 -0400

    Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
    
    Removing unused script.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f9413ca2d20199a366928926ad8321dde50d12c1)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 acqui/acqui-home.pl                                |    2 +-
 acqui/basket.pl                                    |    2 +-
 admin/aqbudgets.pl                                 |    4 +-
 admin/aqplan.pl                                    |    6 +-
 circ/waitingreserves.pl                            |    3 +-
 debian/scripts/koha-create                         |   15 +-
 debian/scripts/koha-create.8                       |  127 +++++++++--
 docs/history.txt                                   |    5 +-
 .../data/mysql/de-DE/mandatory/sample_notices.sql  |   10 +-
 .../prog/en/includes/error-bottom.inc              |   16 --
 .../intranet-tmpl/prog/en/includes/error-top.inc   |   65 ------
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    2 +
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    8 +
 .../prog/en/modules/catalogue/detail.tt            |    3 -
 .../prog/en/modules/circ/waitingreserves.tt        |    4 +-
 .../prog/en/modules/maint/catmaintain.tt           |  122 ----------
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    3 -
 misc/spellcheck_suggest/make_spellcheck_suggest.pl |  240 --------------------
 serials/serials-edit.pl                            |    5 +
 19 files changed, 156 insertions(+), 486 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tt
 delete mode 100755 misc/spellcheck_suggest/make_spellcheck_suggest.pl


hooks/post-receive
-- 
main Koha release repository

From suzanne.bellande at univ-lr.fr  Mon Sep  5 09:30:33 2011
From: suzanne.bellande at univ-lr.fr (Suzanne Bellande)
Date: Mon, 05 Sep 2011 09:30:33 +0200
Subject: [koha-commits] unsuscribed
Message-ID: <4E647A99.2010007@univ-lr.fr>

Please, I want to be unsuscribed.

-- 
Suzanne Bellande,
Biblioth?caire
Charg?e de mission r?informatisation
Coordinatrice UBIB pour l'ULR

Biblioth?que universitaire
Universit? de La Rochelle
2 parvis Fernand Braudel
17042 La Rochelle cedex 1
T?l. 05 46 45 68 92
Fax 05.46.50.59.92
http://www.univ-larochelle.fr/-Bibliotheque-.html




From gitmaster at git.koha-community.org  Tue Sep  6 22:40:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 06 Sep 2011 20:40:15 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6724
	created. v3.04.00-454-gf824121
Message-ID: <E1R12RL-0004CW-C8@git.koha-community.org>

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, new/bug_6724 has been created
        at  f824121bb136b08ae3308168a0deeb524518fdde (commit)

- Log -----------------------------------------------------------------
commit f824121bb136b08ae3308168a0deeb524518fdde
Author: Brett Wilkins <brett at catalyst.net.nz>
Date:   Mon Aug 29 16:47:48 2011 +1200

    bug 6724: enable decimals on values greater than 1
    
    Separating perl standard uses from koha uses
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  6 22:51:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 06 Sep 2011 20:51:48 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6732
	created. v3.04.00-456-ge71b4fa
Message-ID: <E1R12cW-0004K3-TZ@git.koha-community.org>

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, new/bug_6732 has been created
        at  e71b4faf789ab872d94c8f20c0c252b5550da2d0 (commit)

- Log -----------------------------------------------------------------
commit e71b4faf789ab872d94c8f20c0c252b5550da2d0
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 14:04:26 2011 +1200

    Bug 6732 : Showing the bibliographic title on the manual invoices line
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>

commit f09e8403119c08861ef1cec466447012b1b2775b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 7 08:49:31 2011 +1200

    Updating about file and history doc

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  6 22:53:21 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 06 Sep 2011 20:53:21 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-456-ge71b4fa
Message-ID: <E1R12e1-0004LE-Ll@git.koha-community.org>

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  e71b4faf789ab872d94c8f20c0c252b5550da2d0 (commit)
       via  f09e8403119c08861ef1cec466447012b1b2775b (commit)
       via  f824121bb136b08ae3308168a0deeb524518fdde (commit)
      from  9e9326671426dbd41384a70d7e59c27632c890a3 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 circ/reserveratios.pl                              |   11 +++++++----
 docs/history.txt                                   |    3 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    1 +
 .../prog/en/modules/members/boraccount.tt          |    2 +-
 members/boraccount.pl                              |    3 ---
 5 files changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  6 22:55:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 06 Sep 2011 20:55:48 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_5605
	created. v3.04.00-457-g4fdac18
Message-ID: <E1R12gO-0004Ne-P6@git.koha-community.org>

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, new/enh/bug_5605 has been created
        at  4fdac1806be3deab28e8685fc49916eb8744c269 (commit)

- Log -----------------------------------------------------------------
commit 4fdac1806be3deab28e8685fc49916eb8744c269
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Sun Jan 9 23:53:05 2011 +0000

    Bug 5605 SIP: Add Support for the Fee Paid Message
    
    Allow fee paid to be supported for those machines which handle it
    
    Development Sponsered by Halton Borough Council
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  6 23:01:29 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 06 Sep 2011 21:01:29 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6555
	created. v3.04.00-458-ge23608a
Message-ID: <E1R12lt-0004QF-OD@git.koha-community.org>

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, new/bug_6555 has been created
        at  e23608a1f90b7d25068870e82a19721fd70e60a5 (commit)

- Log -----------------------------------------------------------------
commit e23608a1f90b7d25068870e82a19721fd70e60a5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 11:27:40 2011 +1200

    Bug 6555 : only 10 lists show in the staff client
    
    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>

commit 6c0962f06b35d897fc0e1f2276182feeb3124c6f
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Sun Jan 9 23:53:05 2011 +0000

    Bug 5605 [ENH] SIP: Add Support for the Fee Paid Message
    
    Allow fee paid to be supported for those machines which handle it
    
    Development Sponsered by Halton Borough Council
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  6 23:08:11 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 06 Sep 2011 21:08:11 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6665
	created. v3.04.00-460-g34b553d
Message-ID: <E1R12sN-0004VM-R2@git.koha-community.org>

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, new/bug_6665 has been created
        at  34b553d03b96cb3c84ec978f6eea542f38f60de3 (commit)

- Log -----------------------------------------------------------------
commit 34b553d03b96cb3c84ec978f6eea542f38f60de3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 14:50:29 2011 +1200

    Follow up for 6665 : Fixing the hide_marc pref also
    
    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>

commit 4363ff6669c92d0fbbd891fa870bd2cb5e021e9e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 14:42:55 2011 +1200

    Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing
    
    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>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  6 23:08:29 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 06 Sep 2011 21:08:29 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-460-g34b553d
Message-ID: <E1R12sf-0004W7-Jm@git.koha-community.org>

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  34b553d03b96cb3c84ec978f6eea542f38f60de3 (commit)
       via  4363ff6669c92d0fbbd891fa870bd2cb5e021e9e (commit)
       via  e23608a1f90b7d25068870e82a19721fd70e60a5 (commit)
       via  6c0962f06b35d897fc0e1f2276182feeb3124c6f (commit)
      from  e71b4faf789ab872d94c8f20c0c252b5550da2d0 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/SIP/ILS.pm                                      |   14 +++--
 C4/SIP/ILS/Transaction/FeePayment.pm               |   52 +++++++++++++++++--
 C4/SIP/Sip/MsgType.pm                              |    8 ++--
 C4/VirtualShelves.pm                               |   10 +++-
 .../prog/en/modules/cataloguing/addbiblio.tt       |   12 ++--
 virtualshelves/addbybiblionumber.pl                |    4 +-
 6 files changed, 74 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  6 23:21:05 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 06 Sep 2011 21:21:05 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6537
	created. v3.04.00-462-gaa239bc
Message-ID: <E1R134r-0004s9-My@git.koha-community.org>

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, new/enh/bug_6537 has been created
        at  aa239bc430d04583f3197513e89c4a40886d0049 (commit)

- Log -----------------------------------------------------------------
commit aa239bc430d04583f3197513e89c4a40886d0049
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Aug 9 13:51:57 2011 +0200

    Bug 6537 [SIGNED-OFF] follow-up = removing non specific lines for french unimarc
    
    There were some lines in the specific french sysprefs that were not french/unimarc specific at all
    I've removed them, the file now only contains french & unimarc specific things
    
    I also have removed NoZebra as it's deprecated, so should not be here anymore
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 6bd38d3eabc79c68cb90193378c69825ddac2a43
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Wed Jun 15 08:38:40 2011 +0200

    Bug 6537 - squashed version of the previous 5 commits, signed-off
    
    Bug 6537 - Move installer/data/mysql/en/mandatory/sysprefs.sql to installer/data/mysql/sysprefs.sql
    
    Bug 6537 - Make the web installer use installer/data/mysql/sysprefs.sql
    
    Bug 6537 - New syspref files with only the prefs that differ from the default
    
    I have mostly deleted old syspref files and created new ones, with a new name,
    mainly in order to reduce the risk of merge conflicts if the old syspref files
    are changed before this patch is pushed, if it is pushed.
    
    See http://wiki.koha-community.org/wiki/Simplified_syspref_handling_RFC for
    a description of how the new files were created to reflect sysprefs that
    differ from the global default.
    
    .txt files have been moved to reflect the new names of the SQL files they are
    associated with.
    
    Bug 6537 - Remove syspref-related tests in xt/
    
    As far as I can see, the previous patches for this bug makes the syspref tests
    obsolete, and this patch removes them:
    
    xt/syspref.t
    xt/check_sysprefs.t
    
    Bug 6537 - Fix a problem in French syspref file
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  6 23:23:14 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 06 Sep 2011 21:23:14 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-462-gaa239bc
Message-ID: <E1R136w-0004u4-5i@git.koha-community.org>

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  aa239bc430d04583f3197513e89c4a40886d0049 (commit)
       via  6bd38d3eabc79c68cb90193378c69825ddac2a43 (commit)
      from  34b553d03b96cb3c84ec978f6eea542f38f60de3 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Installer.pm                                    |    3 +
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |  320 ----------
 .../mandatory/system_preferences.sql}              |   14 +-
 .../{sysprefs.txt => system_preferences.txt}       |    0
 installer/data/mysql/es-ES/mandatory/sysprefs.sql  |  319 ----------
 installer/data/mysql/es-ES/mandatory/sysprefs.txt  |    1 -
 .../mandatory/system_preferences.sql}              |   14 +-
 .../mandatory/system_preferences.txt}              |    0
 .../unimarc_standard_system_preferences.sql        |   26 +
 ...txt => unimarc_standard_system_preferences.txt} |    0
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |  321 ----------
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |  307 ---------
 .../mysql/it-IT/necessari/system_preferences.sql   |   70 ++
 .../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql   |  326 ----------
 .../nb-NO/1-Obligatorisk/system_preferences.sql    |   29 +
 .../{sysprefs.txt => system_preferences.txt}       |    0
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |  318 ----------
 .../mandatory/system_preferences.sql}              |   14 +-
 .../{sysprefs.txt => system_preferences.txt}       |    0
 ...m_preferences_full_optimal_for_install_only.sql |  407 +-----------
 ...ystem_preferences_only_translation_updating.sql |  667 --------------------
 ...ystem_preferences_only_translation_updating.txt |    1 -
 .../data/mysql/{en/mandatory => }/sysprefs.sql     |    0
 ...m_preferences_full_optimal_for_install_only.sql |  410 +-----------
 ...ystem_preferences_only_translation_updating.sql |  667 --------------------
 ...ystem_preferences_only_translation_updating.txt |    1 -
 ...stem_preferences_optimal_values_insert_only.sql |    2 -
 xt/check_sysprefs.t                                |  131 ----
 xt/syspref.t                                       |  138 ----
 29 files changed, 208 insertions(+), 4298 deletions(-)
 delete mode 100755 installer/data/mysql/de-DE/mandatory/sysprefs.sql
 copy installer/data/mysql/{nb-NO/1-Obligatorisk/message_transport_types.sql => de-DE/mandatory/system_preferences.sql} (75%)
 rename installer/data/mysql/de-DE/mandatory/{sysprefs.txt => system_preferences.txt} (100%)
 delete mode 100755 installer/data/mysql/es-ES/mandatory/sysprefs.sql
 delete mode 100644 installer/data/mysql/es-ES/mandatory/sysprefs.txt
 copy installer/data/mysql/{nb-NO/1-Obligatorisk/message_transport_types.sql => es-ES/mandatory/system_preferences.sql} (75%)
 rename installer/data/mysql/{en/mandatory/sysprefs.txt => es-ES/mandatory/system_preferences.txt} (100%)
 create mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_system_preferences.sql
 rename installer/data/mysql/fr-FR/1-Obligatoire/{unimarc_standard_systemprefs.txt => unimarc_standard_system_preferences.txt} (100%)
 delete mode 100755 installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
 delete mode 100755 installer/data/mysql/it-IT/necessari/sysprefs.sql
 create mode 100644 installer/data/mysql/it-IT/necessari/system_preferences.sql
 delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
 create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
 rename installer/data/mysql/nb-NO/1-Obligatorisk/{sysprefs.txt => system_preferences.txt} (100%)
 delete mode 100755 installer/data/mysql/pl-PL/mandatory/sysprefs.sql
 copy installer/data/mysql/{nb-NO/1-Obligatorisk/message_transport_types.sql => pl-PL/mandatory/system_preferences.sql} (75%)
 rename installer/data/mysql/pl-PL/mandatory/{sysprefs.txt => system_preferences.txt} (100%)
 delete mode 100644 installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql
 delete mode 100644 installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.txt
 rename installer/data/mysql/{en/mandatory => }/sysprefs.sql (100%)
 delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql
 delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.txt
 delete mode 100755 xt/check_sysprefs.t
 delete mode 100755 xt/syspref.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  7 10:52:55 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 07 Sep 2011 08:52:55 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6256
	created. v3.04.00-463-g5d8b171
Message-ID: <E1R1DsN-0003rB-Ia@git.koha-community.org>

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, new/bug_6256 has been created
        at  5d8b1713da45ca82d67668a00bd345d9fcead717 (commit)

- Log -----------------------------------------------------------------
commit 5d8b1713da45ca82d67668a00bd345d9fcead717
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Sat Aug 27 21:19:55 2011 -0400

    Bug 6256: Many bib1 attributes missing
    
    This patch adds all the bib1 attributes listed in the bug report, in numerical order.  Names of attributes are
    normalized; spaces are replaced by '-', '--' is reduced to '-' and parentheticals are dropped
    
    In the particular case of att 1062, it is renamed from 'stocknumber' to 'Number-local-acquisition',
    as per the bib1 definition.  The mapping in ccl.properties is retained as 'stocknumber', so all search
    functions should continue to behave normally
    
    Signed-off-by: <dev_patches at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  7 10:53:27 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 07 Sep 2011 08:53:27 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-463-g5d8b171
Message-ID: <E1R1Dst-0003sk-JV@git.koha-community.org>

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  5d8b1713da45ca82d67668a00bd345d9fcead717 (commit)
      from  aa239bc430d04583f3197513e89c4a40886d0049 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 etc/zebradb/biblios/etc/bib1.att |   98 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 97 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  7 10:57:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 07 Sep 2011 08:57:13 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6693
	created. v3.04.00-464-g3675d62
Message-ID: <E1R1DwX-0003uP-7q@git.koha-community.org>

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, new/bug_6693 has been created
        at  3675d62668252aa8018552e8fe18e12bb2e25418 (commit)

- Log -----------------------------------------------------------------
commit 3675d62668252aa8018552e8fe18e12bb2e25418
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date:   Tue Aug 10 11:21:53 2010 +0200

    Bug 6693: [SIGNED-OFF] Typo fixes for German sample news
    
    Fixing some annoying typos in German sample news file.
    
    To test:
    Choose German sample news file on installation and check it works ok and news
    are visible in staff client.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  7 10:59:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 07 Sep 2011 08:59:52 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6750
	created. v3.04.00-464-gf64aaf0
Message-ID: <E1R1Dz6-0003vZ-7D@git.koha-community.org>

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, new/bug_6750 has been created
        at  f64aaf063ea39b70c6f128d74d296566a021d217 (commit)

- Log -----------------------------------------------------------------
commit f64aaf063ea39b70c6f128d74d296566a021d217
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Thu Sep 1 10:09:48 2011 +0200

    Bug 6750 Guarantor search broken on translated templates
    
    Fix the JavaScript to avoid implementing complex string substitution into JS
    function call. This patch solves the bug and keep the ability to copy
    borrower's address, name, etc., containing new line, simple quote, etc.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  7 11:01:35 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 07 Sep 2011 09:01:35 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-464-gf64aaf0
Message-ID: <E1R1E0k-0003wq-Vt@git.koha-community.org>

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  f64aaf063ea39b70c6f128d74d296566a021d217 (commit)
      from  5d8b1713da45ca82d67668a00bd345d9fcead717 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/members/guarantor_search.tt    |   38 ++++++++++++++++---
 1 files changed, 32 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  8 03:36:37 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 08 Sep 2011 01:36:37 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6256
	updated. v3.04.00-464-gfb781f2
Message-ID: <E1R1TXh-0003rJ-9b@git.koha-community.org>

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, new/bug_6256 has been updated
       via  fb781f2dcd12fe2cb7562f24ea287e5111493480 (commit)
      from  5d8b1713da45ca82d67668a00bd345d9fcead717 (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 fb781f2dcd12fe2cb7562f24ea287e5111493480
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Sep 7 14:28:45 2011 +0200

    6256 Follow up fixing typo
    
    Fixing typo for 1062
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 etc/zebradb/biblios/etc/bib1.att |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  8 03:40:20 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 08 Sep 2011 01:40:20 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6680
	created. v3.04.00-468-g46382a6
Message-ID: <E1R1TbI-0003sj-Mu@git.koha-community.org>

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, new/bug_6680 has been created
        at  46382a61562ed09a67a37f82d8ad5c12ba52e851 (commit)

- Log -----------------------------------------------------------------
commit 46382a61562ed09a67a37f82d8ad5c12ba52e851
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Wed Sep 7 11:48:01 2011 -0400

    Follow up to Bug 6680: tiny up download lists formats
    
    Explains what uses RIS, and replaces iso2709 with 'MARC'.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 963a018f3d8a6de3822167c531394236fe8571ec
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Sep 7 18:54:42 2011 +1200

    Bug 6680 - simple tidy-up of cart download format descriptions
    
    Explains what uses RIS, and replaces iso2709 with 'MARC'.
    
    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>

commit 073083ea5f76591e2ced0755b1631e8b6ddd9a35
Merge: f64aaf0 fb781f2
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Sep 8 13:36:51 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6256' into kcmaster

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  8 03:49:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 08 Sep 2011 01:49:23 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6687
	created. v3.04.00-467-g9905662
Message-ID: <E1R1Tk3-0003wE-Hn@git.koha-community.org>

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, new/bug_6687 has been created
        at  99056625b635f6f9557f9b53797bdc31cca226d8 (commit)

- Log -----------------------------------------------------------------
commit 99056625b635f6f9557f9b53797bdc31cca226d8
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Sep 7 13:45:58 2011 +1200

    Bug 6687 - allow people to be moved in the holds queue
    
    This fixes a regression introduced by Bug 6526 that told you someone
    already had a reserve if you attempted to move their ordering in the
    hold queue.
    
    (note: it also cleans a host of trailing whitespace errors that were in
    that file)
    
    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>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  8 03:49:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 08 Sep 2011 01:49:45 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-467-g9905662
Message-ID: <E1R1TkP-0003x4-4P@git.koha-community.org>

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  99056625b635f6f9557f9b53797bdc31cca226d8 (commit)
       via  073083ea5f76591e2ced0755b1631e8b6ddd9a35 (commit)
       via  fb781f2dcd12fe2cb7562f24ea287e5111493480 (commit)
      from  f64aaf063ea39b70c6f128d74d296566a021d217 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 etc/zebradb/biblios/etc/bib1.att |    2 +-
 reserve/request.pl               |  117 +++++++++++++++++++-------------------
 2 files changed, 59 insertions(+), 60 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 10 04:28:46 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 10 Sep 2011 02:28:46 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-68-g342d6aa
Message-ID: <E1R2DJG-0007IV-03@git.koha-community.org>

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  342d6aaecec84beb0ad1bd0b75714e29490b266d (commit)
       via  2e4b3f8c83fc95b4a8c203c03eddfbbdbbcab44b (commit)
       via  429322795df96a470b2e600fb4d0c81ca1491e3d (commit)
       via  fa1ed689e3a5ee06f23df1c339001254dcfeda92 (commit)
       via  d2ddf645f0d119d51b3d40ef7b5c78dd53856656 (commit)
       via  982c7dc49e5c3fba15eb19bf823047d4169a2def (commit)
       via  17bd8384e2bb1133997d638ac0be4360432d1623 (commit)
       via  d796b5ddee173d40da4cb33b4e1d7bc558c7684b (commit)
       via  70c249abb9330d2a359a6f4aed851263445f8250 (commit)
       via  a69acb3c798ae2d84ca96d5104c165e19de2d872 (commit)
      from  e8da6929b668b786d3ddb099056f6da7bb5c3580 (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 342d6aaecec84beb0ad1bd0b75714e29490b266d
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Sep 9 15:50:07 2011 +1200

    Bug 5602 - [3.4.x] Rewrite of package building script
    
    Note: this is pulling in the most recent version from master. Working
    with two different versions that have two different options was getting
    painful, and it doesn't touch anything outside of debian/
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2e4b3f8c83fc95b4a8c203c03eddfbbdbbcab44b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Sep 7 14:28:45 2011 +0200

    6256 Follow up fixing typo
    
    Fixing typo for 1062
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit fb781f2dcd12fe2cb7562f24ea287e5111493480)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 429322795df96a470b2e600fb4d0c81ca1491e3d
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Thu Sep 1 10:09:48 2011 +0200

    Bug 6750 Guarantor search broken on translated templates
    
    Fix the JavaScript to avoid implementing complex string substitution into JS
    function call. This patch solves the bug and keep the ability to copy
    borrower's address, name, etc., containing new line, simple quote, etc.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f64aaf063ea39b70c6f128d74d296566a021d217)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fa1ed689e3a5ee06f23df1c339001254dcfeda92
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Sat Aug 27 21:19:55 2011 -0400

    Bug 6256: Many bib1 attributes missing
    
    This patch adds all the bib1 attributes listed in the bug report, in numerical order.  Names of attributes are
    normalized; spaces are replaced by '-', '--' is reduced to '-' and parentheticals are dropped
    
    In the particular case of att 1062, it is renamed from 'stocknumber' to 'Number-local-acquisition',
    as per the bib1 definition.  The mapping in ccl.properties is retained as 'stocknumber', so all search
    functions should continue to behave normally
    
    Signed-off-by: <dev_patches at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 5d8b1713da45ca82d67668a00bd345d9fcead717)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d2ddf645f0d119d51b3d40ef7b5c78dd53856656
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 14:50:29 2011 +1200

    Follow up for 6665 : Fixing the hide_marc pref also
    
    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 34b553d03b96cb3c84ec978f6eea542f38f60de3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 982c7dc49e5c3fba15eb19bf823047d4169a2def
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 14:42:55 2011 +1200

    Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing
    
    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 4363ff6669c92d0fbbd891fa870bd2cb5e021e9e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 17bd8384e2bb1133997d638ac0be4360432d1623
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 11:27:40 2011 +1200

    Bug 6555 : only 10 lists show in the staff client
    
    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 e23608a1f90b7d25068870e82a19721fd70e60a5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d796b5ddee173d40da4cb33b4e1d7bc558c7684b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 14:04:26 2011 +1200

    Bug 6732 : Showing the bibliographic title on the manual invoices line
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    (cherry picked from commit e71b4faf789ab872d94c8f20c0c252b5550da2d0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 70c249abb9330d2a359a6f4aed851263445f8250
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 7 08:49:31 2011 +1200

    Updating about file and history doc
    (cherry picked from commit f09e8403119c08861ef1cec466447012b1b2775b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a69acb3c798ae2d84ca96d5104c165e19de2d872
Author: Brett Wilkins <brett at catalyst.net.nz>
Date:   Mon Aug 29 16:47:48 2011 +1200

    bug 6724: enable decimals on values greater than 1
    
    Separating perl standard uses from koha uses
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f824121bb136b08ae3308168a0deeb524518fdde)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/VirtualShelves.pm                               |   10 +-
 circ/reserveratios.pl                              |   11 +-
 debian/README.build                                |   13 ++
 debian/build-git-snapshot                          |  180 +++++++++++++++-----
 docs/history.txt                                   |    3 +-
 etc/zebradb/biblios/etc/bib1.att                   |   98 +++++++++++-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    1 +
 .../prog/en/modules/cataloguing/addbiblio.tt       |   12 +-
 .../prog/en/modules/members/boraccount.tt          |    2 +-
 .../prog/en/modules/members/guarantor_search.tt    |   38 ++++-
 members/boraccount.pl                              |    3 -
 virtualshelves/addbybiblionumber.pl                |    4 +-
 12 files changed, 302 insertions(+), 73 deletions(-)
 create mode 100644 debian/README.build


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 10 11:33:32 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 10 Sep 2011 09:33:32 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6165
	created. v3.04.00-468-gba2c61b
Message-ID: <E1R2JwK-0001g1-Hr@git.koha-community.org>

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, new/enh/bug_6165 has been created
        at  ba2c61b1b6bed78958e96e2488c689421f60bd29 (commit)

- Log -----------------------------------------------------------------
commit ba2c61b1b6bed78958e96e2488c689421f60bd29
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Sep 8 17:15:39 2011 -0400

    Enh 6165: Add OPACResultsSidebar system preference
    
    Adds a system preference for displaying content under the "Refine your Search" menu
    on OPAC search results.  Arbitrary HTML can be added, like OpacNav, opacheader, opaccredits
    and other such system preferences
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 10 11:36:08 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 10 Sep 2011 09:36:08 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-469-g13db3b6
Message-ID: <E1R2Jyq-0001hc-5Y@git.koha-community.org>

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  13db3b62a01312890ae19b27cde26a4165b21388 (commit)
       via  ba2c61b1b6bed78958e96e2488c689421f60bd29 (commit)
      from  99056625b635f6f9557f9b53797bdc31cca226d8 (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 13db3b62a01312890ae19b27cde26a4165b21388
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Sep 10 21:35:49 2011 +1200

    Bumpding database version

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

Summary of changes:
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 +++++++
 .../prog/en/modules/admin/preferences/opac.pref    |    5 +++++
 .../opac-tmpl/prog/en/includes/opac-facets.inc     |    5 +++++
 kohaversion.pl                                     |    2 +-
 opac/opac-search.pl                                |    1 +
 6 files changed, 20 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 10 11:38:16 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 10 Sep 2011 09:38:16 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6860
	created. v3.04.00-470-g156a849
Message-ID: <E1R2K0u-0001ij-2B@git.koha-community.org>

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, new/bug_6860 has been created
        at  156a849aa3759f377af07d4cdc7a6f58e58c18f4 (commit)

- Log -----------------------------------------------------------------
commit 156a849aa3759f377af07d4cdc7a6f58e58c18f4
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Sep 9 06:34:56 2011 -0400

    Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
    
    SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working.
    
    This patch fixes not only search results and shelf browsers, but also rarely-used parts of
    opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 10 11:39:35 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 10 Sep 2011 09:39:35 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6863
	created. v3.04.00-470-gb49534e
Message-ID: <E1R2K2B-0001kG-0j@git.koha-community.org>

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, new/bug_6863 has been created
        at  b49534ebdc11c36844c87d9588fc4e420509b77e (commit)

- Log -----------------------------------------------------------------
commit b49534ebdc11c36844c87d9588fc4e420509b77e
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Sep 9 14:37:22 2011 -0400

    Bug 6863: Shelf Browser images not showing up
    
    Fixes case for Syndetics (test condition was scoped wrong, leading to "no image available")
    as well as Baker and Taylor (bad scope and capitalization on BakerTaylorImageURL).
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 10 11:40:16 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 10 Sep 2011 09:40:16 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-472-gbf2ba7a
Message-ID: <E1R2K2q-0001la-GX@git.koha-community.org>

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  bf2ba7a764e294b1c33a32ed763d4a72394d4ed4 (commit)
       via  b49534ebdc11c36844c87d9588fc4e420509b77e (commit)
       via  156a849aa3759f377af07d4cdc7a6f58e58c18f4 (commit)
      from  13db3b62a01312890ae19b27cde26a4165b21388 (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 bf2ba7a764e294b1c33a32ed763d4a72394d4ed4
Merge: 156a849 b49534e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Sep 10 21:40:09 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6863' into kcmaster

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

Summary of changes:
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   24 ++++++++++----------
 .../opac-tmpl/prog/en/modules/opac-opensearch.tt   |    4 +-
 .../prog/en/modules/opac-readingrecord.tt          |    4 +-
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    4 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    4 +-
 .../prog/en/modules/opac-showreviews-rss.tt        |    4 +-
 .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    8 +++---
 8 files changed, 28 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 11 11:33:02 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 09:33:02 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6861
	created. v3.04.00-473-gc183981
Message-ID: <E1R2gPO-0003WS-Iq@git.koha-community.org>

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, new/bug_6861 has been created
        at  c183981770dbc38c262f2768bbd2683c1c4cb859 (commit)

- Log -----------------------------------------------------------------
commit c183981770dbc38c262f2768bbd2683c1c4cb859
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Sep 9 06:55:59 2011 -0400

    Bug 6861: Fast Add returns to circ/circulation.pl in all cases
    
    If Fast Add is accessed from either the circulation homepage or cataloguing,
    it should stay on the additem.pl page after saving the first item.  Only when
    a Fast Add is done in the middle of a circulation transaction should it redirect
    back to circ/circulation.pl to complete that transaction.
    
    This patch adds a conditional check for a borrowernumber input param; the presense
    of such implies we're in the middle of a checkout.  It's absense implies we should
    remain on additem.pl
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 11 11:34:03 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 09:34:03 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-473-gc183981
Message-ID: <E1R2gQN-0003XQ-EV@git.koha-community.org>

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  c183981770dbc38c262f2768bbd2683c1c4cb859 (commit)
      from  bf2ba7a764e294b1c33a32ed763d4a72394d4ed4 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 cataloguing/additem.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 11 11:36:43 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 09:36:43 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6857
	created. v3.04.00-475-ga9eb0c6
Message-ID: <E1R2gSx-0003aU-EY@git.koha-community.org>

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, new/enh/bug_6857 has been created
        at  a9eb0c658a426a602afc3168e515412cfc7390f2 (commit)

- Log -----------------------------------------------------------------
commit a9eb0c658a426a602afc3168e515412cfc7390f2
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Thu Sep 8 14:30:32 2011 -0400

    Follow up to Bug 6857: Change language from 'reserve' to 'hold'
    
    Reserves are called holds all throughout the OPAC so this follow up
    updates the language in this patch to match the standard.
    
    Also adds an id tag to the message for altering with JQuery.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 4c1d203980af0e1d5495e68df11de9d89018c06d
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Sep 8 18:29:24 2011 +1200

    Bug 6857: display a charge warning alert for reserves
    
    If a user is placing a reserve on the OPAC, this'll let them know that
    it's going to cost them.
    
    Author: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 11 11:37:42 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 09:37:42 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-475-ga9eb0c6
Message-ID: <E1R2gTu-0003cS-Q8@git.koha-community.org>

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  a9eb0c658a426a602afc3168e515412cfc7390f2 (commit)
       via  4c1d203980af0e1d5495e68df11de9d89018c06d (commit)
      from  c183981770dbc38c262f2768bbd2683c1c4cb859 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Members.pm                                      |    6 ++++--
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |    5 +++++
 opac/opac-reserve.pl                               |    4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 11 11:41:05 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 09:41:05 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6783
	created. v3.04.00-476-g073f4fa
Message-ID: <E1R2gXB-0003e0-NP@git.koha-community.org>

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, new/enh/bug_6783 has been created
        at  073f4fa7c36e1031ad0c7c9333ab051d8d9b0873 (commit)

- Log -----------------------------------------------------------------
commit 073f4fa7c36e1031ad0c7c9333ab051d8d9b0873
Author: Meenakshi.R <meenakshi.r at osslabs.biz>
Date:   Tue Sep 6 12:59:56 2011 +0530

    Bug id:6783 - Circulation restrictions dont work when other withdrawn reasons are used
    
    Circulation restrictions work only when withdrawn reason (value 1) is selected.
    If ones sets up other withdrawn reasons using authorized values, and selects
    one of them (e.g. value 2), circulation restrictions don't work. This changes
    fixes this problem.
    
    Signed-off-by: Amit Gupta <amit.gupta at osslabs.biz>
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 11 11:41:55 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 09:41:55 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-476-g073f4fa
Message-ID: <E1R2gXz-0003es-Lm@git.koha-community.org>

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  073f4fa7c36e1031ad0c7c9333ab051d8d9b0873 (commit)
      from  a9eb0c658a426a602afc3168e515412cfc7390f2 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 00:11:09 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 22:11:09 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6517
	created. v3.04.00-477-gb3b6278
Message-ID: <E1R2sF3-0001Tq-LX@git.koha-community.org>

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, new/bug_6517 has been created
        at  b3b6278e206be11ce3b5a8e271f7bccb70539ac5 (commit)

- Log -----------------------------------------------------------------
commit b3b6278e206be11ce3b5a8e271f7bccb70539ac5
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Thu Jun 30 08:47:35 2011 +0200

    Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
    
    The revised patch quotes the variable $mysqldb, as suggested by Fr?re
    S?bastien Marie.
    
    This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
    to any (gzip'ed) file produced by mysqldump works, by adding the name of the
    database to the end of the call to mysql, when the specified SQL file is
    loaded. Files produced with koha-dump-defaults should still work too.
    
    To test:
    - Apply the patch
    - Create a new package with build-git-snapshot
    - Install the package
    - Create an SQL file from an existing installation with mysqldump
    - gzip the SQL file
    - point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
    - create a new site with koha-create --create-db
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 00:14:32 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 22:14:32 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6716
	created. v3.04.00-478-g35e49bc
Message-ID: <E1R2sIJ-0001WF-Vl@git.koha-community.org>

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, new/enh/bug_6716 has been created
        at  35e49bcb8e171aba41f35d082ee69abbef4443f8 (commit)

- Log -----------------------------------------------------------------
commit 35e49bcb8e171aba41f35d082ee69abbef4443f8
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Wed Aug 10 18:06:51 2011 -0400

    Bug 6716 - Document Borrowers Table
    
    This is the first of many patches that will document the SQL structure
    in Koha. This patch adds comments to the borrowers table.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - dropped current database
    - recreated database using the webinstaller
    > borrowers table all ok
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 00:17:03 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 22:17:03 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6716
	updated. v3.04.00-479-g990e9db
Message-ID: <E1R2sKl-0001ZO-KX@git.koha-community.org>

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, new/enh/bug_6716 has been updated
       via  990e9dbd9dfcb00e10f8feb9272be93b57f5763e (commit)
      from  35e49bcb8e171aba41f35d082ee69abbef4443f8 (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 990e9dbd9dfcb00e10f8feb9272be93b57f5763e
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 12:55:51 2011 -0400

    Bug 6716 - MySQL definition for authorised values table
    
    This is one of many patches that will document the MySQL table
    structure for Koha. This patch adds comments to the
    authorised_values table.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Add comments to the SQL only, recreated table, works fine

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

Summary of changes:
 installer/data/mysql/kohastructure.sql |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 00:51:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 11 Sep 2011 22:51:54 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-477-gb3b6278
Message-ID: <E1R2ssU-0002Bu-TX@git.koha-community.org>

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  b3b6278e206be11ce3b5a8e271f7bccb70539ac5 (commit)
      from  073f4fa7c36e1031ad0c7c9333ab051d8d9b0873 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/scripts/koha-create |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 03:53:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 01:53:19 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6716
	updated. v3.04.00-480-g63d4de3
Message-ID: <E1R2vi2-0005HA-U3@git.koha-community.org>

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, new/enh/bug_6716 has been updated
       via  63d4de37c5d0ccc2d3f8e7a57de37d4030019272 (commit)
      from  990e9dbd9dfcb00e10f8feb9272be93b57f5763e (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 63d4de37c5d0ccc2d3f8e7a57de37d4030019272
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 13:20:05 2011 -0400

    Bug 6716 - MySQL Table Documentation - Biblio Table
    
    This patch documents the biblio table, with the exception of the
    seriestitle field which I could not find an example of.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 installer/data/mysql/kohastructure.sql |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 03:58:36 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 01:58:36 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-478-gd641725
Message-ID: <E1R2vnA-0005LE-Gp@git.koha-community.org>

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  d6417257fde4e22252c78f2def21091016db17f3 (commit)
      from  b3b6278e206be11ce3b5a8e271f7bccb70539ac5 (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 d6417257fde4e22252c78f2def21091016db17f3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 12 13:57:19 2011 +1200

    While testing the commits for 6716 I discovered a couple of missing
    drop tables, fixed now

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

Summary of changes:
 installer/data/mysql/kohastructure.sql |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 04:01:18 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 02:01:18 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6716
	updated. v3.04.00-483-ga7e1a37
Message-ID: <E1R2vpl-0005Ms-U5@git.koha-community.org>

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, new/enh/bug_6716 has been updated
       via  a7e1a37de077bf5cfd7bbb64264886c679bae260 (commit)
       via  37e8229661f3e9476120a296bfb1091a01f386f8 (commit)
       via  d6417257fde4e22252c78f2def21091016db17f3 (commit)
      from  63d4de37c5d0ccc2d3f8e7a57de37d4030019272 (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 a7e1a37de077bf5cfd7bbb64264886c679bae260
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 13:42:29 2011 -0400

    Bug 6716 - Deleted Borrowers MySQL
    
    Copied documentation from Borrowers to Deleted Borrowers table.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 37e8229661f3e9476120a296bfb1091a01f386f8
Merge: 63d4de3 d641725
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 12 13:58:53 2011 +1200

    Merge remote-tracking branch 'kc/master' into new/enh/bug_6716

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

Summary of changes:
 installer/data/mysql/kohastructure.sql |  137 ++++++++++++++++----------------
 1 files changed, 69 insertions(+), 68 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 04:53:41 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 02:53:41 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-479-g755390b
Message-ID: <E1R2weT-0006Mu-NP@git.koha-community.org>

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  755390b5f51c83874736ac44d864855168031c94 (commit)
      from  d6417257fde4e22252c78f2def21091016db17f3 (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 755390b5f51c83874736ac44d864855168031c94
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 12 14:53:21 2011 +1200

    Adding the 155th developer to the history

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

Summary of changes:
 docs/history.txt                                 |    3 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 22:36:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 20:36:52 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_3498
	created. v3.04.00-480-g05d9cb0
Message-ID: <E1R3DFM-0003BL-Bp@git.koha-community.org>

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, new/enh/bug_3498 has been created
        at  05d9cb044613237e7cca9c37a4db3610e89b9af7 (commit)

- Log -----------------------------------------------------------------
commit 05d9cb044613237e7cca9c37a4db3610e89b9af7
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Tue Aug 2 13:59:28 2011 +0100

    Bug 3498 Allow Partial Payment of Fines
    
    Allow partial payment of outstanding fines
    against either individual fine entries or as a lump payment
    
    Sponsered by East Brunswick Public Library, East Brunswick, NJ, USA
    
    NB: Adds a version of the include circ-menu.inc as circ-menu.tt
    this has the same functionality as the old include but does not
    require all the borrowers attributes to be passed as global
    scoped variables
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    
    Bug 3498 - Documentation update to explain what every button does.
    
    Help file updated to the following:
    Pay and Writeoff Fines
    
    Each line item can be paid in full, partially paid, or written off.
    Pay a fine in full
    
        Click "Pay" next to the fine you want to pay in full
        The full amount of the fine will be populated for you in the "Collect From Patron" box
        Click "Confirm"
        The fine will be removed from outstanding fines, and displayed as fully paid.
    
    Pay a partial fine
    
        Click "Pay" next to the fine you want to partially pay
        Enter the amount you are collecting from the patron in the "Collect From Patron" box
        Click "Confirm"
        The fine will be updated to show the original Amount, and the current Amount Outstanding
    
    Writeoff a single fine
    
        Click "Writeoff" next to the fine you wish to writeoff.
        The fine will be removed from outstanding fines, and displayed as fully paid.
    
    Pay an amount towards all fines
    
        Click the "Pay Amount" button
        Enter the amount you are collecting from the patron in "Collect from Patron." The sum of all fines is shown in "Total Amount Outstanding"
        Click "Confirm"
        The fine totals will be updated with the payment applied to oldest fines first.
    
    Writeoff All fines
    
        Click the "Writeoff All" button
        All fines will be removed from outstanding fines, and displayed as written off.
    
    Pay Selected fines
    
        Check the selection boxes next to the fines you wish to pay, click "Pay Selected"
        Enter an amount to pay towards the fines.
        Click "Confirm"
        The fine totals will be updated with the payment applied to the oldest selected fines first.
    
    Bug 3498 - adding parens to TT IF Statements for style
    
    pay.tt
    
    Bug 3498 - Add parens to TT IF statements for style
    
    paycollect.tt
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 22:41:11 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 20:41:11 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-480-g507c7f4
Message-ID: <E1R3DJX-0003Dj-A8@git.koha-community.org>

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  507c7f422485aaf7ae601b0a84bacdbaedac061c (commit)
      from  755390b5f51c83874736ac44d864855168031c94 (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 507c7f422485aaf7ae601b0a84bacdbaedac061c
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Tue Aug 2 13:59:28 2011 +0100

    Bug 3498 [ENH] Allow Partial Payment of Fines
    
    Allow partial payment of outstanding fines
    against either individual fine entries or as a lump payment
    
    Sponsered by East Brunswick Public Library, East Brunswick, NJ, USA
    
    NB: Adds a version of the include circ-menu.inc as circ-menu.tt
    this has the same functionality as the old include but does not
    require all the borrowers attributes to be passed as global
    scoped variables
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    
    Bug 3498 - Documentation update to explain what every button does.
    
    Help file updated to the following:
    Pay and Writeoff Fines
    
    Each line item can be paid in full, partially paid, or written off.
    Pay a fine in full
    
        Click "Pay" next to the fine you want to pay in full
        The full amount of the fine will be populated for you in the "Collect From Patron" box
        Click "Confirm"
        The fine will be removed from outstanding fines, and displayed as fully paid.
    
    Pay a partial fine
    
        Click "Pay" next to the fine you want to partially pay
        Enter the amount you are collecting from the patron in the "Collect From Patron" box
        Click "Confirm"
        The fine will be updated to show the original Amount, and the current Amount Outstanding
    
    Writeoff a single fine
    
        Click "Writeoff" next to the fine you wish to writeoff.
        The fine will be removed from outstanding fines, and displayed as fully paid.
    
    Pay an amount towards all fines
    
        Click the "Pay Amount" button
        Enter the amount you are collecting from the patron in "Collect from Patron." The sum of all fines is shown in "Total Amount Outstanding"
        Click "Confirm"
        The fine totals will be updated with the payment applied to oldest fines first.
    
    Writeoff All fines
    
        Click the "Writeoff All" button
        All fines will be removed from outstanding fines, and displayed as written off.
    
    Pay Selected fines
    
        Check the selection boxes next to the fines you wish to pay, click "Pay Selected"
        Enter an amount to pay towards the fines.
        Click "Confirm"
        The fine totals will be updated with the payment applied to the oldest selected fines first.
    
    Bug 3498 - adding parens to TT IF Statements for style
    
    pay.tt
    
    Bug 3498 - Add parens to TT IF statements for style
    
    paycollect.tt
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Accounts.pm                                     |  113 ++++++-
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |   73 ++++
 .../prog/en/modules/help/members/pay.tt            |   51 +++-
 .../intranet-tmpl/prog/en/modules/members/pay.tt   |  102 +++---
 .../prog/en/modules/members/paycollect.tt          |  227 ++++++++++++
 members/pay.pl                                     |  361 +++++++++++---------
 members/paycollect.pl                              |  171 +++++++++
 7 files changed, 878 insertions(+), 220 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
 create mode 100755 members/paycollect.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 22:55:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 20:55:22 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6716
	updated. v3.04.00-490-g91b5a09
Message-ID: <E1R3DXG-0003J9-HM@git.koha-community.org>

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, new/enh/bug_6716 has been updated
       via  91b5a09c6cef398d9ad39ca1ced7d6569a87456b (commit)
       via  522fecb6c562f0f85258745e5f3b774d7cbedd2a (commit)
       via  5c888890f4d51925874a5611477d38cab82af2a6 (commit)
       via  7420cb71867bb480f4776dede70ac822006af9cb (commit)
       via  0fbb15cf4689bc884225e5cfffdf92423beff45e (commit)
       via  8a8654ffef79f148fde79381cf09fe4e83e05825 (commit)
       via  508c46d1bcf1826a7252465b83f2f66eb9532f1b (commit)
      from  a7e1a37de077bf5cfd7bbb64264886c679bae260 (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 91b5a09c6cef398d9ad39ca1ced7d6569a87456b
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 17:42:41 2011 -0400

    Bug 6716 - Issues Table Documentation
    
    This patch documents the issues and old_issues tables.  Two fields in
    both tables are left undocumented - issuingbranch and return - because
    I was unable to determine what data should be stored in these fields,
    they are always NULL on my install. Feel free to edit with accurate
    information.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    
    Merge conflict fixed
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 522fecb6c562f0f85258745e5f3b774d7cbedd2a
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 17:34:29 2011 -0400

    Bug 6716 - Cities Table Documentation
    
    Docmenting the cities table.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 5c888890f4d51925874a5611477d38cab82af2a6
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 17:22:02 2011 -0400

    Bug 6716 - Borrower Attributes Tables
    
    This patch defines the borrower attributes tables (borrower_attributes
    and borrower_attribute_types).
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 7420cb71867bb480f4776dede70ac822006af9cb
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 14:47:34 2011 -0400

    Bug6716 - File Cleanup
    
    The file was missing the starting comments before a few tables,
    this patch adds those in for consistencies sake.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 0fbb15cf4689bc884225e5cfffdf92423beff45e
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 14:28:31 2011 -0400

    Bug 6716 Documenting two Branch Group tables
    
    This patch documents the branchcategories table and the
    branchrelations table. Both tables are used in the library/
    branch groups administration.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 8a8654ffef79f148fde79381cf09fe4e83e05825
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 14:08:00 2011 -0400

    Bug 6716 - Branch table documentation
    
    Documenting the branches table in Koha.  Two unused fields noted, please update
    if they are in fact used.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 508c46d1bcf1826a7252465b83f2f66eb9532f1b
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 13:49:11 2011 -0400

    Bug 6716 - Deleted Biblio Table
    
    This patch documents the deletedbiblio table, with the exception of the
    seriestitle field which I could not find an example of.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 installer/data/mysql/kohastructure.sql |  198 +++++++++++++++++++-------------
 1 files changed, 118 insertions(+), 80 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 23:08:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 21:08:19 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6716
	updated. v3.04.00-508-g6a6edfe
Message-ID: <E1R3Djn-0003OZ-SH@git.koha-community.org>

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, new/enh/bug_6716 has been updated
       via  6a6edfeec8c1bb3ad090be49dbb175b0d9cbd432 (commit)
       via  87f60acf9afdecc28603b0a53005230c35afeb89 (commit)
       via  5a2ec51e92657d162803e51957947e03a266c92e (commit)
       via  f869d8d489adb90b3dfd7babb8bbea932ae0dfe5 (commit)
       via  3b581039a90a5ddc8a6b34d36807a8eecf4db545 (commit)
       via  5d413a7a9b8a3873e85905d35388767d02e26e8a (commit)
       via  c590d8f882ac63edd9e441e0e1e9017dd62395d8 (commit)
       via  228703d482aea0ac69210036b84bbfe5edfd473b (commit)
       via  ce1f5d14d7eb1a7bc90b812840e2664bab5d6722 (commit)
       via  fb34448082e7393a2aeb292f921be48e3605ab62 (commit)
       via  dd61aaa1538de51580a50206a33b76f876eaf19f (commit)
       via  17c68507a461b6c650fd6d7c131ac86fdaa39473 (commit)
       via  6d4c8e117f4580a88b1a6fa733a89828475d3e1e (commit)
       via  5fb875127cfa97c33068d5794187eebdf2123d3b (commit)
       via  a10402086b573c6b00dcb02f9ef9e83faccdbf82 (commit)
       via  f52965559b581d0e435a59061441f11e8c495f42 (commit)
       via  24b3f36b5b13a219837b1205e2e092383c0d7a5f (commit)
       via  20c6bd0c4d3673297d765f75add8c6152bb4dae9 (commit)
      from  91b5a09c6cef398d9ad39ca1ced7d6569a87456b (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 6a6edfeec8c1bb3ad090be49dbb175b0d9cbd432
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Wed Sep 7 21:47:48 2011 -0400

    Bug 6716: Document suggestions DB table
    
    This patch documents the suggestions database table.  Several fields
    appear to be unused:
    
    * volumedesc
    * publicationyear
    * mailoverseeing
    
    They are left undocumented by this patch.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 87f60acf9afdecc28603b0a53005230c35afeb89
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sat Aug 27 01:43:10 2011 -0400

    Bug 6716 - Define reports_dictionary table
    
    This patch documents the reports_dictionary table.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 5a2ec51e92657d162803e51957947e03a266c92e
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sat Aug 27 01:08:25 2011 -0400

    Bug 6716 - Document holiday tables
    
    This patch documents the special_holidays and repeatable_holidays
    tables.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit f869d8d489adb90b3dfd7babb8bbea932ae0dfe5
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sat Aug 27 00:30:15 2011 -0400

    Bug 6716 - Document subscriptionroutinglist table
    
    This table holds information related to serials routing lists.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 3b581039a90a5ddc8a6b34d36807a8eecf4db545
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sat Aug 27 00:14:49 2011 -0400

    Bug 6716 - Documents the virtual shelves tables
    
    This patch documents the virtualshelfcontents and virtualshelves
    tables.  In the virtualshelfcontents table the 'flags' field has
    been left undocumented since there is no data stored in this
    field.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 5d413a7a9b8a3873e85905d35388767d02e26e8a
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 26 23:49:25 2011 -0400

    Bug 6716 - Document z3950servers table
    
    This patch documents the z3950servers table in Koha.  There are two
    fields marked as unused (icon and description) and two fields that
    were left undocumented because they contain data, but I am unsure
    of where the data is coming from (position and type). A follow up
    patch will be necessary to document these fields.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit c590d8f882ac63edd9e441e0e1e9017dd62395d8
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 26 23:23:09 2011 -0400

    Bug 6716 - Documentation for the messages table
    
    This documents the messages table which stores info about the
    circulation messages.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 228703d482aea0ac69210036b84bbfe5edfd473b
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 26 19:30:45 2011 -0400

    Bug 6716 - Documentation for the fieldmapping table
    
    This patch documents the fieldmapping table which contains the data
    associated with the Keyword to Marc Mapping administration area.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit ce1f5d14d7eb1a7bc90b812840e2664bab5d6722
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 26 19:23:12 2011 -0400

    Bug 6716 - Document the systempreferences table
    
    This patch defines the systempreferences table.  Some of the fields
    aren't actually used anymore with the new system preference editor,
    but have been documented anyway.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit fb34448082e7393a2aeb292f921be48e3605ab62
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 26 19:18:02 2011 -0400

    Bug 6716 - Document roadtype table
    
    This patch adds documentation to the roadtype table.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit dd61aaa1538de51580a50206a33b76f876eaf19f
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 26 19:15:00 2011 -0400

    Bug 6716 - Document reviews table
    
    This patch adds documentation to the reviews (or comments) table.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 17c68507a461b6c650fd6d7c131ac86fdaa39473
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 26 19:10:41 2011 -0400

    Bug 6716 - Definition for the overduerules table
    
    This patch defines the overduerules table which includes information
    from the Overdue Notice Status Triggers Tool.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 6d4c8e117f4580a88b1a6fa733a89828475d3e1e
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Aug 26 19:05:02 2011 -0400

    Bug 6716 - Document opac_news table
    
    Definiton for the opac_news table which stores date from the
    news tool in Koha.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 5fb875127cfa97c33068d5794187eebdf2123d3b
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 21 09:01:01 2011 -0400

    Bug 6716: Documentation for the letter table
    
    This patch documents the letter/notices table in Koha.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit a10402086b573c6b00dcb02f9ef9e83faccdbf82
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 21 08:55:33 2011 -0400

    Bug 6716: Documentation for the itemtypes table
    
    This patch defines the itemtypes table.  The definiton
    for the summary field is a bit of guess based on the
    description in the staff client, and might need some
    clarification.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit f52965559b581d0e435a59061441f11e8c495f42
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 21 08:47:05 2011 -0400

    Bug 6716: DB Documentation for the branchrelations table
    
    Documents the branchrelations table.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 24b3f36b5b13a219837b1205e2e092383c0d7a5f
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 21 08:44:29 2011 -0400

    Bug 6716 - Definition of the branchcategories table
    
    This patch adds field definitions to the branchcategories
    table.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 20c6bd0c4d3673297d765f75add8c6152bb4dae9
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Aug 14 18:35:02 2011 -0400

    Bug 6716 - Statistics Table Documentation
    
    This patch documents the statistics table. A few fields were left
    undocumented.
    
    'other' - unclear what this is used for
    'proccode' - unclear what the number entered in this field stands for
    'usercode' - always NULL on my system
    'associatedborrower' - always NULL on my system
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 installer/data/mysql/kohastructure.sql |  326 ++++++++++++++++----------------
 1 files changed, 163 insertions(+), 163 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 23:08:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 21:08:57 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-511-g35e3aa9
Message-ID: <E1R3DkP-0003Pt-El@git.koha-community.org>

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  35e3aa9a3758a62f00c430b017fa9ce90dc36def (commit)
       via  6a6edfeec8c1bb3ad090be49dbb175b0d9cbd432 (commit)
       via  87f60acf9afdecc28603b0a53005230c35afeb89 (commit)
       via  5a2ec51e92657d162803e51957947e03a266c92e (commit)
       via  f869d8d489adb90b3dfd7babb8bbea932ae0dfe5 (commit)
       via  3b581039a90a5ddc8a6b34d36807a8eecf4db545 (commit)
       via  5d413a7a9b8a3873e85905d35388767d02e26e8a (commit)
       via  c590d8f882ac63edd9e441e0e1e9017dd62395d8 (commit)
       via  228703d482aea0ac69210036b84bbfe5edfd473b (commit)
       via  ce1f5d14d7eb1a7bc90b812840e2664bab5d6722 (commit)
       via  fb34448082e7393a2aeb292f921be48e3605ab62 (commit)
       via  dd61aaa1538de51580a50206a33b76f876eaf19f (commit)
       via  17c68507a461b6c650fd6d7c131ac86fdaa39473 (commit)
       via  6d4c8e117f4580a88b1a6fa733a89828475d3e1e (commit)
       via  5fb875127cfa97c33068d5794187eebdf2123d3b (commit)
       via  a10402086b573c6b00dcb02f9ef9e83faccdbf82 (commit)
       via  f52965559b581d0e435a59061441f11e8c495f42 (commit)
       via  24b3f36b5b13a219837b1205e2e092383c0d7a5f (commit)
       via  20c6bd0c4d3673297d765f75add8c6152bb4dae9 (commit)
       via  91b5a09c6cef398d9ad39ca1ced7d6569a87456b (commit)
       via  522fecb6c562f0f85258745e5f3b774d7cbedd2a (commit)
       via  5c888890f4d51925874a5611477d38cab82af2a6 (commit)
       via  7420cb71867bb480f4776dede70ac822006af9cb (commit)
       via  0fbb15cf4689bc884225e5cfffdf92423beff45e (commit)
       via  8a8654ffef79f148fde79381cf09fe4e83e05825 (commit)
       via  508c46d1bcf1826a7252465b83f2f66eb9532f1b (commit)
       via  a7e1a37de077bf5cfd7bbb64264886c679bae260 (commit)
       via  37e8229661f3e9476120a296bfb1091a01f386f8 (commit)
       via  63d4de37c5d0ccc2d3f8e7a57de37d4030019272 (commit)
       via  990e9dbd9dfcb00e10f8feb9272be93b57f5763e (commit)
       via  35e49bcb8e171aba41f35d082ee69abbef4443f8 (commit)
      from  507c7f422485aaf7ae601b0a84bacdbaedac061c (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 35e3aa9a3758a62f00c430b017fa9ce90dc36def
Merge: 507c7f4 6a6edfe
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Sep 13 09:08:50 2011 +1200

    Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster

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

Summary of changes:
 installer/data/mysql/kohastructure.sql |  815 +++++++++++++++++---------------
 1 files changed, 426 insertions(+), 389 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 23:35:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 21:35:57 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6458
	updated. v3.04.00-494-g282a2d6
Message-ID: <E1R3EAX-0003gZ-Lt@git.koha-community.org>

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, new/bug_6458 has been updated
       via  282a2d60b830b22661cc0324a84b7c17b7b905d1 (commit)
       via  06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24 (commit)
       via  4530159ce13eb6ff823d6ef49ad847d92556f356 (commit)
       via  8f8fc1088a2c5b43ed03fb06c9c842b7c721a838 (commit)
       via  22804d6ff6fdc2105644f03d0edca1e4e17d4b72 (commit)
       via  6d6c9626274268e82d6fa433894f188b995c913b (commit)
       via  27c87aea11243e63c2600d71a154d425b3269c13 (commit)
       via  d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8 (commit)
       via  637953df93f7090de846e1f274a1e721687a9277 (commit)
       via  fb7b258ec2220fcf6a86d49132b0224175f0a344 (commit)
       via  1866c4939df4298d561bc9f5fe617644a9955371 (commit)
       via  1859858af62c6f9923d56b70b29c4c0a3a24f9e4 (commit)
       via  18844d6bf1f1c6cf93cbe833067fe747753856b9 (commit)
       via  75bfa2a56a857417cf99d605f0f903e14ec0f204 (commit)
       via  507c7f422485aaf7ae601b0a84bacdbaedac061c (commit)
       via  755390b5f51c83874736ac44d864855168031c94 (commit)
       via  d6417257fde4e22252c78f2def21091016db17f3 (commit)
       via  b3b6278e206be11ce3b5a8e271f7bccb70539ac5 (commit)
       via  073f4fa7c36e1031ad0c7c9333ab051d8d9b0873 (commit)
       via  a9eb0c658a426a602afc3168e515412cfc7390f2 (commit)
       via  4c1d203980af0e1d5495e68df11de9d89018c06d (commit)
       via  c183981770dbc38c262f2768bbd2683c1c4cb859 (commit)
       via  bf2ba7a764e294b1c33a32ed763d4a72394d4ed4 (commit)
       via  b49534ebdc11c36844c87d9588fc4e420509b77e (commit)
       via  156a849aa3759f377af07d4cdc7a6f58e58c18f4 (commit)
       via  13db3b62a01312890ae19b27cde26a4165b21388 (commit)
       via  ba2c61b1b6bed78958e96e2488c689421f60bd29 (commit)
       via  99056625b635f6f9557f9b53797bdc31cca226d8 (commit)
       via  073083ea5f76591e2ced0755b1631e8b6ddd9a35 (commit)
       via  fb781f2dcd12fe2cb7562f24ea287e5111493480 (commit)
       via  f64aaf063ea39b70c6f128d74d296566a021d217 (commit)
       via  5d8b1713da45ca82d67668a00bd345d9fcead717 (commit)
       via  aa239bc430d04583f3197513e89c4a40886d0049 (commit)
       via  6bd38d3eabc79c68cb90193378c69825ddac2a43 (commit)
       via  34b553d03b96cb3c84ec978f6eea542f38f60de3 (commit)
       via  4363ff6669c92d0fbbd891fa870bd2cb5e021e9e (commit)
       via  e23608a1f90b7d25068870e82a19721fd70e60a5 (commit)
       via  6c0962f06b35d897fc0e1f2276182feeb3124c6f (commit)
       via  e71b4faf789ab872d94c8f20c0c252b5550da2d0 (commit)
       via  f09e8403119c08861ef1cec466447012b1b2775b (commit)
       via  f824121bb136b08ae3308168a0deeb524518fdde (commit)
       via  9e9326671426dbd41384a70d7e59c27632c890a3 (commit)
       via  6534b5cf29ea044f405af976447fe67262780a0d (commit)
       via  1c6cdaf162591892cc8a4318044482563fe47bdc (commit)
       via  8d8d2e6b441415724e667af95fefd9b0ea9c1bbc (commit)
       via  a57b692a60947569e57b26862c17d517bf461128 (commit)
       via  f6d3cb05dde6f7e8e9f25a1c4c547e414bbf2d76 (commit)
       via  b2138a7ec64dead316286df4a822bf89d051f4cb (commit)
       via  ca16532ea8270b14178ab47cb26f48c53f64a20a (commit)
       via  7146449ace983a92221601057e04825b6403d698 (commit)
       via  ca1906f9c6d584434825cc9891e816da014a8c4e (commit)
       via  bb958cc6135a3ab8e83068b67ac0da345d20a0a0 (commit)
       via  955450dd1b64f37df01a6ef3bcdfaa1063b52ae8 (commit)
       via  6ba4419be0826f9535e92d1bbf3612f7bf0695b7 (commit)
       via  ba78d6a8503d9340797eeabf2f9655efaee6f993 (commit)
       via  1ce78a0c225224a41638da15bbc9de31e08d2e85 (commit)
       via  0dbad3efce01a4bf04e9a0e01fc04330c9d9aba1 (commit)
       via  afa94246d3d13993b7add9b34b40be977945f8fd (commit)
       via  acc684bc01fca37615009a778ba5927e40f52d29 (commit)
       via  f9413ca2d20199a366928926ad8321dde50d12c1 (commit)
       via  e8f654fcd206a98ad1a9222e17bffe2bdb32747d (commit)
       via  a2a9bc522035c17a24aa48badc5184b015197826 (commit)
       via  6be9d2b27dd47c859eb6ab0cfd873b2059206986 (commit)
       via  cb6c40faf78fa25b752c3c51abc98435e9afe4cb (commit)
       via  720e3012a87ca437c17e864f159138304ed0c006 (commit)
       via  5a2fc683d842ca964b42c8ae68b15aba2526ef30 (commit)
       via  6756581cf88bcbe40203722bb29aef6abe9283f6 (commit)
       via  e39de040206eae26e22d6375479b548017cb7217 (commit)
       via  ff4b179e14ab15bf5d20852a37e2b0a2dca45800 (commit)
       via  390d1d5be6e59990bee85ed6e44f117a8cd19c54 (commit)
       via  61758c8bcbd6d8c2a03e39ca196e944470520c97 (commit)
       via  55326fc407ff041ae8abfa54683efd08f8e16f3e (commit)
       via  383d0d3a2108a0ebb784937addc85e7a854ea247 (commit)
       via  bd744e6f2af85110cefa8d9e613393a0a517185b (commit)
       via  a94a9f745556d42e5018695dbaa70a72129cc993 (commit)
       via  3731ec80fc407ba4668450b48c9c81b8c0a98460 (commit)
       via  e73965c62f3895d5bdf5ad0a52c89e54e248f8f1 (commit)
       via  99b51e03183ec79f6ce46834207511702c2599d6 (commit)
       via  8a7c9167660493bc1a01a93dddba37a1a3683bc0 (commit)
       via  eb7456c685db962f0c1c3d1d88421711a7ec4a7d (commit)
       via  a7a4d39697bf52ad805fadd53d388b4530568774 (commit)
       via  57a0fcb475ff7e353329ba9a7e5963a22351b4c9 (commit)
       via  223156ea74233122c35d16100724eddbcd69d66a (commit)
       via  71925724963482c196608c016894300cdd7e0d6d (commit)
       via  f320582b2f0a13a1a604d353300cea3238ef72cd (commit)
       via  0cf959123edb87db184f6779766230f784dc52bd (commit)
       via  eac3046dd9ff107812a4b59ec8c98bede50a0132 (commit)
       via  63d300191efb3207b7ebb95b98db0d86ca371f16 (commit)
       via  589403d2e8e48d3a64352bc527fda742a8edbba2 (commit)
       via  1e395ff152f1c8801500e719e19b4761781e653f (commit)
       via  666a2316d8adbd8fadba263c42dba71fe992532c (commit)
       via  9c346e25269ada0b3fa5f5a6934986970c6b9a9f (commit)
       via  b6293a8e9a75135dc81f087660cf58675d61455a (commit)
       via  07838bfcb16bf329bbc4953dff5b624005a8a734 (commit)
       via  54d38461f043770e3a980b7ab40ce1d5705cfd38 (commit)
       via  bb251a484fb9acbce9b162213278d7f5a49fa269 (commit)
       via  13fd914b086d32c69c190a6fa0279fc2b2054780 (commit)
       via  54e0667b23466043de2ddd73b0b0e37f9632ea06 (commit)
       via  7b2cd8e636a5b2eda0c405c2198eb09c2c35e22c (commit)
       via  4e44667cd6737299a0fa524b4d84258dacd2c1c4 (commit)
       via  6b69260fbd75f80b1831341b9bb5b18b54fef56b (commit)
       via  97005758bb647c49462c9f203f48e94fab0bb308 (commit)
       via  7f884128f67125c542daae77b32108e6cf14a5a5 (commit)
       via  df2a3a9a3cf138bc11e2a39b4aad591d17359830 (commit)
       via  73081505f59f2d6ba256fcab1226e43c93d7ae92 (commit)
       via  75a4efa7042a8d15ba7832d67b8670282da3abbc (commit)
       via  31bb901e2b31748dd86e7da45672c42a5359c5a4 (commit)
       via  3270d384c53c04eee44fa54ed065eebb0741df22 (commit)
       via  cbdb5a823aa6387e77adb63e3ff389103ce8f603 (commit)
       via  b78004c8e1e4c01ec44feede84bca58a9921664c (commit)
       via  dff9277d3dcc68d8cbea74ede5b8c7e5c0b339b0 (commit)
       via  14a0c39e8439eeaa32d24deaa3d7b6601eff5570 (commit)
       via  142e75c94ade26000671d19bd7d729cec681ff8e (commit)
       via  77e1a62efa6814b1beaefd5f8dd99b31643182bc (commit)
       via  02f1058a80c4bd4f28331ce389c71a32b3fe1294 (commit)
       via  73992e2ff435e068f8766a3d06dc510ba66af4cc (commit)
       via  7cf4553db1a1150b9ea6a730945a0fe9c99f1127 (commit)
       via  f80185efc46b34952656e00e9c2a1054bd888f52 (commit)
       via  85e37cb4b5879b174759e955d37e1bfe832bc646 (commit)
       via  14102a66326d733967ad78251bcc27eabda94a58 (commit)
       via  80deb4081f30ceeee07bca8a586c92b918f04f55 (commit)
      from  a41100a44519373efafb5c9f3cdc5607657d651e (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 282a2d60b830b22661cc0324a84b7c17b7b905d1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Aug 25 00:40:56 2011 +0200

    Bug 6458: Incorrect translation processing / results
    
    Removed template toolkit directives from within HTML tags.
    
    Advanced Search > Scan Index > Search results
    
    Additional changes:
    - removes entry 'Series Title' from the index pull down as it was the same
      index as 'Series'
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Aug 25 00:09:11 2011 +0200

    Bug 6458: Incorrect translation processing / suggestion
    
    Removes template toolkit directives from within HTML tags.
    
    Acquisitions > Suggestions
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 4530159ce13eb6ff823d6ef49ad847d92556f356
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Aug 20 19:02:01 2011 +0200

    Bug 6458: Incorrect translation processing / sco-main.tt
    
    Patch removes templates directives from HTML tags in sco-main.tt
    
    Problems were related to buttons for renewing items.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Before
    opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222
    
    After, no errors
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 8f8fc1088a2c5b43ed03fb06c9c842b7c721a838
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Aug 24 20:49:23 2011 +0200

    Bug 6458: Incorrect translation processing / serials/...
    
    Fixes problems with template toolkit directives within HTML tags
    for the serials module.
    
    Serials > add/modify subsciption
    
    serial-issues-full.tt seems to be unused?
    I couldn't find the page in the serials module.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 22804d6ff6fdc2105644f03d0edca1e4e17d4b72
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Aug 24 19:43:58 2011 +0200

    Bug 6458: Incorrect translation processing - rotating_collections/...
    
    Patch removes templates directives from HTML tags in the
    rotating collections module.
    
    The module is currently not interated into Koha's staff interface.
    Fixing templats to make Jenkins happy.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 6d6c9626274268e82d6fa433894f188b995c913b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Aug 25 12:48:55 2011 -0400

    Bug 6458: Incorrect translation processing / opac-detail.tt
    
    Patch removes template directives from within HTML tags from OPAC detail view.
    
    Problems were related to the items tabs for holdings, subscriptions, and serial collection.
    
    Fixed the problem spotted by Fr?re S?bastien Marie - thx!
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 27c87aea11243e63c2600d71a154d425b3269c13
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Aug 23 00:06:00 2011 +0200

    Bug 6458: Incorrect translation processing / cataloguing/...
    
    Patch removes template directives from within HTML tags from
      - cataloging > new record
      - cataloging
      - UNIMARC plugin for 4XX
    
    There is one problem remaining in addbiblio:
    
    <option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
        [% frameworkcodeloo.frameworktext %]
    </option>
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 23:47:02 2011 +0200

    Bug 6458: Incorrect translation processing / acqui/...
    
    Patch removes template directives from within HTML tags from
    - acquisitions > new vendor / modify vendor / vendor details
    - acquisitions > late orders
    - acquisitons > vendor x > basket groups
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 637953df93f7090de846e1f274a1e721687a9277
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Aug 20 19:38:30 2011 +0200

    Bug 6458: Incorrect translation processing - masthead.inc
    
    Patch removes templates directives from HTML tags in masthead.inc
    
    Problem was related to library pull down shown when
    OpacAddMastheadLibraryPulldown is activated.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Before
    opac-tmpl/prog/en/includes/masthead.inc: 83
    
    After no errors
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit fb7b258ec2220fcf6a86d49132b0224175f0a344
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 23:25:37 2011 +0200

    Bug 6458: Incorrect translation processing / 3x reports/...
    
    Patch removes template directives from within HTML tags from
    - Reports > Guided Reports
    - Reports > Items with no checkouts
    - Reports > Patron statistics
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 1866c4939df4298d561bc9f5fe617644a9955371
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 23:16:12 2011 +0200

    Bug 6458: Incorrect translation processing / authorities.tt
    
    Patch removes template directives from within HTML tags from
    authorities > modify authority.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 1859858af62c6f9923d56b70b29c4c0a3a24f9e4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 23:00:18 2011 +0200

    Bug 6458: Incorrect translation processing / review.tt
    
    Patch removes template directives from within HTML tags from
    Tools > Tags.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 18844d6bf1f1c6cf93cbe833067fe747753856b9
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 22:46:28 2011 +0200

    Bug 6458: Incorrect translation processing / overdue.tt
    
    Patch removes template directives from within HTML tags from
    circulation > overdues.
    
    Problems were related to patron flags pull down and sort by loop for patron attributes.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 75bfa2a56a857417cf99d605f0f903e14ec0f204
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Aug 21 19:58:48 2011 +0200

    Bug 6458: Incorrect translation processing - doc-head-close/open.inc
    
    Patch removes templates directives from HTML tags in masthead.inc
    Fixes all 3 problems now.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Accounts.pm                                     |  113 ++-
 C4/Acquisition.pm                                  |  186 ++-
 C4/Auth.pm                                         |  127 +-
 C4/Auth_cas_servers.yaml.orig                      |   12 -
 C4/Auth_with_cas.pm                                |  181 +--
 C4/Circulation.pm                                  |    2 +-
 C4/ImportExportFramework.pm                        |   17 +-
 C4/Installer.pm                                    |    3 +
 C4/Members.pm                                      |    6 +-
 C4/SIP/ILS.pm                                      |   14 +-
 C4/SIP/ILS/Transaction/FeePayment.pm               |   52 +-
 C4/SIP/Sip/Checksum.pm                             |    4 +-
 C4/SIP/Sip/MsgType.pm                              |    8 +-
 C4/VirtualShelves.pm                               |   10 +-
 C4/VirtualShelves/Page.pm                          |   18 +-
 about.pl                                           |    5 +
 acqui/acqui-home.pl                                |    2 +-
 acqui/basket.pl                                    |    2 +-
 acqui/histsearch.pl                                |   44 +-
 admin/aqbudgets.pl                                 |    4 +-
 admin/aqplan.pl                                    |    6 +-
 catalogue/search.pl                                |    2 +-
 cataloguing/addbiblio.pl                           |   51 +-
 cataloguing/additem.pl                             |   34 +-
 circ/reserveratios.pl                              |   11 +-
 circ/waitingreserves.pl                            |    6 +-
 debian/build-git-snapshot                          |    9 +-
 debian/koha-common.install                         |    1 +
 debian/scripts/koha-create                         |   50 +-
 debian/scripts/koha-create.8                       |  127 ++-
 debian/scripts/koha-mysql                          |   40 +
 docs/CAS/CAS/README                                |    8 -
 docs/CAS/CASProxy/README                           |    9 -
 docs/CAS/CASProxy/examples/casSession.tmp          |  Bin 134 -> 0 bytes
 docs/CAS/CASProxy/examples/koha_webservice.pl      |   58 -
 docs/CAS/CASProxy/examples/proxy_cas.pl            |   91 -
 docs/CAS/CASProxy/examples/proxy_cas_callback.pl   |   62 -
 docs/CAS/CASProxy/examples/proxy_cas_data.pl       |   80 -
 docs/history.txt                                   |    9 +-
 etc/zebradb/biblios/etc/bib1.att                   |   98 +-
 .../data/mysql/de-DE/mandatory/sample_notices.sql  |   10 +-
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |  320 ----
 .../mysql/de-DE/mandatory/system_preferences.sql   |   20 +
 .../{sysprefs.txt => system_preferences.txt}       |    0
 installer/data/mysql/en/mandatory/sysprefs.sql     |  319 ----
 installer/data/mysql/es-ES/mandatory/sysprefs.sql  |  319 ----
 installer/data/mysql/es-ES/mandatory/sysprefs.txt  |    1 -
 .../mysql/es-ES/mandatory/system_preferences.sql   |   20 +
 .../mandatory/system_preferences.txt}              |    0
 .../unimarc_standard_system_preferences.sql        |   26 +
 ...txt => unimarc_standard_system_preferences.txt} |    0
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |  321 ----
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |  307 ---
 .../mysql/it-IT/necessari/system_preferences.sql   |   70 +
 installer/data/mysql/kohastructure.sql             |    3 +
 .../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql   |  326 ----
 .../nb-NO/1-Obligatorisk/system_preferences.sql    |   29 +
 .../{sysprefs.txt => system_preferences.txt}       |    0
 .../marcflavour/normarc/Obligatorisk/normarc.sql   | 1986 ++++++++++----------
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |  318 ----
 .../mysql/pl-PL/mandatory/system_preferences.sql   |   20 +
 .../{sysprefs.txt => system_preferences.txt}       |    0
 ...m_preferences_full_optimal_for_install_only.sql |  407 +----
 ...ystem_preferences_only_translation_updating.sql |  667 -------
 ...ystem_preferences_only_translation_updating.txt |    1 -
 installer/data/mysql/sysprefs.sql                  |  320 ++++
 ...m_preferences_full_optimal_for_install_only.sql |  410 +----
 ...ystem_preferences_only_translation_updating.sql |  667 -------
 ...ystem_preferences_only_translation_updating.txt |    1 -
 ...stem_preferences_optimal_values_insert_only.sql |    2 -
 installer/data/mysql/updatedatabase.pl             |   15 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |   75 +-
 .../en/includes/acquisitions-history-search.inc    |   24 -
 .../prog/en/includes/acquisitions-search.inc       |    8 +-
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |   73 +
 .../prog/en/includes/error-bottom.inc              |   16 -
 .../intranet-tmpl/prog/en/includes/error-top.inc   |   65 -
 .../prog/en/includes/messaging-preference-form.inc |    6 +-
 .../intranet-tmpl/prog/en/includes/resort_form.inc |    8 +-
 .../intranet-tmpl/prog/en/js/xmlControlfield.js    |    6 +-
 .../prog/en/lib/yui/imageloader/imageloader.js     |  199 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |   10 +
 .../prog/en/modules/acqui/basketgroup.tt           |   12 +-
 .../prog/en/modules/acqui/histsearch.tt            |    4 +-
 .../prog/en/modules/acqui/lateorders.tt            |    6 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   21 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |    2 +-
 .../prog/en/modules/acqui/supplier.tt              |   10 +-
 .../prog/en/modules/admin/branches.tt              |   10 +-
 .../prog/en/modules/admin/categorie.tt             |   34 +-
 .../prog/en/modules/admin/preferences/opac.pref    |    5 +
 .../prog/en/modules/admin/smart-rules.tt           |    4 +-
 .../prog/en/modules/authorities/authorities.tt     |    4 +-
 .../prog/en/modules/catalogue/detail.tt            |    3 -
 .../prog/en/modules/catalogue/results.tt           |   34 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |   26 +-
 .../prog/en/modules/cataloguing/addbooks.tt        |    7 +-
 .../prog/en/modules/cataloguing/additem.tt         |    6 +
 .../prog/en/modules/cataloguing/merge.tt           |   10 +-
 .../cataloguing/value_builder/marc21_field_006.tt  |    2 +-
 .../cataloguing/value_builder/marc21_field_008.tt  |    2 +-
 .../cataloguing/value_builder/unimarc_field_4XX.tt |    9 +-
 .../prog/en/modules/circ/circulation.tt            |    6 +-
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |   12 +-
 .../prog/en/modules/circ/waitingreserves.tt        |    4 +-
 .../prog/en/modules/help/members/pay.tt            |   51 +-
 .../prog/en/modules/help/tools/letter.tt           |  131 +-
 .../intranet-tmpl/prog/en/modules/intranet-main.tt |   10 +-
 .../prog/en/modules/labels/label-print.tt          |  162 +--
 .../prog/en/modules/maint/catmaintain.tt           |  122 --
 .../prog/en/modules/members/boraccount.tt          |    2 +-
 .../prog/en/modules/members/guarantor_search.tt    |   38 +-
 .../prog/en/modules/members/member-flags.tt        |   10 +-
 .../prog/en/modules/members/memberentrygen.tt      |   20 -
 .../intranet-tmpl/prog/en/modules/members/pay.tt   |  102 +-
 .../prog/en/modules/members/paycollect.tt          |  227 +++
 .../prog/en/modules/patroncards/members-search.tt  |    2 +-
 .../prog/en/modules/patroncards/print.tt           |  144 +-
 .../prog/en/modules/reports/borrowers_stats.tt     |    6 +-
 .../prog/en/modules/reports/catalogue_out.tt       |    3 +-
 .../en/modules/reports/guided_reports_start.tt     |    5 +-
 .../en/modules/rotating_collections/addItems.tt    |    3 +-
 .../rotating_collections/editCollections.tt        |    6 +-
 .../prog/en/modules/serials/routing-preview.tt     |    4 +-
 .../prog/en/modules/serials/serial-issues-full.tt  |    3 +-
 .../prog/en/modules/serials/serials-edit.tt        |    9 +-
 .../prog/en/modules/serials/subscription-add.tt    |    3 +-
 .../prog/en/modules/suggestion/suggestion.tt       |   41 +-
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |   18 +-
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |    1 +
 .../prog/en/modules/virtualshelves/shelves.tt      |   15 +-
 koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif      |  Bin 1315 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/delete-tag.png    |  Bin 0 -> 244 bytes
 koha-tmpl/intranet-tmpl/prog/img/edit-tag.png      |  Bin 0 -> 264 bytes
 .../img}/famfamfam/silk/page_white_acrobat.png     |  Bin 591 -> 591 bytes
 .../prog/img}/famfamfam/silk/page_white_code.png   |  Bin 603 -> 603 bytes
 .../prog/img}/famfamfam/silk/page_white_excel.png  |  Bin 663 -> 663 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif      |  Bin 1239 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif |  Bin 434 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png    |  Bin 0 -> 244 bytes
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |   12 +-
 .../opac-tmpl/prog/en/includes/doc-head-open.inc   |    2 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    3 +-
 .../opac-tmpl/prog/en/includes/opac-facets.inc     |    5 +
 .../opac-tmpl/prog/en/includes/resort_form.inc     |    8 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |   14 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   41 +-
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |    6 +-
 .../opac-tmpl/prog/en/modules/opac-opensearch.tt   |    4 +-
 .../prog/en/modules/opac-readingrecord.tt          |    4 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |    5 +
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    4 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    6 +-
 .../prog/en/modules/opac-showreviews-rss.tt        |    4 +-
 .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    8 +-
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    6 +-
 kohaversion.pl                                     |    2 +-
 labels/label-edit-template.pl                      |   43 +-
 mainpage.pl                                        |    3 +
 members/boraccount.pl                              |    3 -
 members/pay.pl                                     |  361 ++--
 members/paycollect.pl                              |  171 ++
 misc/spellcheck_suggest/make_spellcheck_suggest.pl |  240 ---
 opac/opac-export.pl                                |  105 +-
 opac/opac-reserve.pl                               |    4 +
 opac/opac-search.pl                                |    4 +-
 reports/dictionary.pl                              |    2 +-
 reserve/request.pl                                 |  118 +-
 serials/serials-edit.pl                            |    5 +
 t/db_dependent/lib/KohaTest.pm                     |    6 +-
 t/db_dependent/lib/KohaTest/Acquisition.pm         |   38 +-
 .../lib/KohaTest/Acquisition/GetHistory.pm         |   50 +-
 tools/letter.pl                                    |   18 +-
 virtualshelves/addbybiblionumber.pl                |    4 +-
 xt/check_sysprefs.t                                |  131 --
 xt/syspref.t                                       |  138 --
 177 files changed, 4208 insertions(+), 7702 deletions(-)
 delete mode 100644 C4/Auth_cas_servers.yaml.orig
 create mode 100755 debian/scripts/koha-mysql
 delete mode 100644 docs/CAS/CAS/README
 delete mode 100644 docs/CAS/CASProxy/README
 delete mode 100644 docs/CAS/CASProxy/examples/casSession.tmp
 delete mode 100755 docs/CAS/CASProxy/examples/koha_webservice.pl
 delete mode 100755 docs/CAS/CASProxy/examples/proxy_cas.pl
 delete mode 100755 docs/CAS/CASProxy/examples/proxy_cas_callback.pl
 delete mode 100755 docs/CAS/CASProxy/examples/proxy_cas_data.pl
 mode change 100755 => 100644 etc/koha-httpd.conf
 delete mode 100755 installer/data/mysql/de-DE/mandatory/sysprefs.sql
 create mode 100644 installer/data/mysql/de-DE/mandatory/system_preferences.sql
 rename installer/data/mysql/de-DE/mandatory/{sysprefs.txt => system_preferences.txt} (100%)
 delete mode 100755 installer/data/mysql/en/mandatory/sysprefs.sql
 delete mode 100755 installer/data/mysql/es-ES/mandatory/sysprefs.sql
 delete mode 100644 installer/data/mysql/es-ES/mandatory/sysprefs.txt
 create mode 100644 installer/data/mysql/es-ES/mandatory/system_preferences.sql
 rename installer/data/mysql/{en/mandatory/sysprefs.txt => es-ES/mandatory/system_preferences.txt} (100%)
 create mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_system_preferences.sql
 rename installer/data/mysql/fr-FR/1-Obligatoire/{unimarc_standard_systemprefs.txt => unimarc_standard_system_preferences.txt} (100%)
 delete mode 100755 installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
 delete mode 100755 installer/data/mysql/it-IT/necessari/sysprefs.sql
 create mode 100644 installer/data/mysql/it-IT/necessari/system_preferences.sql
 delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
 create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
 rename installer/data/mysql/nb-NO/1-Obligatorisk/{sysprefs.txt => system_preferences.txt} (100%)
 delete mode 100755 installer/data/mysql/pl-PL/mandatory/sysprefs.sql
 create mode 100644 installer/data/mysql/pl-PL/mandatory/system_preferences.sql
 rename installer/data/mysql/pl-PL/mandatory/{sysprefs.txt => system_preferences.txt} (100%)
 delete mode 100644 installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql
 delete mode 100644 installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.txt
 create mode 100755 installer/data/mysql/sysprefs.sql
 delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql
 delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.txt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/delete-tag.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/edit-tag.png
 copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_acrobat.png (100%)
 copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_code.png (100%)
 copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_excel.png (100%)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png
 create mode 100755 members/paycollect.pl
 delete mode 100755 misc/spellcheck_suggest/make_spellcheck_suggest.pl
 delete mode 100755 xt/check_sysprefs.t
 delete mode 100755 xt/syspref.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 12 23:36:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 21:36:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-526-g74b62cd
Message-ID: <E1R3EAw-0003jS-2R@git.koha-community.org>

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  74b62cd752942b13b9e15a4d1e49ccf45b19ab69 (commit)
       via  282a2d60b830b22661cc0324a84b7c17b7b905d1 (commit)
       via  06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24 (commit)
       via  4530159ce13eb6ff823d6ef49ad847d92556f356 (commit)
       via  8f8fc1088a2c5b43ed03fb06c9c842b7c721a838 (commit)
       via  22804d6ff6fdc2105644f03d0edca1e4e17d4b72 (commit)
       via  6d6c9626274268e82d6fa433894f188b995c913b (commit)
       via  27c87aea11243e63c2600d71a154d425b3269c13 (commit)
       via  d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8 (commit)
       via  637953df93f7090de846e1f274a1e721687a9277 (commit)
       via  fb7b258ec2220fcf6a86d49132b0224175f0a344 (commit)
       via  1866c4939df4298d561bc9f5fe617644a9955371 (commit)
       via  1859858af62c6f9923d56b70b29c4c0a3a24f9e4 (commit)
       via  18844d6bf1f1c6cf93cbe833067fe747753856b9 (commit)
       via  75bfa2a56a857417cf99d605f0f903e14ec0f204 (commit)
      from  35e3aa9a3758a62f00c430b017fa9ce90dc36def (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 74b62cd752942b13b9e15a4d1e49ccf45b19ab69
Merge: 35e3aa9 282a2d6
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Sep 13 09:36:13 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster

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

Summary of changes:
 .../prog/en/modules/acqui/basketgroup.tt           |   12 ++++--
 .../prog/en/modules/acqui/lateorders.tt            |    6 ++-
 .../prog/en/modules/acqui/supplier.tt              |   10 ++---
 .../prog/en/modules/authorities/authorities.tt     |    4 +-
 .../prog/en/modules/catalogue/results.tt           |   34 ++++++++++------
 .../prog/en/modules/cataloguing/addbiblio.tt       |    2 +
 .../prog/en/modules/cataloguing/addbooks.tt        |    3 +-
 .../cataloguing/value_builder/unimarc_field_4XX.tt |    9 +++-
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |   12 ++++--
 .../prog/en/modules/reports/borrowers_stats.tt     |    6 ++-
 .../prog/en/modules/reports/catalogue_out.tt       |    3 +-
 .../en/modules/reports/guided_reports_start.tt     |    5 ++-
 .../en/modules/rotating_collections/addItems.tt    |    3 +-
 .../rotating_collections/editCollections.tt        |    6 ++-
 .../prog/en/modules/serials/serial-issues-full.tt  |    3 +-
 .../prog/en/modules/serials/subscription-add.tt    |    3 +-
 .../prog/en/modules/suggestion/suggestion.tt       |   41 +++++++++++++-------
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |   18 ++++++---
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |   12 ++++--
 .../opac-tmpl/prog/en/includes/doc-head-open.inc   |    2 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    3 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   14 ++++--
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    6 ++-
 23 files changed, 141 insertions(+), 76 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 13 00:28:09 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 22:28:09 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6609
	created. v3.04.00-527-g6ba210a
Message-ID: <E1R3Ez3-0004D4-0C@git.koha-community.org>

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, new/enh/bug_6609 has been created
        at  6ba210af184930f530bb6ed458fbf1034f52c734 (commit)

- Log -----------------------------------------------------------------
commit 6ba210af184930f530bb6ed458fbf1034f52c734
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Jul 18 14:36:05 2011 -0400

    Fix for Bug 6609, Clean up guided reports dictionary entry process
    
    Some general interface cleanup tasks with the guided reports dictionary entry
    process:
    
    - Improving the breadcrumb links
    - Eliminating the tabs in favor of more descriptive <legend> labels
    - Clarifying some labels
    - Correcting form markup according to established patterns
    
    (Undertaken primarily because the tabs translated poorly when trying to
    re-implement them for Bug 5481, Replace YUI JS libraries with Jquery UI)
    
    Signed-off-by: Nicole Engard <nengard at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 13 00:29:27 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 22:29:27 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6651
	created. v3.04.00-528-gae022e9
Message-ID: <E1R3F0J-0004Dv-Jk@git.koha-community.org>

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, new/bug_6651 has been created
        at  ae022e9a22a4631216c43399609d8aae62d23fb5 (commit)

- Log -----------------------------------------------------------------
commit ae022e9a22a4631216c43399609d8aae62d23fb5
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Sun Jul 31 14:26:23 2011 +1200

    Bug 6651 - fix splitting of names when updating to 3.4
    
    This affects only koha package installations that have multiple
    instances running. After this patch, it's worth running the upgrade
    again to ensure that everything happened correctly the first time.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 13 00:30:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 12 Sep 2011 22:30:15 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-528-gae022e9
Message-ID: <E1R3F15-0004F1-RO@git.koha-community.org>

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  ae022e9a22a4631216c43399609d8aae62d23fb5 (commit)
       via  6ba210af184930f530bb6ed458fbf1034f52c734 (commit)
      from  74b62cd752942b13b9e15a4d1e49ccf45b19ab69 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/scripts/koha-upgrade-to-3.4                 |    2 +-
 .../prog/en/modules/reports/dictionary.tt          |  197 +++++++++-----------
 2 files changed, 89 insertions(+), 110 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 13 04:33:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 13 Sep 2011 02:33:53 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6716
	updated. v3.04.00-509-gf630631
Message-ID: <E1R3Ior-0006pw-0L@git.koha-community.org>

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, new/enh/bug_6716 has been updated
       via  f630631218c5b36f5b4333012e40e059850c0ee4 (commit)
      from  6a6edfeec8c1bb3ad090be49dbb175b0d9cbd432 (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 f630631218c5b36f5b4333012e40e059850c0ee4
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Sep 13 14:33:15 2011 +1200

    Bug 6716 couple of little typos

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

Summary of changes:
 installer/data/mysql/kohastructure.sql |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 13 04:34:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 13 Sep 2011 02:34:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-530-gaf9ac2f
Message-ID: <E1R3Ip8-0006qx-PZ@git.koha-community.org>

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  af9ac2fb57d07cef95fc97e3269e844ce7431ed1 (commit)
       via  f630631218c5b36f5b4333012e40e059850c0ee4 (commit)
      from  ae022e9a22a4631216c43399609d8aae62d23fb5 (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 af9ac2fb57d07cef95fc97e3269e844ce7431ed1
Merge: ae022e9 f630631
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Sep 13 14:34:01 2011 +1200

    Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster

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

Summary of changes:
 installer/data/mysql/kohastructure.sql |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 13 17:17:42 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 13 Sep 2011 15:17:42 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-87-gcf3461d
Message-ID: <E1R3Uk2-0000ia-Up@git.koha-community.org>

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  cf3461d8caed3c9dbfd051712cd3552898c3fffa (commit)
       via  e2a8ad55978e1052e8891f3843da027447043804 (commit)
       via  d6a6835ec00074fbd98ea7d3b6e14906a037861a (commit)
       via  38920a3fe11c91d1111fc1e282567614c0892c43 (commit)
       via  4d3bc31ad7414137073ab711fdeb7e40f93ae013 (commit)
       via  eb0bd32b0120f266fab53d961120b7301689a9fe (commit)
       via  22c92b437c2c6f542735cc750544a70c33e51c87 (commit)
       via  0aa478deb9a62392f292e060a8785f3a63afe2d6 (commit)
       via  9b6c9c49d9443c702565689c0e0a223947a34e8e (commit)
       via  753fffb1d8b365470a440f07bba445aa92678425 (commit)
       via  d9a2faf96922bf389e55ccfbeb88b90f1bdda14b (commit)
       via  80890f5a0514d778c9674dcab31602c22596c4fd (commit)
       via  c2575b3cdb58f1a874faa20fb6d116bc3f418012 (commit)
       via  52ad3b1425671b95580f2f804a3b3b977c004425 (commit)
       via  a35128f88f821c16a2ea704a4407987401c00441 (commit)
       via  71bceb8432c4b56d64b30f03127d7fc5e38dd8f1 (commit)
       via  e5c056dba58188d6687323d190d656f162330615 (commit)
       via  641448a5bf7d1cbfa0705c6bdb7f0ca6613dda1a (commit)
       via  c7483461999a249e67f7cdd518f29830428f87e8 (commit)
      from  342d6aaecec84beb0ad1bd0b75714e29490b266d (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 cf3461d8caed3c9dbfd051712cd3552898c3fffa
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Sun Jul 31 14:26:23 2011 +1200

    Bug 6651 - fix splitting of names when updating to 3.4
    
    This affects only koha package installations that have multiple
    instances running. After this patch, it's worth running the upgrade
    again to ensure that everything happened correctly the first time.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit ae022e9a22a4631216c43399609d8aae62d23fb5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e2a8ad55978e1052e8891f3843da027447043804
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Aug 25 00:40:56 2011 +0200

    Bug 6458: Incorrect translation processing / results
    
    Removed template toolkit directives from within HTML tags.
    
    Advanced Search > Scan Index > Search results
    
    Additional changes:
    - removes entry 'Series Title' from the index pull down as it was the same
      index as 'Series'
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 282a2d60b830b22661cc0324a84b7c17b7b905d1)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d6a6835ec00074fbd98ea7d3b6e14906a037861a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Aug 25 00:09:11 2011 +0200

    Bug 6458: Incorrect translation processing / suggestion
    
    Removes template toolkit directives from within HTML tags.
    
    Acquisitions > Suggestions
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 38920a3fe11c91d1111fc1e282567614c0892c43
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Aug 20 19:02:01 2011 +0200

    Bug 6458: Incorrect translation processing / sco-main.tt
    
    Patch removes templates directives from HTML tags in sco-main.tt
    
    Problems were related to buttons for renewing items.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Before
    opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222
    
    After, no errors
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 4530159ce13eb6ff823d6ef49ad847d92556f356)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 4d3bc31ad7414137073ab711fdeb7e40f93ae013
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Aug 24 20:49:23 2011 +0200

    Bug 6458: Incorrect translation processing / serials/...
    
    Fixes problems with template toolkit directives within HTML tags
    for the serials module.
    
    Serials > add/modify subsciption
    
    serial-issues-full.tt seems to be unused?
    I couldn't find the page in the serials module.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 8f8fc1088a2c5b43ed03fb06c9c842b7c721a838)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit eb0bd32b0120f266fab53d961120b7301689a9fe
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Aug 24 19:43:58 2011 +0200

    Bug 6458: Incorrect translation processing - rotating_collections/...
    
    Patch removes templates directives from HTML tags in the
    rotating collections module.
    
    The module is currently not interated into Koha's staff interface.
    Fixing templats to make Jenkins happy.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 22804d6ff6fdc2105644f03d0edca1e4e17d4b72)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 22c92b437c2c6f542735cc750544a70c33e51c87
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Aug 25 12:48:55 2011 -0400

    Bug 6458: Incorrect translation processing / opac-detail.tt
    
    Patch removes template directives from within HTML tags from OPAC detail view.
    
    Problems were related to the items tabs for holdings, subscriptions, and serial collection.
    
    Fixed the problem spotted by Fr?re S?bastien Marie - thx!
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 6d6c9626274268e82d6fa433894f188b995c913b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0aa478deb9a62392f292e060a8785f3a63afe2d6
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Aug 23 00:06:00 2011 +0200

    Bug 6458: Incorrect translation processing / cataloguing/...
    
    Patch removes template directives from within HTML tags from
      - cataloging > new record
      - cataloging
      - UNIMARC plugin for 4XX
    
    There is one problem remaining in addbiblio:
    
    <option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
        [% frameworkcodeloo.frameworktext %]
    </option>
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 27c87aea11243e63c2600d71a154d425b3269c13)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9b6c9c49d9443c702565689c0e0a223947a34e8e
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 23:47:02 2011 +0200

    Bug 6458: Incorrect translation processing / acqui/...
    
    Patch removes template directives from within HTML tags from
    - acquisitions > new vendor / modify vendor / vendor details
    - acquisitions > late orders
    - acquisitons > vendor x > basket groups
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 753fffb1d8b365470a440f07bba445aa92678425
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Aug 20 19:38:30 2011 +0200

    Bug 6458: Incorrect translation processing - masthead.inc
    
    Patch removes templates directives from HTML tags in masthead.inc
    
    Problem was related to library pull down shown when
    OpacAddMastheadLibraryPulldown is activated.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Before
    opac-tmpl/prog/en/includes/masthead.inc: 83
    
    After no errors
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 637953df93f7090de846e1f274a1e721687a9277)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d9a2faf96922bf389e55ccfbeb88b90f1bdda14b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 23:25:37 2011 +0200

    Bug 6458: Incorrect translation processing / 3x reports/...
    
    Patch removes template directives from within HTML tags from
    - Reports > Guided Reports
    - Reports > Items with no checkouts
    - Reports > Patron statistics
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit fb7b258ec2220fcf6a86d49132b0224175f0a344)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 80890f5a0514d778c9674dcab31602c22596c4fd
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 23:16:12 2011 +0200

    Bug 6458: Incorrect translation processing / authorities.tt
    
    Patch removes template directives from within HTML tags from
    authorities > modify authority.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1866c4939df4298d561bc9f5fe617644a9955371)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c2575b3cdb58f1a874faa20fb6d116bc3f418012
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 23:00:18 2011 +0200

    Bug 6458: Incorrect translation processing / review.tt
    
    Patch removes template directives from within HTML tags from
    Tools > Tags.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1859858af62c6f9923d56b70b29c4c0a3a24f9e4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 52ad3b1425671b95580f2f804a3b3b977c004425
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Aug 22 22:46:28 2011 +0200

    Bug 6458: Incorrect translation processing / overdue.tt
    
    Patch removes template directives from within HTML tags from
    circulation > overdues.
    
    Problems were related to patron flags pull down and sort by loop for patron attributes.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 18844d6bf1f1c6cf93cbe833067fe747753856b9)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a35128f88f821c16a2ea704a4407987401c00441
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Aug 21 19:58:48 2011 +0200

    Bug 6458: Incorrect translation processing - doc-head-close/open.inc
    
    Patch removes templates directives from HTML tags in masthead.inc
    Fixes all 3 problems now.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 75bfa2a56a857417cf99d605f0f903e14ec0f204)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 71bceb8432c4b56d64b30f03127d7fc5e38dd8f1
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 12 13:57:19 2011 +1200

    While testing the commits for 6716 I discovered a couple of missing
    drop tables, fixed now
    (cherry picked from commit d6417257fde4e22252c78f2def21091016db17f3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e5c056dba58188d6687323d190d656f162330615
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Thu Jun 30 08:47:35 2011 +0200

    Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
    
    The revised patch quotes the variable $mysqldb, as suggested by Fr?re
    S?bastien Marie.
    
    This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
    to any (gzip'ed) file produced by mysqldump works, by adding the name of the
    database to the end of the call to mysql, when the specified SQL file is
    loaded. Files produced with koha-dump-defaults should still work too.
    
    To test:
    - Apply the patch
    - Create a new package with build-git-snapshot
    - Install the package
    - Create an SQL file from an existing installation with mysqldump
    - gzip the SQL file
    - point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
    - create a new site with koha-create --create-db
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit b3b6278e206be11ce3b5a8e271f7bccb70539ac5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 641448a5bf7d1cbfa0705c6bdb7f0ca6613dda1a
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Sep 9 14:37:22 2011 -0400

    Bug 6863: Shelf Browser images not showing up
    
    Fixes case for Syndetics (test condition was scoped wrong, leading to "no image available")
    as well as Baker and Taylor (bad scope and capitalization on BakerTaylorImageURL).
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit b49534ebdc11c36844c87d9588fc4e420509b77e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c7483461999a249e67f7cdd518f29830428f87e8
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Sep 9 06:34:56 2011 -0400

    Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
    
    SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working.
    
    This patch fixes not only search results and shelf browsers, but also rarely-used parts of
    opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 156a849aa3759f377af07d4cdc7a6f58e58c18f4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 debian/scripts/koha-create                         |    2 +-
 debian/scripts/koha-upgrade-to-3.4                 |    2 +-
 installer/data/mysql/kohastructure.sql             |    2 +
 .../prog/en/modules/acqui/basketgroup.tt           |   12 ++++--
 .../prog/en/modules/acqui/lateorders.tt            |    6 ++-
 .../prog/en/modules/acqui/supplier.tt              |   10 ++---
 .../prog/en/modules/authorities/authorities.tt     |    4 +-
 .../prog/en/modules/catalogue/results.tt           |   34 ++++++++++------
 .../prog/en/modules/cataloguing/addbiblio.tt       |    2 +
 .../prog/en/modules/cataloguing/addbooks.tt        |    3 +-
 .../cataloguing/value_builder/unimarc_field_4XX.tt |    9 +++-
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |   12 ++++--
 .../prog/en/modules/reports/borrowers_stats.tt     |    6 ++-
 .../prog/en/modules/reports/catalogue_out.tt       |    3 +-
 .../en/modules/reports/guided_reports_start.tt     |    5 ++-
 .../en/modules/rotating_collections/addItems.tt    |    3 +-
 .../rotating_collections/editCollections.tt        |    6 ++-
 .../prog/en/modules/serials/serial-issues-full.tt  |    3 +-
 .../prog/en/modules/serials/subscription-add.tt    |    3 +-
 .../prog/en/modules/suggestion/suggestion.tt       |   41 +++++++++++++-------
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |   18 ++++++---
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |   12 ++++--
 .../opac-tmpl/prog/en/includes/doc-head-open.inc   |    2 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    3 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   38 ++++++++++--------
 .../opac-tmpl/prog/en/modules/opac-opensearch.tt   |    4 +-
 .../prog/en/modules/opac-readingrecord.tt          |    4 +-
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    4 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    4 +-
 .../prog/en/modules/opac-showreviews-rss.tt        |    4 +-
 .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    8 ++--
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    6 ++-
 33 files changed, 173 insertions(+), 106 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 13 22:53:25 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 13 Sep 2011 20:53:25 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-532-gf8bd9b1
Message-ID: <E1R3Zyv-0006Dw-TN@git.koha-community.org>

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  f8bd9b146076c9620d34a45fed41e4c069e96c32 (commit)
       via  2d4d976f3dd5e9b36784562a02da25ae04122d86 (commit)
      from  af9ac2fb57d07cef95fc97e3269e844ce7431ed1 (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 f8bd9b146076c9620d34a45fed41e4c069e96c32
Merge: af9ac2f 2d4d976
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 14 08:46:05 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_5234' into kcmaster

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

Summary of changes:
 .../intranet-tmpl/prog/en/css/intranet-print.css   |  235 -------
 koha-tmpl/intranet-tmpl/prog/en/css/intranet.css   |  491 ---------------
 koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css  |  665 --------------------
 .../intranet-tmpl/prog/en/css/intranet2popup.css   |  551 ----------------
 .../intranet-tmpl/prog/en/css/pages/addbiblio.css  |   75 ---
 .../intranet-tmpl/prog/en/css/staff-global2.css    |  575 -----------------
 6 files changed, 0 insertions(+), 2592 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet-print.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2popup.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/addbiblio.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/staff-global2.css


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 00:14:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 13 Sep 2011 22:14:15 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6458
	updated. v3.04.00-510-g362b82c
Message-ID: <E1R3bF8-0007EF-UN@git.koha-community.org>

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, new/bug_6458 has been updated
       via  362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0 (commit)
       via  9dc11e418a3f48971de92f2722bd564738218c9f (commit)
       via  aab0d9fba264ec3e878e339e098b1f3c943e6a6d (commit)
       via  3e1203c95e53422015885a2add288d5cbc9f8733 (commit)
       via  8bdab59bbad65bdb4b324fedc79c73b33066b0d3 (commit)
       via  0d5aaf0a7ca024d4ec5e1b7d554e0d813785fae4 (commit)
       via  597240e878a2a9808ce103508a42d9ed34a11422 (commit)
       via  e1bbff6b7f9db37714fcdb69b03598600e222237 (commit)
       via  8a4dbae0efee89728de8bc5a63339828498f9798 (commit)
       via  e8a876614eddde3025477e228d4ccf533d3cc683 (commit)
       via  c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359 (commit)
       via  ecfa1ddd49bd8de6139cd7200679996b51dabf3c (commit)
       via  550a38143a5898dc7c4ef09be215dcb27aab1034 (commit)
       via  2c51064ab183abb3761be629efd4169ebef99d4b (commit)
       via  7950a8f5af10b905d1a53e14e69eb34ad430d29e (commit)
       via  d058b4eee9de75b00d8cb74367bd3ee0bdc2318c (commit)
      from  282a2d60b830b22661cc0324a84b7c17b7b905d1 (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 362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 13 12:30:05 2011 -0400

    Follow-up fix for Bug 6458, incorrect parsing result in translation processing
    
    Somehow some markup which should have been deleted by a previous
    patch has reappeared, messing up the display of the MARC editor.
    This patch removes that section again.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 9dc11e418a3f48971de92f2722bd564738218c9f
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 13 09:33:05 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in
    CSV profiles template
    
    Also fixing improperly scoped template variable which prevented
    the current profile from being preselected under the edit tab.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in
    budgets admin search form.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 3e1203c95e53422015885a2add288d5cbc9f8733
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 16:07:46 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing / branches
    
    Correction for branch admin template stops tag attribute markup from
    being passed to the template directly in favor of using template
    logic.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 8bdab59bbad65bdb4b324fedc79c73b33066b0d3
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 15:56:00 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
    
    Fixing improperly nested template logic inside HTML tags in
    clone circulation rules form.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 0d5aaf0a7ca024d4ec5e1b7d554e0d813785fae4
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Sep 2 10:14:51 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    There is template logic in manage-marc-import.tt which is intended
    to set the "selected" option for the framework chooser ("Add new
    bibliographic records into this framework"). However, I can't see
    any place in the code which sends the "selected" variable to the
    template, and I can't see any circumstance in which a value would
    be passed to the template.
    
    This patch removes the "selected" variable from the template.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 597240e878a2a9808ce103508a42d9ed34a11422
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Aug 25 15:37:25 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Correction in opac holds template. Corrections made are logically
    consistent, but I couldn't reproduce the combination of factors
    to trigger the "disabled" attribute on the branch selector. In
    that respect this hasn't been tested 100%.
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit e1bbff6b7f9db37714fcdb69b03598600e222237
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 10:54:07 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types
    
    Correction for patron-attr-types.tt stops tag attribute markup from
    being passed to the template directly in favor of using template
    logic.
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Read the patch and tested the page, didn't find any problems.
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 8a4dbae0efee89728de8bc5a63339828498f9798
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>

commit e8a876614eddde3025477e228d4ccf533d3cc683
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>

commit c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 10:53:24 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in the
    system preferences editor.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit ecfa1ddd49bd8de6139cd7200679996b51dabf3c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 10:36:50 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in spine
    label print template.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 550a38143a5898dc7c4ef09be215dcb27aab1034
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 10:26:19 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in member
    details template.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 2c51064ab183abb3761be629efd4169ebef99d4b
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 10:06:03 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in
    aqplan template.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 7950a8f5af10b905d1a53e14e69eb34ad430d29e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 09:40:08 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside markup in header.inc
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d058b4eee9de75b00d8cb74367bd3ee0bdc2318c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 16:15:34 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in
    branch transfer limits template.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 admin/branches.pl                                  |    6 +-
 admin/patron-attr-types.pl                         |   24 +-
 .../prog/en/includes/budgets-admin-search.inc      |    6 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |    6 +-
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt  |    8 +-
 .../en/modules/admin/branch_transfer_limits.tt     |    8 +-
 .../prog/en/modules/admin/branches.tt              |    7 +-
 .../prog/en/modules/admin/clone-rules.tt           |   12 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |   46 +++-
 .../prog/en/modules/admin/systempreferences.tt     |   71 ++++-
 .../prog/en/modules/cataloguing/addbiblio.tt       |    1 -
 .../prog/en/modules/labels/spinelabel-print.tt     |    6 +-
 .../prog/en/modules/members/memberentrygen.tt      |  272 ++++++++++++++++----
 .../prog/en/modules/members/moremember.tt          |   14 +-
 .../prog/en/modules/tools/csv-profiles.tt          |    9 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |    4 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |   33 ++-
 17 files changed, 425 insertions(+), 108 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 00:25:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 13 Sep 2011 22:25:01 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-549-g68de42d
Message-ID: <E1R3bPZ-0007Ui-Pr@git.koha-community.org>

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  68de42d59d7070bc58f25cb13ad159d8c70aafc6 (commit)
       via  362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0 (commit)
       via  9dc11e418a3f48971de92f2722bd564738218c9f (commit)
       via  aab0d9fba264ec3e878e339e098b1f3c943e6a6d (commit)
       via  3e1203c95e53422015885a2add288d5cbc9f8733 (commit)
       via  8bdab59bbad65bdb4b324fedc79c73b33066b0d3 (commit)
       via  0d5aaf0a7ca024d4ec5e1b7d554e0d813785fae4 (commit)
       via  597240e878a2a9808ce103508a42d9ed34a11422 (commit)
       via  e1bbff6b7f9db37714fcdb69b03598600e222237 (commit)
       via  8a4dbae0efee89728de8bc5a63339828498f9798 (commit)
       via  e8a876614eddde3025477e228d4ccf533d3cc683 (commit)
       via  c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359 (commit)
       via  ecfa1ddd49bd8de6139cd7200679996b51dabf3c (commit)
       via  550a38143a5898dc7c4ef09be215dcb27aab1034 (commit)
       via  2c51064ab183abb3761be629efd4169ebef99d4b (commit)
       via  7950a8f5af10b905d1a53e14e69eb34ad430d29e (commit)
       via  d058b4eee9de75b00d8cb74367bd3ee0bdc2318c (commit)
      from  f8bd9b146076c9620d34a45fed41e4c069e96c32 (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 68de42d59d7070bc58f25cb13ad159d8c70aafc6
Merge: f8bd9b1 362b82c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 14 10:14:54 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster

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

Summary of changes:
 admin/branches.pl                                  |    6 +-
 admin/patron-attr-types.pl                         |   24 +-
 .../prog/en/includes/budgets-admin-search.inc      |    6 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |    6 +-
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt  |    8 +-
 .../en/modules/admin/branch_transfer_limits.tt     |    8 +-
 .../prog/en/modules/admin/branches.tt              |    7 +-
 .../prog/en/modules/admin/clone-rules.tt           |   12 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |   46 +++-
 .../prog/en/modules/admin/systempreferences.tt     |   71 ++++-
 .../prog/en/modules/cataloguing/addbiblio.tt       |    1 -
 .../prog/en/modules/labels/spinelabel-print.tt     |    6 +-
 .../prog/en/modules/members/memberentrygen.tt      |  272 ++++++++++++++++----
 .../prog/en/modules/members/moremember.tt          |   14 +-
 .../prog/en/modules/tools/csv-profiles.tt          |    9 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |    4 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |   33 ++-
 17 files changed, 425 insertions(+), 108 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 02:34:08 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 00:34:08 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-88-gaa2284e
Message-ID: <E1R3dQW-00027s-Kw@git.koha-community.org>

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  aa2284e1113cb74b94c7da2fa43e423b690a9566 (commit)
      from  cf3461d8caed3c9dbfd051712cd3552898c3fffa (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 aa2284e1113cb74b94c7da2fa43e423b690a9566
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Mon Sep 5 12:19:50 2011 +1200

    Bug 6129 - [3.4.x] this adds an ISSN to serialssolutions URLs
    
    If a URL is a serialssolutions URLs that doesn't already have an ISSN
    parameter, this adds one on the OPAC.
    
    Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
    Author: Robin Sheat <robin at catalyst.net.nz>
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/Biblio.pm                                       |    6 ++++--
 basket/basket.pl                                   |    4 ++--
 catalogue/detail.pl                                |   10 ++++++++--
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    5 ++++-
 opac/opac-basket.pl                                |    2 +-
 opac/opac-detail.pl                                |   12 ++++++------
 6 files changed, 25 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 10:11:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 08:11:19 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6368
	created. v3.04.00-550-g47aee69
Message-ID: <E1R3kYx-0007lg-AX@git.koha-community.org>

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, new/bug_6368 has been created
        at  47aee699afbb4ad8aebc84e023a0e5c7fd441ec9 (commit)

- Log -----------------------------------------------------------------
commit 47aee699afbb4ad8aebc84e023a0e5c7fd441ec9
Author: Janusz Kaczmarek <januszop at gmail.com>
Date:   Wed May 18 22:35:57 2011 +0200

    Bug 6368: unimarc_field_4XX plugin does not work with new templates - corrected
    
    [2011.05.19] I confirm the bug and the solution
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 10:12:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 08:12:28 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-550-g47aee69
Message-ID: <E1R3ka4-0007mk-OM@git.koha-community.org>

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  47aee699afbb4ad8aebc84e023a0e5c7fd441ec9 (commit)
      from  68de42d59d7070bc58f25cb13ad159d8c70aafc6 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../cataloguing/value_builder/unimarc_field_4XX.tt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 11:41:27 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 09:41:27 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6620
	created. v3.04.00-551-gf9ccfae
Message-ID: <E1R3lyB-0000TR-IF@git.koha-community.org>

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, new/bug_6620 has been created
        at  f9ccfae400324fdd88597ff81fba42715e50f19d (commit)

- Log -----------------------------------------------------------------
commit f9ccfae400324fdd88597ff81fba42715e50f19d
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Thu Jul 21 12:16:22 2011 +0100

    Bug 6620 Ensure autoflush is set on output filehandles
    
    stdout is by default buffered and a flush is only guaranteed on CR
    Sip responses are not CR terminated so we need to ensure autoflush
    is switched on  so that the filehandle is flushed after a print
    Otherwise this can manifest as self checks running slow or
    failing due to timeout (although in the log we see the response)
    
    Signed-off-by: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 11:41:56 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 09:41:56 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-551-gf9ccfae
Message-ID: <E1R3lye-0000UL-0l@git.koha-community.org>

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  f9ccfae400324fdd88597ff81fba42715e50f19d (commit)
      from  47aee699afbb4ad8aebc84e023a0e5c7fd441ec9 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/SIP/Sip.pm |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 11:44:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 09:44:23 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6841
	created. v3.04.00-552-gc2015c7
Message-ID: <E1R3m11-0000W3-Sb@git.koha-community.org>

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, new/bug_6841 has been created
        at  c2015c710355a0ab81306515a70af29e6aef3504 (commit)

- Log -----------------------------------------------------------------
commit c2015c710355a0ab81306515a70af29e6aef3504
Author: Liz Rea <lrea at nekls.org>
Date:   Tue Sep 6 13:00:51 2011 -0500

    Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)
    
    This patch does a couple of things.
    
    1. Changes permission over all to set branch printer (change branch/Set Library) from "circulation" privileges to "view catalogue" permissions. Reasoning: anyone who has privileges to view catalogue could reasonably be expected to perhaps need to change the set branch, but you might have people who don't have circulate permissions who need to change the branch, centralized cataloguing, for example. Those people would never circ and wouldn't need circ privileges, but *would* need to be able to change the set branch.
    2. Changes the template flags to see the "Set Library" link with independent branches set from "manage users" to "manage users or edit catalogue." Reasoning: even with indy branches on, there might be reasons for catalogers to be able to change the set branch (that reason was the impetus for this patch in the first place).
    
    To test:
    Create a user with only "View Catalogue" Permissions (no circulate permissions), that user should be able to change set library with Independent branches OFF.
    
    With independent branches on, give a user edit catalogue permissions. That user should be able to change set library.
    
    I want to add that this patch was specifically written in response to chris_n's bug report. It may not be practical for these changes to be in mainline, but I haven't thought of any reasons why it would be explicitly bad. That doesn't mean there aren't some, though.
    
    Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 11:44:58 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 09:44:58 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-552-gc2015c7
Message-ID: <E1R3m1a-0000X2-5y@git.koha-community.org>

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  c2015c710355a0ab81306515a70af29e6aef3504 (commit)
      from  f9ccfae400324fdd88597ff81fba42715e50f19d (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 circ/selectbranchprinter.pl                        |    3 ++-
 .../intranet-tmpl/prog/en/includes/header.inc      |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 12:05:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 10:05:52 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6677
	created. v3.04.00-553-g92e7113
Message-ID: <E1R3mLn-0000qw-UP@git.koha-community.org>

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, new/bug_6677 has been created
        at  92e71131faf55e719f84c6e29314f5abc5714b57 (commit)

- Log -----------------------------------------------------------------
commit 92e71131faf55e719f84c6e29314f5abc5714b57
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sat Aug 6 07:15:11 2011 -0400

    bug 6677 - remove reference to 'debarred'
    
    The patron stats wizard had 'debarred' in the pull down
    for status, but it's called restricted everywhere else.
    This patch changes debarred to restricted.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 12:07:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 10:07:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-553-g92e7113
Message-ID: <E1R3mN4-0000t8-LI@git.koha-community.org>

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  92e71131faf55e719f84c6e29314f5abc5714b57 (commit)
      from  c2015c710355a0ab81306515a70af29e6aef3504 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/reports/borrowers_stats.tt     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 12:13:38 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 10:13:38 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_2891
	created. v3.04.00-554-g8474059
Message-ID: <E1R3mTK-0000xv-3b@git.koha-community.org>

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, new/bug_2891 has been created
        at  8474059769ae921c9dfb8249bc774ade606785fa (commit)

- Log -----------------------------------------------------------------
commit 8474059769ae921c9dfb8249bc774ade606785fa
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 22 12:23:05 2011 -0400

    Fix for Bug 2891, cannot manually enter date at reports/issues_stats.pl
    
    Removed unnecessary readonly attribute from date fields
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 12:14:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 10:14:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-554-g8474059
Message-ID: <E1R3mTq-0000zD-J5@git.koha-community.org>

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  8474059769ae921c9dfb8249bc774ade606785fa (commit)
      from  92e71131faf55e719f84c6e29314f5abc5714b57 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/reports/borrowers_stats.tt     |    4 ++--
 .../prog/en/modules/reports/issues_avg_stats.tt    |    8 ++++----
 .../prog/en/modules/reports/issues_stats.tt        |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 12:22:56 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 10:22:56 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6829
	created. v3.04.00-555-gcaae541
Message-ID: <E1R3mcK-00013i-Jp@git.koha-community.org>

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, new/bug_6829 has been created
        at  caae541135dedb5d0ccddbf8ffd31887f802332d (commit)

- Log -----------------------------------------------------------------
commit caae541135dedb5d0ccddbf8ffd31887f802332d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Sep 1 14:07:40 2011 +0200

    6829: Remove two warnings for opac-MARCdetail
    
    Remove two warnings from logfile by adding simple checks.
    
    Sept 1, revision: Clearing another warning (thx Owen) too.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 12:23:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 10:23:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-555-gcaae541
Message-ID: <E1R3mck-00014U-TS@git.koha-community.org>

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  caae541135dedb5d0ccddbf8ffd31887f802332d (commit)
      from  8474059769ae921c9dfb8249bc774ade606785fa (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 opac/opac-MARCdetail.pl |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 20:07:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 18:07:23 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-109-gcfd7bc0
Message-ID: <E1R3trn-0002EI-4z@git.koha-community.org>

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  cfd7bc00924c93b28abd398fcbe8725021f5f80d (commit)
       via  bd2f60295cbc47e4f4f50ed0f73858577108abdf (commit)
       via  9ea41c74681f6c960370235b91aec91dcc0f47fa (commit)
       via  340dc7b48f83cfd97a0856871d8bde49a038a07f (commit)
       via  275e5d872784cc35da3e4aa3be03f19bb6861b31 (commit)
       via  09ae2aa7e9158129cc4d9648810858bf25c685f2 (commit)
       via  14cb5908e89ce0ef9c64267d046f174f126a7f7e (commit)
       via  8550a2514a440c122a61b9c956543a918b4b2dad (commit)
       via  7c081866fa8c5b658753d1d90e2feda3551a4982 (commit)
       via  bf0fe173358f7f1680b1c9939db8298c8361b954 (commit)
       via  a219d961f6acb407d35267fa4990e26c81faaf27 (commit)
       via  390f4d483cb8b13d0214d8866b1c487b20de895e (commit)
       via  344c67147958d3db8a019c66c9f39f4f4096211f (commit)
       via  a68c5239938a7b33f590bbe3f7ed3affd577956c (commit)
       via  bdbf4f577a43a448a89dcbd68740000925a7fd4e (commit)
       via  f51a0460b0505ad413b32ff838568935d53f0096 (commit)
       via  6cd7e2dcb1775b4e3b94da16b75c3c98ed86002e (commit)
       via  f1c165158f8f482e4aedc515e9a7bebdf8619a46 (commit)
       via  3565cda55f22f764d0da8dfb942a37718a62a415 (commit)
       via  0dbe479931ffcdc0fadd3c45d0446477db045283 (commit)
       via  3dd92f781dca583ca02ec67166c06b4cdfc21fc5 (commit)
      from  aa2284e1113cb74b94c7da2fa43e423b690a9566 (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 cfd7bc00924c93b28abd398fcbe8725021f5f80d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Sep 1 14:07:40 2011 +0200

    6829: Remove two warnings for opac-MARCdetail
    
    Remove two warnings from logfile by adding simple checks.
    
    Sept 1, revision: Clearing another warning (thx Owen) too.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit caae541135dedb5d0ccddbf8ffd31887f802332d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit bd2f60295cbc47e4f4f50ed0f73858577108abdf
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 22 12:23:05 2011 -0400

    Fix for Bug 2891, cannot manually enter date at reports/issues_stats.pl
    
    Removed unnecessary readonly attribute from date fields
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 8474059769ae921c9dfb8249bc774ade606785fa)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9ea41c74681f6c960370235b91aec91dcc0f47fa
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sat Aug 6 07:15:11 2011 -0400

    bug 6677 - remove reference to 'debarred'
    
    The patron stats wizard had 'debarred' in the pull down
    for status, but it's called restricted everywhere else.
    This patch changes debarred to restricted.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 92e71131faf55e719f84c6e29314f5abc5714b57)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 340dc7b48f83cfd97a0856871d8bde49a038a07f
Author: Liz Rea <lrea at nekls.org>
Date:   Tue Sep 6 13:00:51 2011 -0500

    Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)
    
    This patch does a couple of things.
    
    1. Changes permission over all to set branch printer (change branch/Set Library) from "circulation" privileges to "view catalogue" permissions. Reasoning: anyone who has privileges to view catalogue could reasonably be expected to perhaps need to change the set branch, but you might have people who don't have circulate permissions who need to change the branch, centralized cataloguing, for example. Those people would never circ and wouldn't need circ privileges, but *would* need to be able to change the set branch.
    2. Changes the template flags to see the "Set Library" link with independent branches set from "manage users" to "manage users or edit catalogue." Reasoning: even with indy branches on, there might be reasons for catalogers to be able to change the set branch (that reason was the impetus for this patch in the first place).
    
    To test:
    Create a user with only "View Catalogue" Permissions (no circulate permissions), that user should be able to change set library with Independent branches OFF.
    
    With independent branches on, give a user edit catalogue permissions. That user should be able to change set library.
    
    I want to add that this patch was specifically written in response to chris_n's bug report. It may not be practical for these changes to be in mainline, but I haven't thought of any reasons why it would be explicitly bad. That doesn't mean there aren't some, though.
    
    Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c2015c710355a0ab81306515a70af29e6aef3504)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 275e5d872784cc35da3e4aa3be03f19bb6861b31
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Thu Jul 21 12:16:22 2011 +0100

    Bug 6620 Ensure autoflush is set on output filehandles
    
    stdout is by default buffered and a flush is only guaranteed on CR
    Sip responses are not CR terminated so we need to ensure autoflush
    is switched on  so that the filehandle is flushed after a print
    Otherwise this can manifest as self checks running slow or
    failing due to timeout (although in the log we see the response)
    
    Signed-off-by: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f9ccfae400324fdd88597ff81fba42715e50f19d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 09ae2aa7e9158129cc4d9648810858bf25c685f2
Author: Janusz Kaczmarek <januszop at gmail.com>
Date:   Wed May 18 22:35:57 2011 +0200

    Bug 6368: unimarc_field_4XX plugin does not work with new templates - corrected
    
    [2011.05.19] I confirm the bug and the solution
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 47aee699afbb4ad8aebc84e023a0e5c7fd441ec9)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 14cb5908e89ce0ef9c64267d046f174f126a7f7e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 13 12:30:05 2011 -0400

    Follow-up fix for Bug 6458, incorrect parsing result in translation processing
    
    Somehow some markup which should have been deleted by a previous
    patch has reappeared, messing up the display of the MARC editor.
    This patch removes that section again.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8550a2514a440c122a61b9c956543a918b4b2dad
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 13 09:33:05 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in
    CSV profiles template
    
    Also fixing improperly scoped template variable which prevented
    the current profile from being preselected under the edit tab.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 9dc11e418a3f48971de92f2722bd564738218c9f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7c081866fa8c5b658753d1d90e2feda3551a4982
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 13 09:01:54 2011 -0400

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

commit bf0fe173358f7f1680b1c9939db8298c8361b954
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 16:07:46 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing / branches
    
    Correction for branch admin template stops tag attribute markup from
    being passed to the template directly in favor of using template
    logic.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 3e1203c95e53422015885a2add288d5cbc9f8733)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a219d961f6acb407d35267fa4990e26c81faaf27
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 15:56:00 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
    
    Fixing improperly nested template logic inside HTML tags in
    clone circulation rules form.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 8bdab59bbad65bdb4b324fedc79c73b33066b0d3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 390f4d483cb8b13d0214d8866b1c487b20de895e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Sep 2 10:14:51 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    There is template logic in manage-marc-import.tt which is intended
    to set the "selected" option for the framework chooser ("Add new
    bibliographic records into this framework"). However, I can't see
    any place in the code which sends the "selected" variable to the
    template, and I can't see any circumstance in which a value would
    be passed to the template.
    
    This patch removes the "selected" variable from the template.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 0d5aaf0a7ca024d4ec5e1b7d554e0d813785fae4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 344c67147958d3db8a019c66c9f39f4f4096211f
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Aug 25 15:37:25 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Correction in opac holds template. Corrections made are logically
    consistent, but I couldn't reproduce the combination of factors
    to trigger the "disabled" attribute on the branch selector. In
    that respect this hasn't been tested 100%.
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 597240e878a2a9808ce103508a42d9ed34a11422)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a68c5239938a7b33f590bbe3f7ed3affd577956c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 10:54:07 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types
    
    Correction for patron-attr-types.tt stops tag attribute markup from
    being passed to the template directly in favor of using template
    logic.
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Read the patch and tested the page, didn't find any problems.
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit e1bbff6b7f9db37714fcdb69b03598600e222237)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit bdbf4f577a43a448a89dcbd68740000925a7fd4e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 10:53:24 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside HTML tags in the
    system preferences editor.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f51a0460b0505ad413b32ff838568935d53f0096
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 10:36:50 2011 -0400

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

commit 6cd7e2dcb1775b4e3b94da16b75c3c98ed86002e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 10:26:19 2011 -0400

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

commit f1c165158f8f482e4aedc515e9a7bebdf8619a46
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 10:06:03 2011 -0400

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

commit 3565cda55f22f764d0da8dfb942a37718a62a415
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 1 09:40:08 2011 -0400

    Fix for Bug 6458 - incorrect parsing result in translation processing
    
    Fixing improperly nested template logic inside markup in header.inc
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7950a8f5af10b905d1a53e14e69eb34ad430d29e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0dbe479931ffcdc0fadd3c45d0446477db045283
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 26 16:15:34 2011 -0400

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

commit 3dd92f781dca583ca02ec67166c06b4cdfc21fc5
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 21 08:35:38 2010 -0400

    Fix for Bug 5234 - Remove unused CSS files
    (cherry picked from commit 2d4d976f3dd5e9b36784562a02da25ae04122d86)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/SIP/Sip.pm                                      |    5 +-
 admin/branches.pl                                  |    6 +-
 admin/patron-attr-types.pl                         |   24 +-
 circ/selectbranchprinter.pl                        |    3 +-
 .../intranet-tmpl/prog/en/css/intranet-print.css   |  235 -------
 koha-tmpl/intranet-tmpl/prog/en/css/intranet.css   |  491 ---------------
 koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css  |  665 --------------------
 .../intranet-tmpl/prog/en/css/intranet2popup.css   |  551 ----------------
 .../intranet-tmpl/prog/en/css/pages/addbiblio.css  |   75 ---
 .../intranet-tmpl/prog/en/css/staff-global2.css    |  575 -----------------
 .../prog/en/includes/budgets-admin-search.inc      |    6 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |    8 +-
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt  |    8 +-
 .../en/modules/admin/branch_transfer_limits.tt     |    8 +-
 .../prog/en/modules/admin/branches.tt              |    7 +-
 .../prog/en/modules/admin/clone-rules.tt           |   12 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |   46 ++-
 .../prog/en/modules/admin/systempreferences.tt     |   71 ++-
 .../prog/en/modules/cataloguing/addbiblio.tt       |    1 -
 .../cataloguing/value_builder/unimarc_field_4XX.tt |    8 +-
 .../prog/en/modules/labels/spinelabel-print.tt     |    6 +-
 .../prog/en/modules/members/moremember.tt          |   14 +-
 .../prog/en/modules/reports/borrowers_stats.tt     |    6 +-
 .../prog/en/modules/reports/issues_avg_stats.tt    |    8 +-
 .../prog/en/modules/reports/issues_stats.tt        |    4 +-
 .../prog/en/modules/tools/csv-profiles.tt          |    9 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |    4 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |   33 +-
 opac/opac-MARCdetail.pl                            |   10 +-
 29 files changed, 224 insertions(+), 2675 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet-print.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2popup.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/addbiblio.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/staff-global2.css


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 21:04:25 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 19:04:25 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-112-g8411cf6
Message-ID: <E1R3ukz-0003HU-LR@git.koha-community.org>

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

From gitmaster at git.koha-community.org  Wed Sep 14 22:41:59 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 20:41:59 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6458
	updated. v3.04.00-514-g7cc412d
Message-ID: <E1R3wHP-0005HO-CH@git.koha-community.org>

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, new/bug_6458 has been updated
       via  7cc412d337245b5ffbbb94b5c503e6afd989a3ed (commit)
       via  7e8381c78c6ccffbe6d41d700fa46aa3ed8025ff (commit)
       via  143e3e6541b829c8c7e476526348502b05b204ee (commit)
       via  4324377c55f3c82f724fc08c364eb678ab0f5ffa (commit)
      from  362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0 (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 7cc412d337245b5ffbbb94b5c503e6afd989a3ed
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>

commit 7e8381c78c6ccffbe6d41d700fa46aa3ed8025ff
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>

commit 143e3e6541b829c8c7e476526348502b05b204ee
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>

commit 4324377c55f3c82f724fc08c364eb678ab0f5ffa
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>

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

Summary of changes:
 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 ++-
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |   49 +++++++++++---
 6 files changed, 103 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 14 22:43:03 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 14 Sep 2011 20:43:03 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-560-g6499cfc
Message-ID: <E1R3wIR-0005Iq-0b@git.koha-community.org>

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  6499cfc2c090b79516fa55ee23abbe1cda357150 (commit)
       via  7cc412d337245b5ffbbb94b5c503e6afd989a3ed (commit)
       via  7e8381c78c6ccffbe6d41d700fa46aa3ed8025ff (commit)
       via  143e3e6541b829c8c7e476526348502b05b204ee (commit)
       via  4324377c55f3c82f724fc08c364eb678ab0f5ffa (commit)
      from  caae541135dedb5d0ccddbf8ffd31887f802332d (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 6499cfc2c090b79516fa55ee23abbe1cda357150
Merge: caae541 7cc412d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Sep 15 08:42:56 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster

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

Summary of changes:
 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 ++-
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |   49 +++++++++++---
 6 files changed, 103 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 16 01:25:59 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 15 Sep 2011 23:25:59 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6318
	created. v3.04.00-561-gd43aa87
Message-ID: <E1R4LJe-0001gD-Ur@git.koha-community.org>

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, new/bug_6318 has been created
        at  d43aa87d35561266275d840fe890009d8a231772 (commit)

- Log -----------------------------------------------------------------
commit d43aa87d35561266275d840fe890009d8a231772
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>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 16 01:26:29 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 15 Sep 2011 23:26:29 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-561-gd43aa87
Message-ID: <E1R4LK9-0001hg-S8@git.koha-community.org>

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  d43aa87d35561266275d840fe890009d8a231772 (commit)
      from  6499cfc2c090b79516fa55ee23abbe1cda357150 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Creators/Layout.pm                              |    3 +-
 .../prog/en/modules/labels/label-edit-layout.tt    |   28 ++++-----
 labels/label-edit-layout.pl                        |   60 +++++++-------------
 3 files changed, 36 insertions(+), 55 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 16 02:23:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 16 Sep 2011 00:23:44 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-117-gd7aa3a4
Message-ID: <E1R4MDY-00031G-6u@git.koha-community.org>

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

From gitmaster at git.koha-community.org  Fri Sep 16 03:51:55 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 16 Sep 2011 01:51:55 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_4877
	updated. v3.04.00-454-g9d3a8d9
Message-ID: <E1R4Nat-0003to-5I@git.koha-community.org>

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, new/enh/bug_4877 has been updated
       via  9d3a8d98651c922a5cc68356cfb1adec58d46f82 (commit)
       via  95afdc957a8ec48b4b1713459a1f7b1539bc06f9 (commit)
      from  6534b5cf29ea044f405af976447fe67262780a0d (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 9d3a8d98651c922a5cc68356cfb1adec58d46f82
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Sep 14 19:03:58 2011 +1200

    Bug 4877 [ENH] [SIGNED-OFF] install generated man pages with build process
    
    This uses the docbook source files to generate the man pages, and
    installs them to their correct location when the packages are being
    built.
    
    This will make it easier for people to write man pages, thereby ensuring
    that people join in keeping documentation up to date.
    
    Note: adds docbook-xsl and xsltproc to the dependencies.
    Note2: applies on top of Magnus' other patch on this ticket.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 95afdc957a8ec48b4b1713459a1f7b1539bc06f9
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Tue Sep 13 08:25:36 2011 +0200

    Bug 4877 [ENH] Use DocBook for koha-common manual pages
    
    This patch
    - deletes debian/scripts/koha-create.8
    - adds debian/docs/koha-create.xml and koha-remove.xml
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 debian/control               |    2 +-
 debian/control.in            |    2 +-
 debian/docs/koha-create.xml  |  216 +++++++++++++++++++++++++++++++++++++++++
 debian/docs/koha-remove.xml  |   36 +++++++
 debian/koha-common.install   |    2 +-
 debian/rules                 |    5 +-
 debian/scripts/koha-create.8 |  221 ------------------------------------------
 7 files changed, 259 insertions(+), 225 deletions(-)
 create mode 100644 debian/docs/koha-create.xml
 create mode 100644 debian/docs/koha-remove.xml
 delete mode 100644 debian/scripts/koha-create.8


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 16 03:53:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 16 Sep 2011 01:53:50 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-564-g147ae6c
Message-ID: <E1R4Nck-0003vH-Qp@git.koha-community.org>

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  147ae6c665cd25a07471d90afcab3e38ce36d9e0 (commit)
       via  9d3a8d98651c922a5cc68356cfb1adec58d46f82 (commit)
       via  95afdc957a8ec48b4b1713459a1f7b1539bc06f9 (commit)
      from  d43aa87d35561266275d840fe890009d8a231772 (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 147ae6c665cd25a07471d90afcab3e38ce36d9e0
Merge: d43aa87 9d3a8d9
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Sep 16 13:53:40 2011 +1200

    Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster

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

Summary of changes:
 debian/control               |    2 +-
 debian/control.in            |    2 +-
 debian/docs/koha-create.xml  |  216 +++++++++++++++++++++++++++++++++++++++++
 debian/docs/koha-remove.xml  |   36 +++++++
 debian/koha-common.install   |    2 +-
 debian/rules                 |    5 +-
 debian/scripts/koha-create.8 |  221 ------------------------------------------
 7 files changed, 259 insertions(+), 225 deletions(-)
 create mode 100644 debian/docs/koha-create.xml
 create mode 100644 debian/docs/koha-remove.xml
 delete mode 100644 debian/scripts/koha-create.8


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 20 23:19:12 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 20 Sep 2011 21:19:12 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5675
	created. v3.04.00-565-g1a54fc3
Message-ID: <E1R67ii-0005Fw-84@git.koha-community.org>

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, new/bug_5675 has been created
        at  1a54fc3642ff885a852d197161974233a3fcf299 (commit)

- Log -----------------------------------------------------------------
commit 1a54fc3642ff885a852d197161974233a3fcf299
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 29 11:21:24 2011 +1200

    Bug 5675 : CheckReserves not honouring item level itemtypes preferences
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    With item level itypes activated only the item for which holds were
    allowed in circulation rules triggered the hold notice on checkin.
    
    Also checked that biblio level itype still trigered correctly.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 20 23:31:42 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 20 Sep 2011 21:31:42 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6766
	created. v3.04.00-566-g06a9391
Message-ID: <E1R67uo-0005QE-79@git.koha-community.org>

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, new/bug_6766 has been created
        at  06a939178ccbbcf1809c1b1e7bc1d12124165ff3 (commit)

- Log -----------------------------------------------------------------
commit 06a939178ccbbcf1809c1b1e7bc1d12124165ff3
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 23 12:18:44 2011 -0400

    Fix for Bug 6766 - Template variable scope errors in holds template
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 20 23:40:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 20 Sep 2011 21:40:15 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6842
	created. v3.04.00-567-g377f174
Message-ID: <E1R6835-0005YT-Tn@git.koha-community.org>

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, new/bug_6842 has been created
        at  377f174b0674b009945036c3ac3724378e12e9c5 (commit)

- Log -----------------------------------------------------------------
commit 377f174b0674b009945036c3ac3724378e12e9c5
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 15 10:12:27 2011 -0400

    Fix for Bug 6842 - Branch transfer limits broken
    
    - Changing library select form so that chosen library is preselected
    - Changing pager <form> to a <p> so that nested form tags don't
      conflict. It was the addition of the javascript table pager
      which broke the functionality on this page.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - It's possible to select a different library now. The pull down shows
    the chosen library correctly.
    - I can make changes and save them without any problems.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 20 23:43:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 20 Sep 2011 21:43:15 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-567-g377f174
Message-ID: <E1R685y-0005aC-U7@git.koha-community.org>

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  377f174b0674b009945036c3ac3724378e12e9c5 (commit)
       via  06a939178ccbbcf1809c1b1e7bc1d12124165ff3 (commit)
       via  1a54fc3642ff885a852d197161974233a3fcf299 (commit)
      from  147ae6c665cd25a07471d90afcab3e38ce36d9e0 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Reserves.pm                                     |   29 +++++++++++++++-----
 admin/branch_transfer_limits.pl                    |    1 +
 .../en/modules/admin/branch_transfer_limits.tt     |   12 +++++---
 .../prog/en/modules/reserve/request.tt             |    4 +-
 4 files changed, 33 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 20 23:48:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 20 Sep 2011 21:48:23 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6887
	created. v3.04.00-568-g9ee49d6
Message-ID: <E1R68Ax-0006dS-2Q@git.koha-community.org>

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, new/enh/bug_6887 has been created
        at  9ee49d65d46f12722af19e72576b187adbb72292 (commit)

- Log -----------------------------------------------------------------
commit 9ee49d65d46f12722af19e72576b187adbb72292
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Sep 20 15:32:14 2011 -0400

    Enh 6887: Add 'checked out from' column to issued items display tables
    
    Adds "checked out from" column to the right of "checked out on" on both
    circ/circulation.pl and members/moremembers.pl.  Columns are sortable with tablesort
    (though only on circ/circulation.pl if syspref enabled).
    
    The branch name is sourced from issues.branchcode.
    
    EDIT BY Owen Leonard: Adjusting table columns which are sorted by default
    to accommodate the new column.
    
    Things look good! Thanks!
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 20 23:49:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 20 Sep 2011 21:49:06 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-568-g9ee49d6
Message-ID: <E1R68Bd-0006v4-UZ@git.koha-community.org>

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  9ee49d65d46f12722af19e72576b187adbb72292 (commit)
      from  377f174b0674b009945036c3ac3724378e12e9c5 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 circ/circulation.pl                                |    1 +
 .../prog/en/includes/checkouts-table-footer.inc    |    2 +-
 .../prog/en/modules/circ/circulation.tt            |   12 +++++++++---
 .../prog/en/modules/members/moremember.tt          |   10 +++++++---
 members/moremember.pl                              |    1 +
 5 files changed, 19 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 21 05:00:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 21 Sep 2011 03:00:28 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6679
	created. v3.04.00-571-g6200d4a
Message-ID: <E1R6D2w-00044u-1b@git.koha-community.org>

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, new/bug_6679 has been created
        at  6200d4ae21a6e780fe221d0f873395f5d60c063c (commit)

- Log -----------------------------------------------------------------
commit 6200d4ae21a6e780fe221d0f873395f5d60c063c
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Tue Sep 20 17:40:36 2011 -0400

    Bug 6679 : fix 3 perl::critic warnings
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit fae07abcc69e430c84f7b4f3241c1fe21e7bd5ab
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Sep 17 08:02:54 2011 +0200

    Bug 6679 Followup for acqui/histsearch.pl
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 7cdea5de355e853f25300821cc641672443177de
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 8 20:29:05 2011 +1200

    Bug 6679 Fix scripts in admin & acqui to pass Perl::Critic
    
    Scripts in admin & acqui subdirectores weren't passing t/00-testcritic.t. This
    patch add admin & acqui scripts to test case and fix various errors related to
    Perl::Critic compliancy.
    
    - Fixing a style error to pass Perl::Critic, plus silencing a warn
    - More style errors, plus fixing a security issue
    - Explicitly using Carp
    
    Contrary to common belief, subroutine prototypes do not enable
    compile-time checks for proper arguments. Don't use them.
    
    Defining a named sub within another sub, does not prevent that
    subroutine being global
    
    Signed-off-by: Fr?d?ric Demians <frederic at tamil.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 21 05:03:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 21 Sep 2011 03:03:52 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-571-g6200d4a
Message-ID: <E1R6D6G-0004Jj-5q@git.koha-community.org>

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  6200d4ae21a6e780fe221d0f873395f5d60c063c (commit)
       via  fae07abcc69e430c84f7b4f3241c1fe21e7bd5ab (commit)
       via  7cdea5de355e853f25300821cc641672443177de (commit)
      from  9ee49d65d46f12722af19e72576b187adbb72292 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 acqui/addorderiso2709.pl                 |   19 +++++++++++++--
 acqui/basketgroup.pl                     |   36 +++++++++++++++++++++++++----
 acqui/histsearch.pl                      |   10 +++++---
 acqui/neworderempty.pl                   |    3 +-
 admin/authorised_values.pl               |    2 +-
 admin/preferences.pl                     |   19 +++++++--------
 circ/overdue.pl                          |    2 +-
 circ/ypattrodue-attr-search-authvalue.pl |    2 +-
 circ/ysearch.pl                          |    2 +-
 t/00-testcritic.t                        |    2 +-
 10 files changed, 69 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 21 23:12:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 21 Sep 2011 21:12:52 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6576
	created. v3.04.00-572-gc453a45
Message-ID: <E1R6U68-0005Tm-Oe@git.koha-community.org>

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, new/bug_6576 has been created
        at  c453a45f384ce87a8af4ab9339fb877b11a79105 (commit)

- Log -----------------------------------------------------------------
commit c453a45f384ce87a8af4ab9339fb877b11a79105
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Mon Sep 12 21:09:49 2011 +1200

    bug_6576: Submit when changing framework rather then reloading
    
    TransformHtmlToMarc(): changed interface - no point passing params when
    they can be accessed from $cgi
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 21 23:28:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 21 Sep 2011 21:28:13 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-572-gc453a45
Message-ID: <E1R6UKz-0005fK-4A@git.koha-community.org>

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  c453a45f384ce87a8af4ab9339fb877b11a79105 (commit)
      from  6200d4ae21a6e780fe221d0f873395f5d60c063c (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Biblio.pm                                       |   34 ++++++++++----------
 authorities/authorities.pl                         |    3 +-
 cataloguing/addbiblio.pl                           |   21 +++++++-----
 cataloguing/merge.pl                               |    3 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |    8 ++--
 5 files changed, 36 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 00:08:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 21 Sep 2011 22:08:28 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6360
	created. v3.04.00-573-g6e91a45
Message-ID: <E1R6Uxw-0006ra-Ag@git.koha-community.org>

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, new/bug_6360 has been created
        at  6e91a453aa5a693c7e15c6e82f14e66471b3ec98 (commit)

- Log -----------------------------------------------------------------
commit 6e91a453aa5a693c7e15c6e82f14e66471b3ec98
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Tue Sep 13 15:50:26 2011 +1200

    Bug 6360 - add some more sounds to some happenings on returns
    
    This adds an alert sound to various events around transfers and holds
    when items are being returned, to make it more apparent that attention
    is needed.
    
    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>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 00:14:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 21 Sep 2011 22:14:07 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6900
	created. v3.04.00-574-g65e65d7
Message-ID: <E1R6V3L-0007Nd-FQ@git.koha-community.org>

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, new/bug_6900 has been created
        at  65e65d7c37e052e6fa8253001f47c497e22e6fd3 (commit)

- Log -----------------------------------------------------------------
commit 65e65d7c37e052e6fa8253001f47c497e22e6fd3
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date:   Wed Sep 21 08:50:19 2011 -0700

    Bug 6900 - line break between available and reference items
    
    This patch adds a conditional line-break in the availability section of XSLT results.
    
    Signed off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 00:14:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 21 Sep 2011 22:14:44 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-574-g65e65d7
Message-ID: <E1R6V40-0007P1-Gu@git.koha-community.org>

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  65e65d7c37e052e6fa8253001f47c497e22e6fd3 (commit)
       via  6e91a453aa5a693c7e15c6e82f14e66471b3ec98 (commit)
      from  c453a45f384ce87a8af4ab9339fb877b11a79105 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   32 ++++++++++++++-----
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |    6 ++++
 2 files changed, 29 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 17:49:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 15:49:07 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-576-ga2ee644
Message-ID: <E1R6lWN-0007rp-6A@git.koha-community.org>

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  a2ee6443b9643ad0780ad62ef63d0a06d5c674f0 (commit)
       via  4fb88deaa7a0ada50480751cbfadcf1dde75d8eb (commit)
      from  65e65d7c37e052e6fa8253001f47c497e22e6fd3 (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 a2ee6443b9643ad0780ad62ef63d0a06d5c674f0
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date:   Fri Sep 2 16:21:23 2011 +0200

    Bug 3704: SIP Checkin of not checked out item returns error without reason
    
    Checking in an available item returns an error (which is correct) without
    giving a reason for the failure as screen_msg (aka AF field in SIP2 is empty).
    
    Based on code suggested by Patrick Langer <patrick.langer at easycheck.org>
    
    Signed-off-by: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 4fb88deaa7a0ada50480751cbfadcf1dde75d8eb
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Wed Sep 7 16:02:21 2011 +1200

    bug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available funds", as in "Already received"
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    To test:
    - add new fund for an active budget
    - order item, price 8.00
    - check funds page and acq home: committed amount should be 8.00
    - receive item, enter actual price 10.00
    - check funds page and acq home: spent amount should be 10.00
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Budgets.pm |    2 +-
 C4/SIP/ILS.pm |   16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 20:21:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 18:21:44 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_2534
	created. v3.04.00-577-gdc439dc
Message-ID: <E1R6nu4-0005e1-EK@git.koha-community.org>

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, new/bug_2534 has been created
        at  dc439dcb7bdcf27b45f4d51c3c4f79d19131120b (commit)

- Log -----------------------------------------------------------------
commit dc439dcb7bdcf27b45f4d51c3c4f79d19131120b
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 22 11:33:59 2011 -0400

    Alternate fix for Bug 2534 - Viewing items table on item edit screen requires horizontal scrolling
    
    This patch doesn't eliminate horizontal scrolling, but simplifies
    the situation:
    
    - The left-hand sidebar has been moved below the table of items.
    - The "overflow:scroll" style has been removed from the table of items.
      Having overflow set meant that it was often necessary to scroll twice
      to reach data in the table: once using the scrollbars on the table
      and again using the page's scrollbars.
    
    The NEKLS catalogers also extend their thanks for this fix.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 20:22:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 18:22:07 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-577-gdc439dc
Message-ID: <E1R6nuR-0005es-Fz@git.koha-community.org>

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  dc439dcb7bdcf27b45f4d51c3c4f79d19131120b (commit)
      from  a2ee6443b9643ad0780ad62ef63d0a06d5c674f0 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css  |   13 ++++++++++++-
 .../intranet-tmpl/prog/en/css/staff-global.css     |    3 ---
 .../prog/en/modules/cataloguing/additem.tt         |   19 ++++++++++---------
 3 files changed, 22 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 23:29:14 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 21:29:14 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6881
	created. v3.04.00-578-g4029e8e
Message-ID: <E1R6qpW-0006IV-G9@git.koha-community.org>

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, new/bug_6881 has been created
        at  4029e8ed755b58c7b3a25c162838c20f5a6ad149 (commit)

- Log -----------------------------------------------------------------
commit 4029e8ed755b58c7b3a25c162838c20f5a6ad149
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Sep 22 10:33:34 2011 +1200

    Bug 6881 - Not able to accept a suggestion (typo in template)
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Easy fix, works great.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 23:30:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 21:30:19 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-578-g4029e8e
Message-ID: <E1R6qqZ-0006Jw-MB@git.koha-community.org>

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  4029e8ed755b58c7b3a25c162838c20f5a6ad149 (commit)
      from  dc439dcb7bdcf27b45f4d51c3c4f79d19131120b (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/suggestion/suggestion.tt       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 23:49:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 21:49:15 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6755
	created. v3.04.00-580-gd607321
Message-ID: <E1R6r8t-0006l7-Ty@git.koha-community.org>

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, new/bug_6755 has been created
        at  d60732119c95eeb27af0a79adec4fcfa6d9c966e (commit)

- Log -----------------------------------------------------------------
commit d60732119c95eeb27af0a79adec4fcfa6d9c966e
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Thu Sep 22 11:05:13 2011 +0200

    Bug 6755 follow up
    
    Use C4::Templates::_get_template_file instead od C4::Output::_get_template_file
    in preferences.pl
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 6b8be20497dd877c4ba5c5278a89fd82fc0862a9
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Thu Aug 25 15:01:19 2011 +0200

    Bug 6755 Problems with switching languages
    
    This patch solves the situation that news is in another language than
    the Koha interface AND makes that themelanguage routine is always called
    the same way in order to prevent mixed display.
    
    It fixes also a bug related to language preselection based on web
    browser prefered language.
    
    September 9: Adjusted with input of Frederic Demians.
    
    Septembre 10: Avoid circular dependency, as pointed by Chris Cormack.
    Templates related functions are moved from C4::Output to C4::Templates
    
    Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 22 23:59:25 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 21:59:25 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-580-gd607321
Message-ID: <E1R6rIj-00072H-9g@git.koha-community.org>

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  d60732119c95eeb27af0a79adec4fcfa6d9c966e (commit)
       via  6b8be20497dd877c4ba5c5278a89fd82fc0862a9 (commit)
      from  4029e8ed755b58c7b3a25c162838c20f5a6ad149 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                            |    6 +-
 C4/Output.pm                          |  183 +--------------------------------
 C4/Templates.pm                       |  173 ++++++++++++++++++++++++++++++-
 C4/XSLT.pm                            |    5 +-
 about.pl                              |    2 +-
 admin/preferences.pl                  |    5 +-
 catalogue/moredetail.pl               |    2 +-
 catalogue/search.pl                   |    2 +-
 changelanguage.pl                     |    4 +-
 installer/InstallAuth.pm              |    2 +-
 misc/cronjobs/gather_print_notices.pl |    6 +-
 misc/exportauth.pl                    |    1 -
 opac/opac-changelanguage.pl           |    4 +-
 opac/opac-main.pl                     |   28 +-----
 opac/opac-search.pl                   |    2 +-
 tools/export.pl                       |    2 +-
 16 files changed, 196 insertions(+), 231 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 00:07:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 22:07:23 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_3941
	created. v3.04.00-582-gc5dfe7b
Message-ID: <E1R6rQR-0007LF-9x@git.koha-community.org>

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, new/bug_3941 has been created
        at  c5dfe7bb35d2b23a73fe7401cff01294852d36f7 (commit)

- Log -----------------------------------------------------------------
commit c5dfe7bb35d2b23a73fe7401cff01294852d36f7
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Sep 22 23:35:08 2011 +0200

    Bug 3941: Follow up
    
    Improving the notices field to make it possible
    - to expand more than one field at a time
    - hide the notice content with another click
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 042fd50313ecc448445ba61d4cd8552bdcc93201
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Sep 22 21:32:42 2011 +0200

    Bug 3941 - Combine Notices & Messaging Tabs
    
    Changes to notices tab to make it a full replacement for messages tab.
    Removes messages tab from patron account.
    
    - repairs view of patron address in left column (category description, branch)
    - shows some explanation, when there are no messages for a borrower
    - makes the notice an expandable field, a click on the subject will
      expand the field to show the message content
    - makes message status and message transport type translatable,
      by moving the possible values into the template
    - removes the messaging tab from various menus
    - removes the files that were associated with the messaging tab
    - preserves the line breaks in message content to improve readability
    
    Also fixes Bug 6593 - Some information missing from the "Notices" tab.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 00:44:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 22:44:06 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-582-gc5dfe7b
Message-ID: <E1R6rzx-0000JY-Co@git.koha-community.org>

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  c5dfe7bb35d2b23a73fe7401cff01294852d36f7 (commit)
       via  042fd50313ecc448445ba61d4cd8552bdcc93201 (commit)
      from  d60732119c95eeb27af0a79adec4fcfa6d9c966e (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    1 -
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |    1 -
 .../prog/en/includes/members-menu.inc              |    1 -
 .../prog/en/modules/members/messaging.tt           |   68 -------------
 .../prog/en/modules/members/notices.tt             |   51 ++++++++--
 members/messaging.pl                               |  102 --------------------
 members/notices.pl                                 |    4 +-
 7 files changed, 43 insertions(+), 185 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tt
 delete mode 100755 members/messaging.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 01:34:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 23:34:07 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6755
	updated. v3.04.00-581-g8e7b163
Message-ID: <E1R6smN-0002Cu-5B@git.koha-community.org>

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, new/bug_6755 has been updated
       via  8e7b1636086b6689e72905c5008841e585c04e8e (commit)
      from  d60732119c95eeb27af0a79adec4fcfa6d9c966e (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 8e7b1636086b6689e72905c5008841e585c04e8e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Sep 23 11:33:00 2011 +1200

    Bug 6755 follow up, fixing broken POD

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

Summary of changes:
 C4/Output.pm    |    9 +++++++++
 C4/Templates.pm |    6 ++----
 2 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 01:34:36 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 23:34:36 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-584-g2c09527
Message-ID: <E1R6smp-0002Ds-TS@git.koha-community.org>

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  2c09527abe0322c707c8a01a2195b7385d31b418 (commit)
       via  8e7b1636086b6689e72905c5008841e585c04e8e (commit)
      from  c5dfe7bb35d2b23a73fe7401cff01294852d36f7 (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 2c09527abe0322c707c8a01a2195b7385d31b418
Merge: c5dfe7b 8e7b163
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Sep 23 11:34:28 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

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

Summary of changes:
 C4/Output.pm    |    9 +++++++++
 C4/Templates.pm |    6 ++----
 2 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 01:48:18 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 22 Sep 2011 23:48:18 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6824
	created. v3.04.00-585-g9966d21
Message-ID: <E1R6t06-0002Jf-Kq@git.koha-community.org>

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, new/bug_6824 has been created
        at  9966d218ae1705b272841c721bf4355437ba5a44 (commit)

- Log -----------------------------------------------------------------
commit 9966d218ae1705b272841c721bf4355437ba5a44
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Aug 31 15:22:38 2011 +1200

    Bug 6824 - correctly check basket viewing permissions
    
    Previously you couldn't view baskets that you hadn't created, unless you
    were superlibrarian due to a bug. Now people with the right permissions
    can see the baskets.
    
    Applies to both 3.04.04 and master.
    
    Signed-off-by: Brendan <info at bywatersolutions.com>
    Signed-off-by: Melia Meggs <melia at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 03:46:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 01:46:57 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-585-g9966d21
Message-ID: <E1R6uqv-0003nx-BG@git.koha-community.org>

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  9966d218ae1705b272841c721bf4355437ba5a44 (commit)
      from  2c09527abe0322c707c8a01a2195b7385d31b418 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 acqui/basket.pl      |    2 +-
 acqui/booksellers.pl |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 04:18:59 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 02:18:59 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6679
	updated. v3.04.00-572-ge1bb9e5
Message-ID: <E1R6vLv-00045a-Cm@git.koha-community.org>

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, new/bug_6679 has been updated
       via  e1bb9e5137110c636334d4039b46c68bfd615b42 (commit)
      from  6200d4ae21a6e780fe221d0f873395f5d60c063c (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 e1bb9e5137110c636334d4039b46c68bfd615b42
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 21 15:52:23 2011 +1200

    Bug 6679 : Enable Critic tests for authorities and fixed resulting warnings
    
    Signed-off-by: Ian <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 authorities/authorities.pl |    8 ++++----
 authorities/detail.pl      |    2 +-
 t/00-testcritic.t          |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 04:19:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 02:19:19 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-587-g48d62dc
Message-ID: <E1R6vME-00046Q-TX@git.koha-community.org>

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  48d62dccfde25a7e19f662c94ecd37e7c69f289f (commit)
       via  e1bb9e5137110c636334d4039b46c68bfd615b42 (commit)
      from  9966d218ae1705b272841c721bf4355437ba5a44 (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 48d62dccfde25a7e19f662c94ecd37e7c69f289f
Merge: 9966d21 e1bb9e5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Sep 23 14:19:11 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6679' into kcmaster

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

Summary of changes:
 authorities/authorities.pl |    8 ++++----
 authorities/detail.pl      |    2 +-
 t/00-testcritic.t          |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 04:59:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 02:59:30 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_4877
	updated. v3.04.00-455-gca149ec
Message-ID: <E1R6vz8-0004NT-Oq@git.koha-community.org>

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, new/enh/bug_4877 has been updated
       via  ca149ec0bbd576cc9969ab793fc920998a904204 (commit)
      from  9d3a8d98651c922a5cc68356cfb1adec58d46f82 (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 ca149ec0bbd576cc9969ab793fc920998a904204
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Sep 22 14:36:42 2011 +1200

    Bug 4877 - note that the create-db (or related) options are required
    
    Also fix the example so that it is there.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 debian/docs/koha-create.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 05:37:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 03:37:13 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_5436
	created. v3.04.00-590-g061f2e9
Message-ID: <E1R6wZd-0004cA-Be@git.koha-community.org>

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, new/enh/bug_5436 has been created
        at  061f2e9251bcfbb90b2babf3dee8a725b1295ba8 (commit)

- Log -----------------------------------------------------------------
commit 061f2e9251bcfbb90b2babf3dee8a725b1295ba8
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date:   Fri Aug 5 14:33:11 2011 -0400

    Fix for Bug 5436 - Extended patron attributes display improvements
    
    Show patron attributes in the sidebar on circ and patron pages
    
    [Edit from Owen Leonard: This patch takes changes originally in
    Bug 5436 and isolates just the parts relating to display of
    patron attributes. Because function for pulling patron attributes
    was merged with the function for displaying address information
    in SetMemberInfosInTemplate() (also found in Bug 5749), I moved
    the call to GetBorrowerAttributes into the individual scripts.
    That keeps the functionality relating specifically to patron
    attributes separate from the proposed changes to displaying
    addresses.
    
    Because I think it's important to keep the display consistent,
    I added display of patron attributes to all pages which include
    the patron information sidebar.]
    
    Rebased for compatability with bug 3489 and database documentation by
    Ian Walls, 9-21-11
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 5e94de956610072d3d37bbbde1c8d48920414118
Merge: 48d62dc ca149ec
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Sep 23 15:01:21 2011 +1200

    Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 23 05:38:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 03:38:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-590-g061f2e9
Message-ID: <E1R6wak-0004dj-IU@git.koha-community.org>

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  061f2e9251bcfbb90b2babf3dee8a725b1295ba8 (commit)
       via  5e94de956610072d3d37bbbde1c8d48920414118 (commit)
       via  ca149ec0bbd576cc9969ab793fc920998a904204 (commit)
      from  48d62dccfde25a7e19f662c94ecd37e7c69f289f (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Members/AttributeTypes.pm                       |   31 +++++++++++++++++--
 C4/Members/Attributes.pm                           |    3 +-
 admin/patron-attr-types.pl                         |    9 +++++-
 circ/circulation.pl                                |    3 ++
 debian/docs/koha-create.xml                        |    4 +-
 .../0009-patron-attr-display-checkout.pl           |    7 ++++
 installer/data/mysql/kohastructure.sql             |    1 +
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    7 ++++
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |    7 ++++
 .../prog/en/modules/admin/patron-attr-types.tt     |    7 ++++-
 members/boraccount.pl                              |    6 +++-
 members/mancredit.pl                               |    3 ++
 members/maninvoice.pl                              |    3 ++
 members/member-flags.pl                            |    5 ++-
 members/member-password.pl                         |    7 +++-
 members/moremember.pl                              |    3 ++
 members/notices.pl                                 |    9 ++++--
 members/pay.pl                                     |    2 +
 members/readingrec.pl                              |    6 +++-
 19 files changed, 106 insertions(+), 17 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/0009-patron-attr-display-checkout.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 24 00:02:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 22:02:53 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6460
	created. v3.04.00-588-ga746e11
Message-ID: <E1R7Dpd-0003Af-66@git.koha-community.org>

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, new/bug_6460 has been created
        at  a746e11c1462df4567c007c8e73cf14a55af5ddb (commit)

- Log -----------------------------------------------------------------
commit a746e11c1462df4567c007c8e73cf14a55af5ddb
Author: MJ Ray <mjr at phonecoop.coop>
Date:   Thu Sep 22 19:27:43 2011 +0100

    Bug 6460: alternative fix, updating template and script instead of C4::Log
    
    Add some test cases and fix a bug in C4::Log found by in review.
    Thanks-to: Katrin Fischer.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Passes test, interface works as expected.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 24 00:03:38 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 22:03:38 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-592-g6b9fff6
Message-ID: <E1R7DqM-0003BQ-5N@git.koha-community.org>

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  6b9fff61fb7e96902c8d6afac906285bc1f4bb80 (commit)
       via  a746e11c1462df4567c007c8e73cf14a55af5ddb (commit)
      from  061f2e9251bcfbb90b2babf3dee8a725b1295ba8 (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 6b9fff61fb7e96902c8d6afac906285bc1f4bb80
Merge: 061f2e9 a746e11
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Sep 24 10:03:08 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6460' into kcmaster

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

Summary of changes:
 C4/Log.pm                                          |    3 +-
 .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |   85 +------------------
 t/db_dependent/Log.t                               |   52 ++++++++++++
 tools/viewlog.pl                                   |    6 +-
 4 files changed, 64 insertions(+), 82 deletions(-)
 create mode 100644 t/db_dependent/Log.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 24 00:11:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 22:11:01 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6870
	created. v3.04.00-593-g0920d96
Message-ID: <E1R7DxV-0003Dw-L4@git.koha-community.org>

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, new/enh/bug_6870 has been created
        at  0920d96767f1e366670e87b5d4275c5473595d52 (commit)

- Log -----------------------------------------------------------------
commit 0920d96767f1e366670e87b5d4275c5473595d52
Author: Liz Rea <lrea at nekls.org>
Date:   Wed Sep 14 14:56:03 2011 -0500

    Bug 6870 [enh] - allow opac-userupdate.pl to use the patron's email as 'from' address
    
    Patch makes it so that Koha sends patron update emails from the first valid patron email address, instead of from the KohaAdmin or branch email address.
    
    This patch should make it so that libraries can directly reply to patrons regarding patron updates.
    
    To test:
    
    Create a patron with no email address, do a patron update and observe the to: and from: - they should both be the KohaAdminEmail address.
    
    Add an email address to that same patron, and send a patron update. Observe the to: and from: - the from: should be the first valid email address of the patron, to should be the KohaAdminEmail address.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 24 00:24:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 23 Sep 2011 22:24:28 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-593-g0920d96
Message-ID: <E1R7EAW-0003GK-Mq@git.koha-community.org>

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  0920d96767f1e366670e87b5d4275c5473595d52 (commit)
      from  6b9fff61fb7e96902c8d6afac906285bc1f4bb80 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 opac/opac-userupdate.pl |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 24 09:46:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 24 Sep 2011 07:46:54 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6884
	created. v3.04.00-594-g3c0883f
Message-ID: <E1R7Mwo-000591-Mf@git.koha-community.org>

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, new/enh/bug_6884 has been created
        at  3c0883fac72368814e527325fc4e42d59f1339fc (commit)

- Log -----------------------------------------------------------------
commit 3c0883fac72368814e527325fc4e42d59f1339fc
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Sep 16 10:27:24 2011 -0400

    Fix for Bug 6884, Improve TinyMCE configuration on Koha News page
    
    - Increases the width of the editor to fill the space provided
    - Adjusts the layout of the toolbars to better fit the space
    - Adds a custom editor stylesheet to make the contents of the
      editor better match the expected output
    
    In changing the toolbar configuration I chose to make the display
    of each button explicit rather than assuming a default set of
    buttons and adding or subtracting from that. I think this is
    clearer for someone approaching the configuration trying to under-
    stand how buttons are displayed. I also chose to use the
    shorthand "|" instead of "separator" for brevity. This last change
    is the only one made to the edithelp configuration.
    
    [2011.09.20] F. Demians. This patch is compatible with bug 6649 patch,
    fixing help pages editing, and so could be applied before or after it.
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 24 09:48:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 24 Sep 2011 07:48:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-594-g3c0883f
Message-ID: <E1R7My2-00059n-Ej@git.koha-community.org>

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  3c0883fac72368814e527325fc4e42d59f1339fc (commit)
      from  0920d96767f1e366670e87b5d4275c5473595d52 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css    |    4 ++++
 .../intranet-tmpl/prog/en/modules/help/edithelp.tt |    9 +++++----
 .../prog/en/modules/tools/koha-news.tt             |   16 +++++++++-------
 3 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 24 09:50:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 24 Sep 2011 07:50:15 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6901
	created. v3.04.00-596-g5ecbdca
Message-ID: <E1R7N03-0005Aj-F2@git.koha-community.org>

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, new/enh/bug_6901 has been created
        at  5ecbdcab931117733f68f2ae4fc8c3aeda8653a0 (commit)

- Log -----------------------------------------------------------------
commit 5ecbdcab931117733f68f2ae4fc8c3aeda8653a0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Sep 21 22:39:51 2011 +0200

    Bug 6901: Add classes to XSLT detail view in OPAC
    
    This patch adds css classes to the fields in XSLT OPAC view so
    you can use OpacUserCss system preference for formatting
    and hiding fields.
    
    The css classes are named like the labels with additional underscores
    where necessary.
    
    Example:
    .publisher {
    display:none;
    }
    
    .other_title {
    font-weight: bold;
    }
    
    Note: Patch also moves some hard-coded CSS from Utils into the CSS file (only
    apples for 880 fields)
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit f297a3ecd295fe43ad4d167fad949e12e9491571
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Sep 21 21:17:16 2011 +0200

    Bug 6901: Add classes to XSLT detail view in STAFF
    
    This patch adds css classes to the fields in XSLT intranet views.
    Use OpacUserCss and IntranetUserCss system preferences for altering the styling of
    and hiding fields.
    
    The css classes are named like the labels with additional underscores
    where necessary.
    
    Example:
    .publisher {
    display:none;
    }
    
    .other_title {
    font-weight: bold;
    }
    
    Note: This patch also fixes the display of additional authors in field 880 (original
    scripts like Hebrew). This small additional problem was found as a side effect of testing, where the
    existence of an author in 880 would break the XSLT.
    
    Also moves some CSS from a style attribute into the CSS file for 880 fields.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    
    -- minor commit message edits (requested by KF)

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 24 09:50:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 24 Sep 2011 07:50:45 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-596-g5ecbdca
Message-ID: <E1R7N0X-0005Bu-Ss@git.koha-community.org>

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  5ecbdcab931117733f68f2ae4fc8c3aeda8653a0 (commit)
       via  f297a3ecd295fe43ad4d167fad949e12e9491571 (commit)
      from  3c0883fac72368814e527325fc4e42d59f1339fc (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/css/staff-global.css     |    8 +++
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   54 ++++++++++----------
 .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl |   25 +++++----
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   10 +++-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   54 ++++++++++----------
 .../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl     |   22 ++++----
 6 files changed, 95 insertions(+), 78 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 24 10:55:33 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 24 Sep 2011 08:55:33 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-597-g04b4136
Message-ID: <E1R7O1F-0005U8-0X@git.koha-community.org>

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  04b413623b3e4f10cfe74a054367082ffe5d3e99 (commit)
      from  5ecbdcab931117733f68f2ae4fc8c3aeda8653a0 (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 04b413623b3e4f10cfe74a054367082ffe5d3e99
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Sep 24 20:54:42 2011 +1200

    Fixing a bug in the templates that will break translation

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

Summary of changes:
 .../prog/en/modules/admin/patron-attr-types.tt     |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 25 04:06:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 02:06:23 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6773
	created. v3.04.00-598-g38ca8d6
Message-ID: <E1R7e6p-00009I-FM@git.koha-community.org>

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, new/bug_6773 has been created
        at  38ca8d6de18e630751dcae313d66f8546934fb5c (commit)

- Log -----------------------------------------------------------------
commit 38ca8d6de18e630751dcae313d66f8546934fb5c
Author: Joy Nelson <joy at bywatersolutions.com>
Date:   Thu Sep 22 22:36:48 2011 -0400

    Bug 6773: circ/ysearch.pl is unlimited
    
    Added a LIMIT 10 to the SQL statement
    Edited the circulation.pref stating that autocomplete returns the first 10 results at a time
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 25 04:07:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 02:07:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-598-g38ca8d6
Message-ID: <E1R7e7a-0000A7-JU@git.koha-community.org>

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  38ca8d6de18e630751dcae313d66f8546934fb5c (commit)
      from  04b413623b3e4f10cfe74a054367082ffe5d3e99 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 circ/ysearch.pl                                    |    3 ++-
 .../en/modules/admin/preferences/circulation.pref  |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 25 04:11:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 02:11:06 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6871
	created. v3.04.00-599-g9f688ab
Message-ID: <E1R7eBO-0000CF-Ez@git.koha-community.org>

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, new/enh/bug_6871 has been created
        at  9f688ab5bc84b3522002929c5f65f37581ec1749 (commit)

- Log -----------------------------------------------------------------
commit 9f688ab5bc84b3522002929c5f65f37581ec1749
Author: Liz Rea <lrea at nekls.org>
Date:   Thu Sep 22 13:59:11 2011 -0500

    Bug 6871 - add schema and sql library reports to guided reports sidebar
    
    This patch adds links for schema.k-c.org and the sql report library to the guided reports sidebar.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 25 04:11:27 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 02:11:27 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-599-g9f688ab
Message-ID: <E1R7eBj-0000F2-NC@git.koha-community.org>

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  9f688ab5bc84b3522002929c5f65f37581ec1749 (commit)
      from  38ca8d6de18e630751dcae313d66f8546934fb5c (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/includes/guided-reports-view.inc       |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 25 10:24:51 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 08:24:51 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-601-g5e0f0f4
Message-ID: <E1R7k15-0001FF-Ky@git.koha-community.org>

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  5e0f0f487af6a88b4a3814df442e4b6df69aa4fb (commit)
       via  62b76aa98c4f30ae32cb76ba0348e94d31e8464f (commit)
      from  9f688ab5bc84b3522002929c5f65f37581ec1749 (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 5e0f0f487af6a88b4a3814df442e4b6df69aa4fb
Merge: 9f688ab 62b76aa
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Sep 25 21:23:21 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_6205' into kcmaster

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

Summary of changes:
 C4/Templates.pm |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 25 10:26:31 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 08:26:31 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_4298
	created. v3.04.00-602-ge9673ea
Message-ID: <E1R7k2h-0001G6-Ht@git.koha-community.org>

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, new/enh/bug_4298 has been created
        at  e9673ea4961636f57962e8934941948c10bdb8e6 (commit)

- Log -----------------------------------------------------------------
commit e9673ea4961636f57962e8934941948c10bdb8e6
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 20 12:21:34 2011 -0400

    Fix for Bug 4298 - Title detail display: improve display of item level hold information
    
    Message changed for two cases, waiting and item-level hold:
    
    "Waiting for [ patron name ] at [ library] since [ date ]"
    
    "Item-level hold for [ patron name ] for delivery at [ library ] (placed [ date ])"
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Works as advertsed, is MUCH more clear.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 25 10:27:00 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 08:27:00 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-602-ge9673ea
Message-ID: <E1R7k3A-0001Gs-Cq@git.koha-community.org>

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  e9673ea4961636f57962e8934941948c10bdb8e6 (commit)
      from  5e0f0f487af6a88b4a3814df442e4b6df69aa4fb (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/catalogue/detail.tt            |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 00:27:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 22:27:22 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6649
	created. v3.04.00-603-gf640a3e
Message-ID: <E1R7xAQ-0003Kt-OD@git.koha-community.org>

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, new/bug_6649 has been created
        at  f640a3ea5fdd85695ff7a75240c830369b5aed73 (commit)

- Log -----------------------------------------------------------------
commit f640a3ea5fdd85695ff7a75240c830369b5aed73
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Sep 17 09:09:23 2011 +0200

    Bug 6649 Allow help screens editing
    
    edithelp.pl hadn't been updated to allow help screen editing.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Only a note: Apparently you need to be 'superlibrarian' permission
    to edit help pages.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 00:27:49 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 22:27:49 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-603-gf640a3e
Message-ID: <E1R7xAr-0003Lf-AM@git.koha-community.org>

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  f640a3ea5fdd85695ff7a75240c830369b5aed73 (commit)
      from  e9673ea4961636f57962e8934941948c10bdb8e6 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 edithelp.pl                                        |   31 +++++++++---------
 help.pl                                            |    4 ++-
 .../prog/en/modules/help/circ/circulation-home.tt  |   34 ++++++++++---------
 3 files changed, 37 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 00:31:08 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 22:31:08 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6781
	created. v3.04.00-604-g8b75f5b
Message-ID: <E1R7xE4-0003Mb-1D@git.koha-community.org>

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, new/enh/bug_6781 has been created
        at  8b75f5b38c00609299d7b6ed14bb5a08540f2675 (commit)

- Log -----------------------------------------------------------------
commit 8b75f5b38c00609299d7b6ed14bb5a08540f2675
Author: Meenakshi.R <meenakshi.r at osslabs.biz>
Date:   Mon Aug 29 16:36:25 2011 +0530

    Bug:6781--Log membership renewal
    
    If patron related logging is tuned on, log membership renewal
    
    Signed-off-by: Amit Gupta <amit.gupta at osslabs.biz>
    Signed-off-by: Nicole Engard <nengard at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 00:31:42 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 22:31:42 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-604-g8b75f5b
Message-ID: <E1R7xEb-0003Nm-Uv@git.koha-community.org>

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  8b75f5b38c00609299d7b6ed14bb5a08540f2675 (commit)
      from  f640a3ea5fdd85695ff7a75240c830369b5aed73 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Members.pm |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 00:56:18 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 25 Sep 2011 22:56:18 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-605-g7244d50
Message-ID: <E1R7xcQ-0003RP-7h@git.koha-community.org>

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  7244d5060be46f0b7154b897d28997970774957d (commit)
      from  8b75f5b38c00609299d7b6ed14bb5a08540f2675 (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 7244d5060be46f0b7154b897d28997970774957d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 26 11:55:58 2011 +1300

    Fixing a broken test

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

Summary of changes:
 t/db_dependent/Log.t |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 03:33:36 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 01:33:36 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6465
	created. v3.04.00-606-g0d480bb
Message-ID: <E1R804e-0004Kw-Bo@git.koha-community.org>

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, new/bug_6465 has been created
        at  0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8 (commit)

- Log -----------------------------------------------------------------
commit 0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8
Author: Janusz Kaczmarek <januszop at gmail.com>
Date:   Mon Jun 6 00:41:03 2011 +0300

    Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)
    
    A corrected version of the patch of 6 June 2011.
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 03:37:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 01:37:44 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-606-g0d480bb
Message-ID: <E1R808e-0004MT-JO@git.koha-community.org>

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  0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8 (commit)
      from  7244d5060be46f0b7154b897d28997970774957d (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 cataloguing/value_builder/unimarc_field_100.pl     |   18 +++++--
 cataloguing/value_builder/unimarc_field_105.pl     |   37 ++++++++------
 cataloguing/value_builder/unimarc_field_110.pl     |   24 ++++++---
 cataloguing/value_builder/unimarc_field_115a.pl    |   41 +++++++++------
 cataloguing/value_builder/unimarc_field_115b.pl    |   25 ++++++---
 cataloguing/value_builder/unimarc_field_116.pl     |   31 +++++++----
 cataloguing/value_builder/unimarc_field_117.pl     |   20 ++++++--
 cataloguing/value_builder/unimarc_field_120.pl     |   21 ++++++--
 cataloguing/value_builder/unimarc_field_121a.pl    |   12 ++++-
 cataloguing/value_builder/unimarc_field_125b.pl    |   10 +++-
 cataloguing/value_builder/unimarc_field_126a.pl    |   20 +++++--
 cataloguing/value_builder/unimarc_field_128b.pl    |    9 +++-
 cataloguing/value_builder/unimarc_field_130.pl     |   10 +++-
 cataloguing/value_builder/unimarc_field_135a.pl    |   10 +++-
 cataloguing/value_builder/unimarc_field_140.pl     |   43 +++++++++------
 cataloguing/value_builder/unimarc_leader.pl        |   19 +++++--
 .../cataloguing/value_builder/unimarc_field_100.tt |   10 ++--
 .../cataloguing/value_builder/unimarc_field_105.tt |   18 +++---
 .../cataloguing/value_builder/unimarc_field_110.tt |    2 +-
 .../value_builder/unimarc_field_115a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_116.tt |   54 ++++++++++----------
 .../cataloguing/value_builder/unimarc_field_117.tt |   30 ++++++------
 .../cataloguing/value_builder/unimarc_field_120.tt |   14 +++---
 .../value_builder/unimarc_field_121a.tt            |    4 +-
 .../value_builder/unimarc_field_125b.tt            |    2 +-
 .../value_builder/unimarc_field_126a.tt            |   14 +++---
 .../value_builder/unimarc_field_128b.tt            |    6 +-
 .../cataloguing/value_builder/unimarc_field_130.tt |    2 +-
 .../value_builder/unimarc_field_135a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_140.tt |   34 ++++++------
 .../cataloguing/value_builder/unimarc_leader.tt    |    6 +-
 31 files changed, 339 insertions(+), 211 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 03:40:38 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 01:40:38 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-607-g592bced
Message-ID: <E1R80BR-0004O3-Us@git.koha-community.org>

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  592bced8edfb6b71f1f19cd658910ccad6536ce9 (commit)
      from  0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8 (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 592bced8edfb6b71f1f19cd658910ccad6536ce9
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 26 14:40:13 2011 +1300

    Adding new developer to history

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

Summary of changes:
 docs/history.txt                                 |    3 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 12:14:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 10:14:28 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6755
	updated. v3.04.00-582-g3bb33fd
Message-ID: <E1R88Ci-0006Lf-2i@git.koha-community.org>

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, new/bug_6755 has been updated
       via  3bb33fd666d4d0eea26114b373874189edc82459 (commit)
      from  8e7b1636086b6689e72905c5008841e585c04e8e (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 3bb33fd666d4d0eea26114b373874189edc82459
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 26 23:13:18 2011 +1300

    Bug 6755 Follow up, fixing broken call to themelanguage

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

Summary of changes:
 C4/Reports/Guided.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 12:14:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 10:14:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-609-gc5fe424
Message-ID: <E1R88D7-0006MV-Nv@git.koha-community.org>

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  c5fe424c0f826a16caf3674b66df638d18bc6449 (commit)
       via  3bb33fd666d4d0eea26114b373874189edc82459 (commit)
      from  592bced8edfb6b71f1f19cd658910ccad6536ce9 (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 c5fe424c0f826a16caf3674b66df638d18bc6449
Merge: 592bced 3bb33fd
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 26 23:14:36 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

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

Summary of changes:
 C4/Reports/Guided.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 12:26:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 10:26:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6755
	updated. v3.04.00-583-g166f166
Message-ID: <E1R88OQ-0006PH-BL@git.koha-community.org>

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, new/bug_6755 has been updated
       via  166f1668d83974f9728728d269136095395f5200 (commit)
      from  3bb33fd666d4d0eea26114b373874189edc82459 (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 166f1668d83974f9728728d269136095395f5200
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Fri Sep 23 15:06:56 2011 +0200

    Bug 6755 Web browser default lang != syspref selected langs
    
    When Web browser default selected language doesn't belong to selected
    languages list defined by syspref (language / opaclanguages), web pages
    are returned in this language, which is wrong...
    
    This patch get this behavior:
    
    - If selected by user language is available (cookie), it is used.
    - Otherwise, language is set to default web browser language.
    - If this language doesn't belong to languages list (syspref),
      English is selected
    
    Some code cleanup.
    
    To test properly: don't forget to delete your cookies, and to test what
    happens without and with cookie.

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

Summary of changes:
 C4/Languages.pm |    1 -
 C4/Templates.pm |  160 ++++++++++++++++---------------------------------------
 2 files changed, 46 insertions(+), 115 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 12:27:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 10:27:47 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-611-g05be38d
Message-ID: <E1R88Pb-0006Q9-LN@git.koha-community.org>

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  05be38d438c242496a5c205fffefcfbdfdb63d46 (commit)
       via  166f1668d83974f9728728d269136095395f5200 (commit)
      from  c5fe424c0f826a16caf3674b66df638d18bc6449 (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 05be38d438c242496a5c205fffefcfbdfdb63d46
Merge: c5fe424 166f166
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 26 23:26:45 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Languages.pm |    1 -
 C4/Templates.pm |  160 ++++++++++++++++---------------------------------------
 2 files changed, 46 insertions(+), 115 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 20:04:49 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 18:04:49 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6755
	updated. v3.04.00-584-gc01fcbf
Message-ID: <E1R8FXt-0007nZ-Kc@git.koha-community.org>

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, new/bug_6755 has been updated
       via  c01fcbf97306d6fdcea001dbceaa4dc79c63239a (commit)
      from  166f1668d83974f9728728d269136095395f5200 (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 c01fcbf97306d6fdcea001dbceaa4dc79c63239a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Sep 27 07:04:02 2011 +1300

    Bug 6755 : Fixing a bug with guided reports

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

Summary of changes:
 C4/Reports/Guided.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 20:05:09 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 18:05:09 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-613-gcac6eb1
Message-ID: <E1R8FYD-0007oR-3v@git.koha-community.org>

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  cac6eb12502f82ed5a0b59a74cf84fa009ba0a26 (commit)
       via  c01fcbf97306d6fdcea001dbceaa4dc79c63239a (commit)
      from  05be38d438c242496a5c205fffefcfbdfdb63d46 (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 cac6eb12502f82ed5a0b59a74cf84fa009ba0a26
Merge: 05be38d c01fcbf
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Sep 27 07:05:03 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

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

Summary of changes:
 C4/Reports/Guided.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 21:22:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 19:22:28 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6755
	updated. v3.04.00-585-g05d9510
Message-ID: <E1R8Gl2-0008Eb-Lc@git.koha-community.org>

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, new/bug_6755 has been updated
       via  05d9510ca91016a78db38cf7bec0bb4a2ea46480 (commit)
      from  c01fcbf97306d6fdcea001dbceaa4dc79c63239a (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 05d9510ca91016a78db38cf7bec0bb4a2ea46480
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Sep 26 20:30:11 2011 +0200

    Bug 6755 Followup setlanguagecookie used in 2 places
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 installer/install.pl   |    3 ++-
 opac/changelanguage.pl |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 21:22:38 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 19:22:38 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-615-g9448315
Message-ID: <E1R8GlC-0008FS-Sc@git.koha-community.org>

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  944831555e89c8fdb4dc865764de51887a98a23b (commit)
       via  05d9510ca91016a78db38cf7bec0bb4a2ea46480 (commit)
      from  cac6eb12502f82ed5a0b59a74cf84fa009ba0a26 (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 944831555e89c8fdb4dc865764de51887a98a23b
Merge: cac6eb1 05d9510
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Sep 27 08:22:32 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

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

Summary of changes:
 installer/install.pl   |    3 ++-
 opac/changelanguage.pl |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 21:26:41 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 19:26:41 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-121-g841cb87
Message-ID: <E1R8Gp7-0008GT-MG@git.koha-community.org>

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  841cb87a1c1dce981e129efe9414d9a81d6b3e3f (commit)
       via  84f026f770761e71929cf0fc06f3d8317591be4b (commit)
       via  185067fbc3f0da3c55afb8601c4ca61ba494af05 (commit)
       via  75096ebdf2ad2423819909a27618d38a9a7b634b (commit)
      from  d7aa3a4434e3236ec623af92037284f205001ec6 (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 841cb87a1c1dce981e129efe9414d9a81d6b3e3f
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Sep 19 19:51:23 2011 +0200

    Suite trad fr-FR
    (cherry picked from commit 001d9606fe03646e54866bb893b687f62cae28d8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 84f026f770761e71929cf0fc06f3d8317591be4b
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Sep 19 07:25:17 2011 +0200

    Bug 6883 Update userpermisions.sql fr-FR file
    (cherry picked from commit 44d5c2722ea6910ab4a45fb108631220a55aea08)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 185067fbc3f0da3c55afb8601c4ca61ba494af05
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Sep 17 21:36:38 2011 +0200

    Mise ? jour fr-FR et da-DK
    (cherry picked from commit 65c3f1822b45b543d15f94e340b99f3f59e56431)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 75096ebdf2ad2423819909a27618d38a9a7b634b
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Fri Sep 16 10:53:56 2011 +0200

    3.4.5 .po files update at String Freeze
    (cherry picked from commit 4cc7756113db3cbf607143cacf7cca50ebd54b1b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 .../mysql/fr-FR/1-Obligatoire/userpermissions.sql  |   24 +-
 .../po/am-Ethi-i-opac-t-prog-v-3002000.po          | 2384 +-
 .../po/am-Ethi-i-staff-t-prog-v-3002000.po         |11135 ++--
 misc/translator/po/am-Ethi-pref.po                 |36492 +-----------
 .../po/ar-Arab-i-opac-t-prog-v-3002000.po          | 2384 +-
 .../po/ar-Arab-i-staff-t-prog-v-3002000.po         |11442 ++--
 misc/translator/po/ar-Arab-pref.po                 | 9224 +---
 .../translator/po/az-AZ-i-opac-t-prog-v-3002000.po | 2384 +-
 .../po/az-AZ-i-staff-t-prog-v-3002000.po           |11564 ++--
 misc/translator/po/az-AZ-pref.po                   |28503 +---------
 misc/translator/po/ben-i-opac-t-prog-v-3002000.po  | 2350 +-
 misc/translator/po/ben-i-staff-t-prog-v-3002000.po |11135 ++--
 misc/translator/po/ben-pref.po                     |54604 +-----------------
 .../po/bg-Cyrl-i-opac-t-prog-v-3002000.po          | 2741 +-
 .../po/bg-Cyrl-i-staff-t-prog-v-3002000.po         |12812 +++--
 misc/translator/po/bg-Cyrl-pref.po                 |24932 +-------
 .../translator/po/ca-VA-i-opac-t-prog-v-3002000.po | 2384 +-
 .../po/ca-VA-i-staff-t-prog-v-3002000.po           |11135 ++--
 misc/translator/po/ca-VA-pref.po                   |27904 +--------
 .../translator/po/cs-CZ-i-opac-t-prog-v-3002000.po | 2701 +-
 .../po/cs-CZ-i-staff-t-prog-v-3002000.po           |12929 +++--
 misc/translator/po/cs-CZ-pref.po                   |23000 +-------
 .../translator/po/da-DK-i-opac-t-prog-v-3002000.po |15407 ++++--
 .../po/da-DK-i-staff-t-prog-v-3002000.po           |22607 ++++----
 misc/translator/po/da-DK-pref.po                   |23388 +-------
 .../translator/po/de-DE-i-opac-t-prog-v-3002000.po | 2487 +-
 .../po/de-DE-i-staff-t-prog-v-3002000.po           |11621 ++--
 misc/translator/po/de-DE-pref.po                   |12769 +----
 .../translator/po/el-GR-i-opac-t-prog-v-3002000.po | 2462 +-
 .../po/el-GR-i-staff-t-prog-v-3002000.po           |11576 ++--
 misc/translator/po/el-GR-pref.po                   |22028 +-------
 .../translator/po/en-GB-i-opac-t-prog-v-3002000.po | 2447 +-
 .../po/en-GB-i-staff-t-prog-v-3002000.po           |11525 ++--
 misc/translator/po/en-GB-pref.po                   |45418 +-------------
 .../translator/po/en-NZ-i-opac-t-prog-v-3002000.po | 3141 +-
 .../po/en-NZ-i-staff-t-prog-v-3002000.po           |11529 ++--
 misc/translator/po/en-NZ-pref.po                   |52069 +---------------
 .../po/en-USACADEMIC-i-opac-t-prog-v-3002000.po    | 2697 +-
 .../translator/po/es-ES-i-opac-t-prog-v-3002000.po | 2483 +-
 .../po/es-ES-i-staff-t-prog-v-3002000.po           |11573 ++--
 misc/translator/po/es-ES-pref.po                   |61316 ++------------------
 misc/translator/po/eu-i-opac-t-prog-v-3002000.po   | 2352 +-
 misc/translator/po/eu-pref.po                      |33008 +----------
 .../po/fa-Arab-i-opac-t-prog-v-3002000.po          | 2736 +-
 misc/translator/po/fa-Arab-pref.po                 |59676 +------------------
 .../translator/po/fi-FI-i-opac-t-prog-v-3002000.po | 2462 +-
 .../po/fi-FI-i-staff-t-prog-v-3002000.po           |11254 ++--
 misc/translator/po/fi-FI-pref.po                   |45654 +--------------
 .../translator/po/fr-CA-i-opac-t-prog-v-3002000.po | 3912 +-
 .../po/fr-CA-i-staff-t-prog-v-3002000.po           |24914 +++------
 misc/translator/po/fr-CA-pref.po                   |46590 +--------------
 .../translator/po/fr-FR-i-opac-t-prog-v-3002000.po | 2643 +-
 .../po/fr-FR-i-staff-t-prog-v-3002000.po           |13308 +++---
 misc/translator/po/fr-FR-pref.po                   |57886 +-----------------
 misc/translator/po/gl-i-opac-t-prog-v-3002000.po   | 2715 +-
 misc/translator/po/gl-pref.po                      | 7340 +---
 .../po/he-Hebr-i-opac-t-prog-v-3002000.po          | 2713 +-
 misc/translator/po/he-Hebr-pref.po                 |56006 +-----------------
 misc/translator/po/hi-i-opac-t-prog-v-3002000.po   | 2384 +-
 misc/translator/po/hi-i-staff-t-prog-v-3002000.po  |11535 ++--
 misc/translator/po/hi-pref.po                      |29096 +---------
 .../translator/po/hr-HR-i-opac-t-prog-v-3002000.po | 2383 +-
 .../po/hr-HR-i-staff-t-prog-v-3002000.po           |11170 ++--
 misc/translator/po/hr-HR-pref.po                   |18959 +------
 .../translator/po/hu-HU-i-opac-t-prog-v-3002000.po | 2509 +-
 .../po/hu-HU-i-staff-t-prog-v-3002000.po           |11257 ++--
 misc/translator/po/hu-HU-pref.po                   | 1806 +-
 .../po/hy-Armn-i-opac-t-prog-v-3002000.po          | 2461 +-
 .../po/hy-Armn-i-staff-t-prog-v-3002000.po         |11419 ++--
 misc/translator/po/hy-Armn-pref.po                 |   20 +-
 .../translator/po/id-ID-i-opac-t-prog-v-3002000.po | 2662 +-
 .../po/id-ID-i-staff-t-prog-v-3002000.po           |10082 ++--
 misc/translator/po/id-ID-pref.po                   |   66 +-
 .../translator/po/is-IS-i-opac-t-prog-v-3002000.po | 2447 +-
 misc/translator/po/is-IS-pref.po                   |46345 +--------------
 .../translator/po/it-IT-i-opac-t-prog-v-3002000.po | 2481 +-
 .../po/it-IT-i-staff-t-prog-v-3002000.po           |11566 ++--
 misc/translator/po/it-IT-pref.po                   |62101 ++------------------
 .../po/ja-Jpan-JP-i-opac-t-prog-v-3002000.po       | 2742 +-
 misc/translator/po/ja-Jpan-JP-pref.po              |41852 +-------------
 .../po/ko-Kore-KP-i-opac-t-prog-v-3002000.po       | 2742 +-
 misc/translator/po/ko-Kore-KP-pref.po              |41062 +------------
 .../po/lo-Laoo-i-opac-t-prog-v-3002000.po          | 2714 +-
 .../po/lo-Laoo-i-staff-t-prog-v-3002000.po         |12812 +++--
 misc/translator/po/lo-Laoo-pref.po                 |52078 +----------------
 .../translator/po/mi-NZ-i-opac-t-prog-v-3002000.po | 2384 +-
 misc/translator/po/mi-NZ-pref.po                   |40376 +------------
 misc/translator/po/mon-i-opac-t-prog-v-3002000.po  | 2384 +-
 misc/translator/po/mon-i-staff-t-prog-v-3002000.po |11481 ++--
 misc/translator/po/mon-pref.po                     |27195 +--------
 misc/translator/po/mr-i-opac-t-prog-v-3002000.po   | 2712 +-
 misc/translator/po/mr-i-staff-t-prog-v-3002000.po  |12812 +++--
 misc/translator/po/mr-pref.po                      |32026 +----------
 .../translator/po/ms-MY-i-opac-t-prog-v-3002000.po | 2719 +-
 .../po/ms-MY-i-staff-t-prog-v-3002000.po           |11155 ++--
 misc/translator/po/ms-MY-pref.po                   |15634 +-----
 .../translator/po/nb-NO-i-opac-t-prog-v-3002000.po | 2483 +-
 .../po/nb-NO-i-staff-t-prog-v-3002000.po           |52983 +++++++++--------
 misc/translator/po/nb-NO-pref.po                   |20222 +------
 .../translator/po/ne-NE-i-opac-t-prog-v-3002000.po | 2699 +-
 .../po/ne-NE-i-staff-t-prog-v-3002000.po           |12812 +++--
 misc/translator/po/ne-NE-pref.po                   |14594 +-----
 .../translator/po/nl-BE-i-opac-t-prog-v-3002000.po | 2447 +-
 .../po/nl-BE-i-staff-t-prog-v-3002000.po           |11184 ++--
 misc/translator/po/nl-BE-pref.po                   | 4509 +--
 .../translator/po/nl-NL-i-opac-t-prog-v-3002000.po | 2448 +-
 .../po/nl-NL-i-staff-t-prog-v-3002000.po           |11135 ++--
 misc/translator/po/nl-NL-pref.po                   |35633 +-----------
 .../translator/po/nn-NO-i-opac-t-prog-v-3002000.po | 2387 +-
 .../po/nn-NO-i-staff-t-prog-v-3002000.po           |11425 ++--
 misc/translator/po/nn-NO-pref.po                   |53652 +----------------
 misc/translator/po/pbr-i-opac-t-prog-v-3002000.po  | 2701 +-
 misc/translator/po/pbr-i-staff-t-prog-v-3002000.po |12812 +++--
 misc/translator/po/pbr-pref.po                     |34712 +----------
 .../translator/po/pl-PL-i-opac-t-prog-v-3002000.po | 2463 +-
 .../po/pl-PL-i-staff-t-prog-v-3002000.po           |11407 ++--
 misc/translator/po/pl-PL-pref.po                   |55446 +-----------------
 misc/translator/po/prs-i-opac-t-prog-v-3002000.po  | 2707 +-
 misc/translator/po/prs-i-staff-t-prog-v-3002000.po |12862 +++--
 misc/translator/po/prs-pref.po                     |49458 +---------------
 .../translator/po/pt-BR-i-opac-t-prog-v-3002000.po | 2455 +-
 .../po/pt-BR-i-staff-t-prog-v-3002000.po           |11320 ++--
 misc/translator/po/pt-BR-pref.po                   |49062 +---------------
 .../translator/po/pt-PT-i-opac-t-prog-v-3002000.po | 2443 +-
 .../po/pt-PT-i-staff-t-prog-v-3002000.po           |11581 ++--
 misc/translator/po/pt-PT-pref.po                   |50249 +---------------
 .../translator/po/ro-RO-i-opac-t-prog-v-3002000.po | 2449 +-
 .../po/ro-RO-i-staff-t-prog-v-3002000.po           |11354 ++--
 misc/translator/po/ro-RO-pref.po                   |  949 +-
 .../translator/po/ru-RU-i-opac-t-prog-v-3002000.po | 5392 +-
 .../po/ru-RU-i-staff-t-prog-v-3002000.po           |40768 +++++++-------
 misc/translator/po/ru-RU-pref.po                   |   65 +-
 .../translator/po/sd-PK-i-opac-t-prog-v-3002000.po | 2350 +-
 .../po/sd-PK-i-staff-t-prog-v-3002000.po           |11135 ++--
 misc/translator/po/sd-PK-pref.po                   |38420 +------------
 .../translator/po/sk-SK-i-opac-t-prog-v-3002000.po | 2734 +-
 .../po/sk-SK-i-staff-t-prog-v-3002000.po           |13021 +++--
 misc/translator/po/sk-SK-pref.po                   | 6364 +--
 .../translator/po/sl-SI-i-opac-t-prog-v-3002000.po | 2697 +-
 .../po/sl-SI-i-staff-t-prog-v-3002000.po           |12812 +++--
 misc/translator/po/sl-SI-pref.po                   | 8162 +---
 .../translator/po/sq-AL-i-opac-t-prog-v-3002000.po | 2697 +-
 .../po/sq-AL-i-staff-t-prog-v-3002000.po           |12812 +++--
 misc/translator/po/sq-AL-pref.po                   |60528 +------------------
 .../po/sr-Cyrl-i-opac-t-prog-v-3002000.po          | 2734 +-
 .../po/sr-Cyrl-i-staff-t-prog-v-3002000.po         |12812 +++--
 misc/translator/po/sr-Cyrl-pref.po                 |37224 +-----------
 .../translator/po/sv-SE-i-opac-t-prog-v-3002000.po | 2447 +-
 .../po/sv-SE-i-staff-t-prog-v-3002000.po           |11154 ++--
 misc/translator/po/sv-SE-pref.po                   |31086 +---------
 .../translator/po/ta-LK-i-opac-t-prog-v-3002000.po | 2697 +-
 .../po/ta-LK-i-staff-t-prog-v-3002000.po           |12812 +++--
 misc/translator/po/ta-LK-pref.po                   |20910 +------
 misc/translator/po/tet-i-opac-t-prog-v-3002000.po  | 2475 +-
 misc/translator/po/tet-i-staff-t-prog-v-3002000.po |11345 ++--
 misc/translator/po/tet-pref.po                     |11945 +----
 .../po/th-THA-i-opac-t-prog-v-3002000.po           | 2448 +-
 .../po/th-THA-i-staff-t-prog-v-3002000.po          |11139 ++--
 misc/translator/po/th-THA-pref.po                  | 5446 +--
 .../translator/po/tl-PH-i-opac-t-prog-v-3002000.po | 2701 +-
 misc/translator/po/tl-PH-pref.po                   |52632 +----------------
 .../translator/po/tr-TR-i-opac-t-prog-v-3002000.po | 2490 +-
 .../po/tr-TR-i-staff-t-prog-v-3002000.po           |12102 ++--
 misc/translator/po/tr-TR-pref.po                   | 2709 +-
 .../translator/po/uk-UA-i-opac-t-prog-v-3002000.po | 5371 +-
 .../po/uk-UA-i-staff-t-prog-v-3002000.po           |40882 +++++++-------
 misc/translator/po/uk-UA-pref.po                   |   53 +-
 .../po/ur-Arab-i-opac-t-prog-v-3002000.po          | 2350 +-
 .../po/ur-Arab-i-staff-t-prog-v-3002000.po         |11135 ++--
 misc/translator/po/ur-Arab-pref.po                 |25646 +--------
 .../translator/po/vi-VN-i-opac-t-prog-v-3002000.po | 2701 +-
 .../po/vi-VN-i-staff-t-prog-v-3002000.po           |12812 +++--
 misc/translator/po/vi-VN-pref.po                   |33928 +----------
 .../po/zh-Hans-CN-i-opac-t-prog-v-3002000.po       | 2384 +-
 .../po/zh-Hans-CN-i-staff-t-prog-v-3002000.po      |11423 ++--
 misc/translator/po/zh-Hans-CN-pref.po              |39333 +------------
 .../po/zh-Hans-TW-i-opac-t-prog-v-3002000.po       | 3422 +-
 .../po/zh-Hans-TW-i-staff-t-prog-v-3002000.po      |18855 ++++---
 misc/translator/po/zh-Hans-TW-pref.po              |44709 +-------------
 179 files changed, 603366 insertions(+), 2257450 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 21:27:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 19:27:45 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6869
	created. v3.04.00-616-gc990575
Message-ID: <E1R8Gq9-0008Hg-Py@git.koha-community.org>

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, new/bug_6869 has been created
        at  c9905750e53e2e1615842ac696d5eeb0a8ac07fc (commit)

- Log -----------------------------------------------------------------
commit c9905750e53e2e1615842ac696d5eeb0a8ac07fc
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Wed Sep 14 21:44:49 2011 +0200

    Bug 6869 Batch item modification fails whit accented characters
    
    Corrects a problem in batchMod.pl when accented characters are used.
    
    When modifying multiple items in batchMod.pl, the batch modification
    fails if accented characters are used in any of the fields of the
    modification form.
    
    This is a port of Fr?d?rick Capovilla patch from 3.2 to 3.4 version
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 21:29:42 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 19:29:42 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-616-gc990575
Message-ID: <E1R8Gs2-0008JI-KC@git.koha-community.org>

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  c9905750e53e2e1615842ac696d5eeb0a8ac07fc (commit)
      from  944831555e89c8fdb4dc865764de51887a98a23b (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 tools/batchMod.pl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 21:38:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 19:38:48 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_4841
	created. v3.04.00-617-gd5a8862
Message-ID: <E1R8H0q-0008MX-8H@git.koha-community.org>

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, new/bug_4841 has been created
        at  d5a886201cd5e2f7615b92ad727ba136eb105bab (commit)

- Log -----------------------------------------------------------------
commit d5a886201cd5e2f7615b92ad727ba136eb105bab
Author: Larry Baerveldt <larry at bywatersolutions.com>
Date:   Thu Sep 22 16:36:05 2011 -0400

    Bug 4841: biblio-level itemtypes not searchable in advance search by itype
    
    Mapping 942$c into itype index along with 952$y; this allows for biblios without any items, but with a biblio-level itemtype to be retrieved in search. This is particularly useful for E-books or Serials without barcoded items.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 21:39:12 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 19:39:12 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-617-gd5a8862
Message-ID: <E1R8H1D-0008NJ-Uw@git.koha-community.org>

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  d5a886201cd5e2f7615b92ad727ba136eb105bab (commit)
      from  c9905750e53e2e1615842ac696d5eeb0a8ac07fc (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 etc/zebradb/marc_defs/marc21/biblios/record.abs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 22:43:49 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 20:43:49 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6801
	created. v3.04.00-618-g26acaf3
Message-ID: <E1R8I1k-00006p-Ul@git.koha-community.org>

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, new/bug_6801 has been created
        at  26acaf3dfa24598f9cce1d647079f779e714f874 (commit)

- Log -----------------------------------------------------------------
commit 26acaf3dfa24598f9cce1d647079f779e714f874
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Aug 31 14:43:09 2011 -0400

    Bug 6801: checkoverdues returns unnecessary fields, causing slowness
    
    Explicitly specifies which fields to return in C4::Overdues::checkoverdues
    SQL:  all of biblio, items, and issues, and everything in biblioitems
    EXCEPT marc, marcxml and timestamp.
    
    Bug 6801: member details page taking long time to load when many checkouts present
    
    This patch removes the call to GetMemberDetails in build_issue_data; this heavy-weight
    subroutine was being run for every single item a patron (or their relatives) have checked out.
    Instead, the borrowers first name, surname and cardnumber are added to the GetPendingIssues query.
    I believe this is reasonable since GetPendingIssues can now return issues for multiple borrowers.
    
    Also corrects the $borrowernumber used for GetIssuesCharges and CanItemBeRenewed; was using the borrower whose
    page we were on, NOT the borrower of that specific item (which would be different in the Relatives Checkouts tab).
    
    Template calls to [% scope.borrowername %] are now broken up into [% scope.firstname %] [% scope.surname %].
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    On my test data, a patron with 180 checkouts (without this patch) would take more than a minute to bring back the circulation.pl and moremember.pl pages.
    With this patch, the time is reduced to 5 or so seconds.
    
    Big ups to Ian for tenaciously hunting this one down.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Sep 26 22:44:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 20:44:30 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-618-g26acaf3
Message-ID: <E1R8I2P-00007a-Tb@git.koha-community.org>

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  26acaf3dfa24598f9cce1d647079f779e714f874 (commit)
      from  d5a886201cd5e2f7615b92ad727ba136eb105bab (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Members.pm                                      |    6 +++-
 C4/Overdues.pm                                     |   31 +++++++++++++++++++-
 circ/circulation.pl                                |    8 +----
 .../prog/en/modules/circ/circulation.tt            |   10 +++---
 .../prog/en/modules/members/moremember.tt          |    2 +-
 members/moremember.pl                              |    8 +----
 6 files changed, 45 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 00:14:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 22:14:48 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6923
	created. v3.04.00-619-gb9808b8
Message-ID: <E1R8JRn-0000M8-Uu@git.koha-community.org>

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, new/bug_6923 has been created
        at  b9808b86dfb8363406bc1ffe46f9a663e1813327 (commit)

- Log -----------------------------------------------------------------
commit b9808b86dfb8363406bc1ffe46f9a663e1813327
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Sep 27 11:14:06 2011 +1300

    Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 00:16:29 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 22:16:29 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6755
	updated. v3.04.00-619-gb9808b8
Message-ID: <E1R8JTR-0000NR-BE@git.koha-community.org>

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, new/bug_6755 has been updated
       via  b9808b86dfb8363406bc1ffe46f9a663e1813327 (commit)
       via  26acaf3dfa24598f9cce1d647079f779e714f874 (commit)
       via  d5a886201cd5e2f7615b92ad727ba136eb105bab (commit)
       via  c9905750e53e2e1615842ac696d5eeb0a8ac07fc (commit)
       via  944831555e89c8fdb4dc865764de51887a98a23b (commit)
       via  cac6eb12502f82ed5a0b59a74cf84fa009ba0a26 (commit)
       via  05be38d438c242496a5c205fffefcfbdfdb63d46 (commit)
       via  c5fe424c0f826a16caf3674b66df638d18bc6449 (commit)
       via  592bced8edfb6b71f1f19cd658910ccad6536ce9 (commit)
       via  0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8 (commit)
       via  7244d5060be46f0b7154b897d28997970774957d (commit)
       via  8b75f5b38c00609299d7b6ed14bb5a08540f2675 (commit)
       via  f640a3ea5fdd85695ff7a75240c830369b5aed73 (commit)
       via  e9673ea4961636f57962e8934941948c10bdb8e6 (commit)
       via  5e0f0f487af6a88b4a3814df442e4b6df69aa4fb (commit)
       via  62b76aa98c4f30ae32cb76ba0348e94d31e8464f (commit)
       via  9f688ab5bc84b3522002929c5f65f37581ec1749 (commit)
       via  38ca8d6de18e630751dcae313d66f8546934fb5c (commit)
       via  04b413623b3e4f10cfe74a054367082ffe5d3e99 (commit)
       via  5ecbdcab931117733f68f2ae4fc8c3aeda8653a0 (commit)
       via  f297a3ecd295fe43ad4d167fad949e12e9491571 (commit)
       via  3c0883fac72368814e527325fc4e42d59f1339fc (commit)
       via  0920d96767f1e366670e87b5d4275c5473595d52 (commit)
       via  6b9fff61fb7e96902c8d6afac906285bc1f4bb80 (commit)
       via  a746e11c1462df4567c007c8e73cf14a55af5ddb (commit)
       via  061f2e9251bcfbb90b2babf3dee8a725b1295ba8 (commit)
       via  5e94de956610072d3d37bbbde1c8d48920414118 (commit)
       via  ca149ec0bbd576cc9969ab793fc920998a904204 (commit)
       via  48d62dccfde25a7e19f662c94ecd37e7c69f289f (commit)
       via  e1bb9e5137110c636334d4039b46c68bfd615b42 (commit)
       via  9966d218ae1705b272841c721bf4355437ba5a44 (commit)
       via  2c09527abe0322c707c8a01a2195b7385d31b418 (commit)
       via  c5dfe7bb35d2b23a73fe7401cff01294852d36f7 (commit)
       via  042fd50313ecc448445ba61d4cd8552bdcc93201 (commit)
      from  05d9510ca91016a78db38cf7bec0bb4a2ea46480 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Log.pm                                          |    3 +-
 C4/Members.pm                                      |    7 +-
 C4/Members/AttributeTypes.pm                       |   31 +++++-
 C4/Members/Attributes.pm                           |    3 +-
 C4/Overdues.pm                                     |   31 ++++++-
 C4/Templates.pm                                    |   11 +-
 acqui/basket.pl                                    |    2 +-
 acqui/booksellers.pl                               |    2 +-
 admin/patron-attr-types.pl                         |    9 ++-
 authorities/authorities.pl                         |    8 +-
 authorities/detail.pl                              |    2 +-
 cataloguing/value_builder/unimarc_field_100.pl     |   18 +++-
 cataloguing/value_builder/unimarc_field_105.pl     |   37 ++++---
 cataloguing/value_builder/unimarc_field_110.pl     |   24 +++--
 cataloguing/value_builder/unimarc_field_115a.pl    |   41 +++++----
 cataloguing/value_builder/unimarc_field_115b.pl    |   25 +++--
 cataloguing/value_builder/unimarc_field_116.pl     |   31 ++++--
 cataloguing/value_builder/unimarc_field_117.pl     |   20 +++-
 cataloguing/value_builder/unimarc_field_120.pl     |   21 +++-
 cataloguing/value_builder/unimarc_field_121a.pl    |   12 ++-
 cataloguing/value_builder/unimarc_field_125b.pl    |   10 ++-
 cataloguing/value_builder/unimarc_field_126a.pl    |   20 +++-
 cataloguing/value_builder/unimarc_field_128b.pl    |    9 ++-
 cataloguing/value_builder/unimarc_field_130.pl     |   10 ++-
 cataloguing/value_builder/unimarc_field_135a.pl    |   10 ++-
 cataloguing/value_builder/unimarc_field_140.pl     |   43 +++++----
 cataloguing/value_builder/unimarc_leader.pl        |   19 +++-
 circ/circulation.pl                                |   11 +-
 circ/ysearch.pl                                    |    3 +-
 debian/docs/koha-create.xml                        |    4 +-
 docs/history.txt                                   |    3 +-
 edithelp.pl                                        |   34 ++++---
 etc/zebradb/marc_defs/marc21/biblios/record.abs    |    2 +-
 help.pl                                            |    8 +-
 .../0009-patron-attr-display-checkout.pl           |    7 ++
 installer/data/mysql/kohastructure.sql             |    1 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |    8 ++
 koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css    |    4 +
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    8 ++-
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |    8 ++-
 .../prog/en/includes/guided-reports-view.inc       |    5 +
 .../prog/en/includes/members-menu.inc              |    1 -
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    1 +
 .../prog/en/modules/admin/patron-attr-types.tt     |   11 ++-
 .../en/modules/admin/preferences/circulation.pref  |    1 +
 .../prog/en/modules/catalogue/detail.tt            |   10 +-
 .../cataloguing/value_builder/unimarc_field_100.tt |   10 +-
 .../cataloguing/value_builder/unimarc_field_105.tt |   18 ++--
 .../cataloguing/value_builder/unimarc_field_110.tt |    2 +-
 .../value_builder/unimarc_field_115a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_116.tt |   54 +++++-----
 .../cataloguing/value_builder/unimarc_field_117.tt |   30 +++---
 .../cataloguing/value_builder/unimarc_field_120.tt |   14 ++--
 .../value_builder/unimarc_field_121a.tt            |    4 +-
 .../value_builder/unimarc_field_125b.tt            |    2 +-
 .../value_builder/unimarc_field_126a.tt            |   14 ++--
 .../value_builder/unimarc_field_128b.tt            |    6 +-
 .../cataloguing/value_builder/unimarc_field_130.tt |    2 +-
 .../value_builder/unimarc_field_135a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_140.tt |   34 ++++----
 .../cataloguing/value_builder/unimarc_leader.tt    |    6 +-
 .../prog/en/modules/circ/circulation.tt            |   10 +-
 .../prog/en/modules/help/circ/circulation-home.tt  |   34 ++++---
 .../intranet-tmpl/prog/en/modules/help/edithelp.tt |    9 +-
 .../prog/en/modules/members/messaging.tt           |   68 -------------
 .../prog/en/modules/members/moremember.tt          |    2 +-
 .../prog/en/modules/members/notices.tt             |   51 ++++++++--
 .../prog/en/modules/tools/koha-news.tt             |   16 ++--
 .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |   85 +---------------
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   54 +++++-----
 .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl |   25 +++---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   10 ++-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   54 +++++-----
 .../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl     |   22 ++--
 members/boraccount.pl                              |    6 +-
 members/mancredit.pl                               |    3 +
 members/maninvoice.pl                              |    3 +
 members/member-flags.pl                            |    5 +-
 members/member-password.pl                         |    7 +-
 members/messaging.pl                               |  102 --------------------
 members/moremember.pl                              |   11 +-
 members/notices.pl                                 |    9 ++-
 members/pay.pl                                     |    2 +
 members/readingrec.pl                              |    6 +-
 opac/opac-userupdate.pl                            |    7 +-
 t/00-testcritic.t                                  |    2 +-
 t/db_dependent/Log.t                               |   55 +++++++++++
 tools/batchMod.pl                                  |    1 +
 tools/viewlog.pl                                   |    6 +-
 89 files changed, 795 insertions(+), 659 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/0009-patron-attr-display-checkout.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tt
 delete mode 100755 members/messaging.pl
 create mode 100644 t/db_dependent/Log.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 00:16:51 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 22:16:51 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-619-gb9808b8
Message-ID: <E1R8JTn-0000Op-GR@git.koha-community.org>

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  b9808b86dfb8363406bc1ffe46f9a663e1813327 (commit)
      from  26acaf3dfa24598f9cce1d647079f779e714f874 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 edithelp.pl |    3 ++-
 help.pl     |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 01:49:59 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 23:49:59 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.04-123-gc86b79f
Message-ID: <E1R8Kvv-0001bC-IS@git.koha-community.org>

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  c86b79fd601395caff3a8b43700cb4b08d093315 (commit)
       via  eefed66b1d5ca5052360fd1ec29a9a62f4102abc (commit)
      from  841cb87a1c1dce981e129efe9414d9a81d6b3e3f (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 c86b79fd601395caff3a8b43700cb4b08d093315
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Mon Sep 26 19:47:59 2011 -0400

    Updating Version Number to 3.04.05.000

commit eefed66b1d5ca5052360fd1ec29a9a62f4102abc
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Mon Sep 26 19:46:18 2011 -0400

    Release Notes for 3.04.05.000

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

Summary of changes:
 installer/data/mysql/updatedatabase.pl     |    6 +
 kohaversion.pl                             |    2 +-
 misc/release_notes/release_notes_3_4_5.txt |  242 ++++++++++++++++++++++++++++
 3 files changed, 249 insertions(+), 1 deletions(-)
 create mode 100644 misc/release_notes/release_notes_3_4_5.txt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 01:51:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 26 Sep 2011 23:51:28 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.04.05
	created. v3.04.05
Message-ID: <E1R8KxM-0001cJ-Gj@git.koha-community.org>

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 annotated tag, v3.04.05 has been created
        at  57880d01a12501ff279aabe3b7838b565fd3612e (tag)
   tagging  c86b79fd601395caff3a8b43700cb4b08d093315 (commit)
  replaces  v3.04.04
 tagged by  Chris Nighswonger
        on  Mon Sep 26 19:50:23 2011 -0400

- Log -----------------------------------------------------------------
v3.04.05
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAABAgAGBQJOgQ/bAAoJEEQBPavVIgJhZp8H/jaMcsKGSNfg4/rDxo/frrLN
zw5WryeOim1aHJ/nXJixOGc35jPb2r4DPqAF2jClSpe9PX7STVY4iVbIXOSv+SXz
EH2GcArxnusjVIsd5NQUP+3A7qJ3GmRv6A173bAVwxF9RF+DNu8Kh0lrB/iDsoiU
99P35H6k0Z6kXow0ADMRrIY6jk1lyMagTjf7AKCD+Wd4WyupbmeczKvDbTpy/f0A
AYhxa/lFbsHbuXm6t1gyqc//OSbuLcYnpmKiXPVrO4MPzOmgx16JpGTvo/+Ktuu/
KLhiZfCiYr+q4oGovXYyzsl4oHslM/ItbGSTxf/MLv7yQtcji7TrI6Gb997ineY=
=83zk
-----END PGP SIGNATURE-----

Alex Arnaud (2):
      bug 4966: Add a button in parcel.pl for confirm end receiving
      Bug 4966 - follow up - add xhtml closure for input tags

Brett Wilkins (1):
      bug 6724: enable decimals on values greater than 1

Chris Cormack (17):
      Bug 6703 : Link to invoice broken
      150th developer!!!
      Fixing typo in history doc
      Bug 5866 : Updated patch to speed up holds awaiting pickup
      Updating about page and history
      Bug 6528 : Cataloguing search not showing location for available items
      Bug 5524 : Cant delete list from the second page of lists
      Bug 6704 : Escaping html in the merging records, so " don't break the merge
      Bug 6656 : Fix for advanced search not respecting default sort order
      Bug 6834 : Removing last of the $template->{param_map}
      Updating history and about file
      Updating about file and history doc
      Bug 6732 : Showing the bibliographic title on the manual invoices line
      Bug 6555 : only 10 lists show in the staff client
      Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing
      Follow up for 6665 : Fixing the hide_marc pref also
      While testing the commits for 6716 I discovered a couple of missing

Chris Nighswonger (3):
      Updating Version Number to 3.04.04.001
      Release Notes for 3.04.05.000
      Updating Version Number to 3.04.05.000

Christophe Croullebois (1):
      Bug 6121: Holds awaiting pickup

Colin Campbell (3):
      Bug 6562: Silence runtime error in reserve/request.pl
      Bug 6733 - Change return page after printing routing slip
      Bug 6620 Ensure autoflush is set on output filehandles

Fr?d?ric Demians (5):
      Bug 6750 Guarantor search broken on translated templates
      3.4.5 .po files update at String Freeze
      Mise ? jour fr-FR et da-DK
      Bug 6883 Update userpermisions.sql fr-FR file
      Suite trad fr-FR

Fr?d?rick Capovilla (1):
      Bug 6479 Converts all the serialseq variables to UTF-8.

Henri-Damien LAURENT (1):
      bug 6834 followup removing param_map

Ian Walls (4):
      Bug 6351: Cannot delete library-specific holds polices and checkout limits
      Bug 6256: Many bib1 attributes missing
      Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
      Bug 6863: Shelf Browser images not showing up

Janusz Kaczmarek (1):
      Bug 6368: unimarc_field_4XX plugin does not work with new templates - corrected

Katrin Fischer (17):
      Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
      Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)
      Bug 6458: Incorrect translation processing - doc-head-close/open.inc
      Bug 6458: Incorrect translation processing / overdue.tt
      Bug 6458: Incorrect translation processing / review.tt
      Bug 6458: Incorrect translation processing / authorities.tt
      Bug 6458: Incorrect translation processing / 3x reports/...
      Bug 6458: Incorrect translation processing - masthead.inc
      Bug 6458: Incorrect translation processing / acqui/...
      Bug 6458: Incorrect translation processing / cataloguing/...
      Bug 6458: Incorrect translation processing / opac-detail.tt
      Bug 6458: Incorrect translation processing - rotating_collections/...
      Bug 6458: Incorrect translation processing / serials/...
      Bug 6458: Incorrect translation processing / sco-main.tt
      Bug 6458: Incorrect translation processing / suggestion
      Bug 6458: Incorrect translation processing / results
      Fix for Bug 6458 Follow-up for memberentrygen.tt

Liz Rea (1):
      Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)

Magnus Enger (4):
      Bug 6540 - Followup - koha-create would die without --configfile
      Bug 6516 - Make borrowernumber of staff user configurable in koha-create
      Bug 4877 [ENH] - Update man page for koha-create
      Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL

Marcel de Rooy (3):
      6747 Checks in opac-export
      6256 Follow up fixing typo
      6829: Remove two warnings for opac-MARCdetail

Maxime Pelletier (1):
      Bug 6794 : Fixing a bug with member flags in IE

Nicole C. Engard (5):
      bug 6538 update letter.pl help file
      Bug 6662: Remove Dewey Specific References in Sort
      bug4966 - follow up to 4966 changes language from 'end' to 'finish'
      bug 6677 - remove reference to 'debarred'
      Bug 5252 - Phone labels on patron creation

Owen Leonard (40):
      Fix for Bug 6640, Locations not showing in circ reports
      Fix for Bug 6754, Improve breadcrumbs on lists pages
      Fix for Bug 6753, Markup corrections and improvements for label export window
      Fix for Bug 6728, Table sorter for receiving acquisitions
      Fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
      Fix for Bug 6602 - Reports dictionary doesn't properly recognize text columns
      Follow-up fix for Bug 5498, Standardize markup and style of pagination menus
      Follow-up to Bug 4868, Improve controls for cloning and deleting subfields
      Fix for Bug 6695 - Layout of patron category add/edit form slightly broken
      Follow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
      Follow-up fix for Bug 6753, Markup corrections and improvements for label export window
      Fix for Bug 4419 - cannot change module for notice templates
      Fix for Bug 6791 - editing list with apostrophe loses text
      Fix for Bug 6652, Zip showing in funny place on libraries admin
      Fix for Bug 6696, New category button broken when no categories defined
      Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed
      Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
      Fix for Bug 6768, Two unused include files can be removed
      Fix for Bug 5028 - Remove references to catmaintain.pl
      Fix for Bug 5234 - Remove unused CSS files
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
      Fix for Bug 6458 - incorrect parsing result in translation processing / branches
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Follow-up fix for Bug 6458, incorrect parsing result in translation processing
      Fix for Bug 2891, cannot manually enter date at reports/issues_stats.pl
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing

Paul Poulain (1):
      Bug 6121: follow-up = using overloo instead of reserveloo

Robin Sheat (5):
      Bug 6275 - allow automated backups for packages
      Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements
      Bug 5602 - [3.4.x] Rewrite of package building script
      Bug 6651 - fix splitting of names when updating to 3.4
      Bug 6129 - [3.4.x] this adds an ISSN to serialssolutions URLs

Salvador Zaragoza Rubio (1):
      Bug 6727 - Change on exporting and importing csv to deal with spurious CR/LF

Srdjan Jankovic (1):
      bug_6318: Always give predefined fields drop downs on label layout edit

Steven Callender (1):
      Bug 6822: fix RIS export from OPAC

Tomas Cohen Arazi (1):
      Bug 6744 - Acknowledge the actual es-ES translators

Ulrich Kleiber (1):
      Bug 6765: sip2 unicode checksum

Ward van Wanrooij (1):
      Bug 6723 : import-framework-crlf

preprod34 (1):
      Bug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct language directory.

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 10:36:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 27 Sep 2011 08:36:04 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6872
	created. v3.04.00-620-g5d5c4a6
Message-ID: <E1R8T92-0003wU-3F@git.koha-community.org>

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, new/bug_6872 has been created
        at  5d5c4a67ec5c91770583edb38ce0213dfa6119c7 (commit)

- Log -----------------------------------------------------------------
commit 5d5c4a67ec5c91770583edb38ce0213dfa6119c7
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 15 09:42:38 2011 -0400

    Fix for Bug 6872 - Can't set default SMS messaging options for patron category
    
    Passing SMS driver preference value to the template so that SMS
    options can be displayed when appropriate.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 10:39:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 27 Sep 2011 08:39:06 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-620-g5d5c4a6
Message-ID: <E1R8TBy-0003yi-Ro@git.koha-community.org>

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  5d5c4a67ec5c91770583edb38ce0213dfa6119c7 (commit)
      from  b9808b86dfb8363406bc1ffe46f9a663e1813327 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 admin/categorie.pl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 22:24:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 27 Sep 2011 20:24:44 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6927
	created. v3.04.00-621-g085de44
Message-ID: <E1R8eCq-0006dc-8P@git.koha-community.org>

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, new/bug_6927 has been created
        at  085de44ebdc5bf6431c59b3e60af0277891cd19d (commit)

- Log -----------------------------------------------------------------
commit 085de44ebdc5bf6431c59b3e60af0277891cd19d
Author: Liz Rea <lrea at nekls.org>
Date:   Tue Sep 27 09:08:33 2011 -0500

    Bug 6927-- Typo in C4::Overdues.pm
    
    Corrected a small typo in overdues.pm to fix a "Undefined subroutine &C4::Members::checkoverdues called at /home/koha/kohaclone/C4/Members.pm line 511." when making calls to GetMemberDetails
    
    This fix suggested by Elliot Davis of UT Tyler, and he did the testing -- I'm just submitting the fix to master for him.  :)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 22:25:21 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 27 Sep 2011 20:25:21 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6801
	updated. v3.04.00-621-g085de44
Message-ID: <E1R8eDR-0006eY-Lu@git.koha-community.org>

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, new/bug_6801 has been updated
       via  085de44ebdc5bf6431c59b3e60af0277891cd19d (commit)
       via  5d5c4a67ec5c91770583edb38ce0213dfa6119c7 (commit)
       via  b9808b86dfb8363406bc1ffe46f9a663e1813327 (commit)
      from  26acaf3dfa24598f9cce1d647079f779e714f874 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Overdues.pm     |    2 +-
 admin/categorie.pl |    1 +
 edithelp.pl        |    3 ++-
 help.pl            |    4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 22:26:02 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 27 Sep 2011 20:26:02 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-621-g085de44
Message-ID: <E1R8eE6-0006fR-Jt@git.koha-community.org>

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  085de44ebdc5bf6431c59b3e60af0277891cd19d (commit)
      from  5d5c4a67ec5c91770583edb38ce0213dfa6119c7 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Overdues.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 22:50:09 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 27 Sep 2011 20:50:09 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6871
	updated. v3.04.00-600-g69dad72
Message-ID: <E1R8ebR-0006kl-Rg@git.koha-community.org>

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, new/enh/bug_6871 has been updated
       via  69dad7258b08669e9d0a8110f05d7a5ef31b4196 (commit)
      from  9f688ab5bc84b3522002929c5f65f37581ec1749 (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 69dad7258b08669e9d0a8110f05d7a5ef31b4196
Author: Thatcher Rea <thatcher.rea at gmail.com>
Date:   Tue Sep 27 15:06:33 2011 -0500

    Bug 6871 - Have a link to the schema page on the reports page
    
    Adds schema and reports library to reports-home.tt
    
    To Test: Verify that schema and report library links are visible on reports-home.pl
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Works as advertised, links are correct.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../prog/en/modules/reports/reports-home.tt        |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 22:51:12 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 27 Sep 2011 20:51:12 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-623-ged32880
Message-ID: <E1R8ecS-0006lj-Mn@git.koha-community.org>

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  ed328807c37c452bc700295e823170721905053c (commit)
       via  69dad7258b08669e9d0a8110f05d7a5ef31b4196 (commit)
      from  085de44ebdc5bf6431c59b3e60af0277891cd19d (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 ed328807c37c452bc700295e823170721905053c
Merge: 085de44 69dad72
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 28 09:51:05 2011 +1300

    Merge remote-tracking branch 'kc/new/enh/bug_6871' into kcmaster

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

Summary of changes:
 .../prog/en/modules/reports/reports-home.tt        |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 27 22:53:59 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 27 Sep 2011 20:53:59 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-624-g405ee68
Message-ID: <E1R8ef9-0006mo-3F@git.koha-community.org>

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  405ee6844d835322621bad4cfcfa8c359e8878f7 (commit)
      from  ed328807c37c452bc700295e823170721905053c (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 405ee6844d835322621bad4cfcfa8c359e8878f7
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 28 09:53:34 2011 +1300

    Updating history and about file

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

Summary of changes:
 docs/history.txt                                 |    2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 28 09:31:31 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 28 Sep 2011 07:31:31 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6673
	created. v3.04.00-625-g973371a
Message-ID: <E1R8oc7-0000ea-DJ@git.koha-community.org>

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, new/bug_6673 has been created
        at  973371a68b1c2a8af7d90afab8db15bda567f606 (commit)

- Log -----------------------------------------------------------------
commit 973371a68b1c2a8af7d90afab8db15bda567f606
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Sep 21 11:08:33 2011 -0400

    Bug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
    
    In the 5 places in the label editor, the user's current branch is determined by taking
    the LoginBranchname and doing a reverse look up for the branchcode.  This is an unnecessary
    query, since C4::Context->userenv has the immediate access to the branchcode; this is how
    it's summoned in all other points in the Koha code.
    
    This addresses bug 6673 because, since the move to T:T, the call in tools/manage-marc-import.pl
    has used in correct syntax:  $template->param('LoginBranchname') instead of $template->{VARS}->param('LoginBranchname')
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 28 09:36:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 28 Sep 2011 07:36:13 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-625-g973371a
Message-ID: <E1R8ogf-0000fM-MK@git.koha-community.org>

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  973371a68b1c2a8af7d90afab8db15bda567f606 (commit)
      from  405ee6844d835322621bad4cfcfa8c359e8878f7 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 labels/label-edit-batch.pl  |    2 +-
 labels/label-manage.pl      |    2 +-
 patroncards/edit-batch.pl   |    2 +-
 patroncards/manage.pl       |    2 +-
 tools/manage-marc-import.pl |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 29 22:19:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 29 Sep 2011 20:19:30 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6633
	created. v3.04.00-626-ga291cc5
Message-ID: <E1R9N4s-0007OE-4m@git.koha-community.org>

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, new/bug_6633 has been created
        at  a291cc52ca79ed11e0032e73b380b17f3bf308cb (commit)

- Log -----------------------------------------------------------------
commit a291cc52ca79ed11e0032e73b380b17f3bf308cb
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Sep 27 14:09:45 2011 -0400

    Bug 6633: SCO return button doesn't work
    
    A template toolkit scope issue was preventing the Renew button from working properly, as well as displaying
    the fines column even if no fines column header was displaying.
    
    This patch adjusts the scope of several T:T variables on the sco-main template to fix this
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 29 22:19:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 29 Sep 2011 20:19:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-626-ga291cc5
Message-ID: <E1R9N5F-0007P0-0S@git.koha-community.org>

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  a291cc52ca79ed11e0032e73b380b17f3bf308cb (commit)
      from  973371a68b1c2a8af7d90afab8db15bda567f606 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository