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.6.x has been updated
via a89471913e812de7760c2eb3f1c1ab01431f33fc (commit)
via 2d2bfde5594571b958d3b60db7e54e55e9af5f73 (commit)
via 3150c233287a1ea575846d73f75d0d4d4f4d6b21 (commit)
via d2aec1a738b346a7c40ee2d21c0ddc28e0092aed (commit)
via 5efe1b117acda5eb2cdd251af21ee35cf0a03c54 (commit)
via a913e9d7b3a4dab82d4ae9e9c1ba16687a6ad9aa (commit)
via f8b401e7237f8aa1f424f31124f90e473ee937ee (commit)
via ceff2d275f71538b4ef131da1c71792903388637 (commit)
via 9939392c156cb51627bd8096ba640ca69328167a (commit)
via 37ed97bceb6adaf33a4b7eca6a6628fc93d3a298 (commit)
via 03f6e33c4b331cf0daeab4fe8f402173146b1f67 (commit)
via 26d79ec4f2ea5fb16d41b9ac89af2f663238c08c (commit)
via fbc9e6f863d78191c9ee77be9722777a9ab2768c (commit)
via c28923b04060775e04e51542ed834b8f0e051352 (commit)
from 4d1809334d701415f715152876ca00d044adc84e (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 a89471913e812de7760c2eb3f1c1ab01431f33fc
Author: Chris Nighswonger <[email protected]>
Date: Wed Dec 7 11:41:07 2011 -0500
Release Notes for 3.06.02.000 07 Dec 2011 16:41:07 Z
commit 2d2bfde5594571b958d3b60db7e54e55e9af5f73
Author: Paul Poulain <[email protected]>
Date: Wed Dec 7 16:37:31 2011 +0100
t/UploadedFile, updated comment
(cherry picked from commit ffb544e8e4a202705c330f0026453cecebe08c71)
Signed-off-by: Chris Nighswonger <[email protected]>
commit 3150c233287a1ea575846d73f75d0d4d4f4d6b21
Author: Paul Poulain <[email protected]>
Date: Tue Dec 6 12:07:48 2011 +0100
160th developer + 2 events added (NZ tm and 3.6.1 released)
Signed-off-by: Chris Nighswonger <[email protected]>
commit d2aec1a738b346a7c40ee2d21c0ddc28e0092aed
Author: Chris Cormack <[email protected]>
Date: Wed Dec 7 10:09:43 2011 +1300
Bug 5327: Fixing the Members.t test
Signed-off-by: Liz Rea <[email protected]>
Confirm Members.t tests complete
(cherry picked from commit 94e1691a74b4698e88781381d17e60f458c6eb35)
Signed-off-by: Chris Nighswonger <[email protected]>
commit 5efe1b117acda5eb2cdd251af21ee35cf0a03c54
Author: Chris Cormack <[email protected]>
Date: Wed Dec 7 09:17:35 2011 +1300
Bug 5327 : Fixing unit test for SQLHelper.pm
Signed-off-by: Liz Rea <[email protected]>
Confirm that all SQLHelper tests pass.
(cherry picked from commit dbe36a2bf361e1cda73f83cc5cfc79e71c6cf216)
Signed-off-by: Chris Nighswonger <[email protected]>
commit a913e9d7b3a4dab82d4ae9e9c1ba16687a6ad9aa
Author: Chris Cormack <[email protected]>
Date: Sun Dec 4 20:02:45 2011 +1300
Bug 5327 : Complete coverage for BackgroundJob.pm
Signed-off-by: Katrin Fischer <[email protected]>
Tests run without problems.
(cherry picked from commit 19d071910f0d772741bf3f3c6b6a0f052bf8be75)
Signed-off-by: Chris Nighswonger <[email protected]>
commit f8b401e7237f8aa1f424f31124f90e473ee937ee
Author: Chris Cormack <[email protected]>
Date: Sun Nov 6 19:59:34 2011 +1300
Bug 5327 : Adding more unit tests
Signed-off-by: Katrin Fischer <[email protected]>
New tests run without problems.
(cherry picked from commit a9bbeae6cc23c9f45474f6665775455ba32b4f22)
Signed-off-by: Chris Nighswonger <[email protected]>
commit ceff2d275f71538b4ef131da1c71792903388637
Author: Chris Hall <[email protected]>
Date: Tue Nov 22 12:19:55 2011 +1300
Bug 5327: Unit tests for C4/Exteral/BakerTaylor.pm
Signed-off-by: Chris Cormack <[email protected]>
(cherry picked from commit 16c51d03762372d40be4ed600dcd9d51557f0854)
Signed-off-by: Chris Nighswonger <[email protected]>
commit 9939392c156cb51627bd8096ba640ca69328167a
Author: Paul Poulain <[email protected]>
Date: Wed Dec 7 15:16:19 2011 +0100
history.txt, adding Stéphane Delaune, as 117, moving others and welcome
Albert, you're 163th !
(cherry picked from commit 046c1cab8cd1bdd356750c837bcdbf1dd06797ff)
Signed-off-by: Chris Nighswonger <[email protected]>
commit 37ed97bceb6adaf33a4b7eca6a6628fc93d3a298
Author: Maxime Pelletier <[email protected]>
Date: Tue Sep 20 18:01:23 2011 -0400
fix test xml records
http://bugs.koha-community.org/show_bug.cgi?id=5327
(cherry picked from commit d2c101a8a9a6d8ed8d69c69d0d753a164681b8d7)
Signed-off-by: Chris Nighswonger <[email protected]>
commit 03f6e33c4b331cf0daeab4fe8f402173146b1f67
Author: Paul Poulain <[email protected]>
Date: Wed Dec 7 15:17:54 2011 +0100
Test suite: ignoring backups from vi (files ending with a ~)
On my laptop, this test was failing because some scripts had a conflict
marker in a backup ... of a conflict I just fixed!
ignoring any file ending with a ~
(cherry picked from commit 13f29dd7f36137a77695af6c6eb3032ec72d9ae2)
Signed-off-by: Chris Nighswonger <[email protected]>
commit 26d79ec4f2ea5fb16d41b9ac89af2f663238c08c
Author: Owen Leonard <[email protected]>
Date: Tue Dec 6 12:50:57 2011 -0500
Bug 6291 - Cart printing truncated in Firefox
Alternate fix suggested by
http://www.sidesofmarch.com/index.php/archive/2007/04/25/firefox-truncates-long-tables-when-printing/
Seems absurd that changing the top heading from an <h1> to an <h2>
would fix the problem, but it does in my tests in Firefox 3.6 and 8
on Windows 7
(cherry picked from commit b03cb0d545caf5cbbe5cab80a9fbb4154c56a508)
Signed-off-by: Chris Nighswonger <[email protected]>
commit fbc9e6f863d78191c9ee77be9722777a9ab2768c
Author: Jared Camins-Esakov <[email protected]>
Date: Thu Dec 1 19:53:51 2011 -0500
Bug 6971: XSLT Intranet Detail displays 245 subfields out of order
245 Subfields in the Intranet Detail Display
(MARC21slim2intranetDetail.xsl) are
being reordered on display. Instead of displaying 245$a 245$h 245$b, the
stylesheet was displaying 245$a 245$b 245$h. This patch does not address
ISBD
punctuation.
Signed-off-by: Jared Camins-Esakov <[email protected]>
Follow-up patch to address the issue in the staff client.
Signed-off-by: Chris Cormack <[email protected]>
Signed-off-by: Paul Poulain <[email protected]>
(cherry picked from commit 6f043aa82f9c8f20bb70081cc86a42026465193a)
Signed-off-by: Chris Nighswonger <[email protected]>
commit c28923b04060775e04e51542ed834b8f0e051352
Author: Albert Oller <[email protected]>
Date: Fri Nov 18 13:49:07 2011 -0500
Bug 6971: XSLT Opac Detail displays 245 subfields out of order.
245 Subfields in the OPAC Detail Display (MARC21slim2OPACDetail.xsl) are
being
reordered on display. Instead of displaying 245$a 245$h 245$b, the
stylesheet
was displaying 245$a 245$b 245$h. This patch does not address ISBD
punctuation.
Signed-off-by: Jared Camins-Esakov <[email protected]>
Clarified commit message.
(cherry picked from commit d71e696567ac5fec055c7d2b923d1015956c4960)
Signed-off-by: Chris Nighswonger <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs/history.txt | 91 ++++++++++----------
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 8 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt | 2 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 8 +-
misc/release_notes/release_notes_3_6_2.txt | 19 +++--
t/00-merge-conflict-markers.t | 2 +-
t/Boolean.t | 2 +-
t/TmplToken.t | 22 +++++
t/db_dependent/BackgroundJob.t | 6 +-
t/db_dependent/External_BakerTaylor.t | 28 +++++-
t/db_dependent/Members.t | 2 +-
t/db_dependent/Record.t | 10 +-
t/db_dependent/SQLHelper.t | 6 +-
t/db_dependent/UploadedFile.t | 8 +-
14 files changed, 133 insertions(+), 81 deletions(-)
create mode 100755 t/TmplToken.t
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
