[koha-commits] main Koha release repository branch MM-OPAC/theme_dep updated. v3.16.00-765-g2188468

Git repo owner gitmaster at git.koha-community.org
Sun Oct 26 03:18:36 CET 2014


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, MM-OPAC/theme_dep has been updated
  discards  f1dd178544ee37c58f2e5dcad7f6e71c2602e8dc (commit)
  discards  d2d1883ce05a38ec7bc9577bc2d025ec95c89915 (commit)
  discards  5b3325ee2457c6edfc4cd88fd12ea950b3be40b8 (commit)
  discards  bce0ca1f291421ca0eebb40fcdcc34de028e149e (commit)
  discards  dd779d2fb61a7e43d6ff272acdd447d904f428f4 (commit)
  discards  2690e4c63c6cd94afb7a03d58ba98de0bbb75628 (commit)
  discards  cfff03e4efb2d968dd43344c45a3f3c54bc2116b (commit)
       via  2188468f926c344cafca732f1b8e8c6157aedbcd (commit)
       via  66c229daeb02dddf52440396666144ff98d3fff6 (commit)
       via  60d7714fcd07eaa37c67f89180d1b033fbaefef7 (commit)
       via  87d55bce6b0581836db6f57af0ecb1519cfaac8f (commit)
       via  c2a6d45bfabcc5844039f472a7557fed3c7f3d9d (commit)
       via  d3e064d1a7682e327932021890449f9c730e65f5 (commit)
       via  c2c710434dbfeab77a21214ed87f6b7318cbee65 (commit)
       via  91656421bdd991b4e159b03373fb24612a68a6e6 (commit)
       via  70106def7186739260da0141386b51fc1a4dced8 (commit)
       via  91eb4252c7a120a6137123175e331dbe2f79dd77 (commit)
       via  fbc4e94d7f389d6bac37d9145283239d872f82f5 (commit)
       via  5e7e48b9c593ff3c7c1d6e4b74e318592b422bd7 (commit)
       via  5caedfb633f5046b03007c5c882c70d2ca0737da (commit)
       via  7bc22d27484f0d0534d19de7eaee92cc601ea490 (commit)
       via  f9965d53c2c0bed10407b27874ae5dadb2c64e6c (commit)
       via  f41a30fe38207d8e11782041e28bdff3b57a5627 (commit)
       via  aaa843c9165b97c1f9052f6a41177dbb9f6ac2b2 (commit)
       via  67a2d18fbcb338ca4fffb5150a567ebbc5e1ab01 (commit)
       via  a657589b1fcc408334370578eadc7bfa5adeafe7 (commit)
       via  37a0a5983a4a0ff173eade7dfc373688aeed04ed (commit)
       via  ffd6bd5e3c130d36e0999b3f3001faf7952d3d58 (commit)
       via  b3acefc3191aabb74cc28d4413b8b917f481cc78 (commit)
       via  fca74ab50fe5a11904c6c7affcb2cb5493b08087 (commit)
       via  c649728316cfb20d8abd4358996e009feb0d599e (commit)
       via  1f7a3c0a17f7f22ee2c092ab8dd8a77ce39b31e3 (commit)
       via  b95617ec9eb62d3b4b9b2b97848b3efd7d207fb6 (commit)
       via  d9e33d80c14f254f8785cda2dabfc54d427ff181 (commit)
       via  c4852dbb14e576717a477a10b95a960094ea8715 (commit)
       via  eb6c2cf3111788e80aae17705611d00230f82bd9 (commit)
       via  01cbfb13737f6afad8c938326521c55600d40678 (commit)
       via  cb33584de75c57a7b772d7332000b91f097fc664 (commit)
       via  ceaf9243aa17a7881122b15dede98c63c1dd3073 (commit)
       via  af2a4c59eb4f7a52d85b9be4cf163c903a7f0e27 (commit)
       via  65b36743073972358bca7b81c6830320b4fabb2c (commit)
       via  475bcd3de777453b534e8137fa42b40808e80e95 (commit)
       via  7d5105968e789233aa00047c8c3c4c9ef49be6e7 (commit)
       via  3da1960d213b8e5e063b1492711298367c8ad124 (commit)
       via  e6b944f4e86efb30ae88277e81fbfb20f41d5670 (commit)
       via  c765b8f2b280d8d9794bde79938a40464fc8919d (commit)
       via  07db379676704e472060383c432c45b36f8a2746 (commit)
       via  f6daff353de2deb17ee16ee4e0f8b9c36e5125c9 (commit)
       via  99bfa09cc66567811bb34a504d4507f0f20c6586 (commit)
       via  41168fb551ceeb905b75e496eca02bb0076242be (commit)
       via  8dfc399a2d42859ab510c9d86c73b6522a3c5335 (commit)
       via  a7e95356293692a9c4b8202e3600d5db64a2a7b9 (commit)
       via  f32b0e1243c0d93f42f9385285c3217e70ba7b2a (commit)
       via  b8b200836e7bfa2711dc5f0542f6f5ddbcf80174 (commit)
       via  48b7e1ecef1d768442cd3aa391e7a68865429520 (commit)
       via  22395e4168438fdceb00db3384c5082e7bae79e1 (commit)
       via  7fafe2afb491c8aff468dc200c705c05b57f4991 (commit)
       via  5dfc026fad2b0e92e00e501cf15284fae042a711 (commit)
       via  01c509f37d06a25aa4409ad2cd05cb67eee73f77 (commit)
       via  0ac72275aac8a2d0511b021cee0643aa38a7ba09 (commit)
       via  b47e0360d897c30cab80d0ccdf97c12a6ee62a87 (commit)
       via  a7321813f43083db2e101c2c75dac37990002c65 (commit)
       via  4114495d05a98237d1454845d7851e52178924fb (commit)
       via  8848e72d781d53941446bed36d574d9311ffa0fc (commit)
       via  b4b9e0d21224f0f86fdb006f8071590352012bac (commit)
       via  e44b4cbeeddc1bf4f3c3957e311ca0dea30592c0 (commit)
       via  cf1a63cb0c2585c474ef2916414d936b288012d5 (commit)
       via  2ad6998476709277ed2aca129a21b0b8a3d478f6 (commit)
       via  057a00d85cc62d3f9c2eb54130a9c2c1d73b9db9 (commit)
       via  1a50e39cff11836f53df71ec0278c4a1f23346eb (commit)
       via  e0c1476123603e9cfe9486ad67c507ff5b1574c3 (commit)
       via  93201a88939325296c9a04ff53b485ab32782b5b (commit)
       via  d71209461fc8ae5019eb32f0d2b17fce68556fb9 (commit)
       via  ecb1e046a62546939a29334b7e47a06285097914 (commit)
       via  daabe8eaa976bd60bbec5d4c3b757f50399dd246 (commit)
       via  c4e218fe2015a0ad9627fc43c9e5db522bdaeee5 (commit)
       via  3151fbe689a4f1c1a7cf6389518864af97d190f1 (commit)
       via  2f2dcada73de35cebb36e50b6145fdc1ea226098 (commit)
       via  f35cddf5f3950647938a9b39b11035ad4a4d60fd (commit)
       via  e3099d7c597c4b8d1dc7b61bd9d0d0484cbb77a1 (commit)
       via  9b9b057c77ce982bf32ac797abfdd00f87102d75 (commit)
       via  0df1c58f872679785b4f94fbb79ce4ec501070ec (commit)
       via  2d8362773069cda4d82e94827141a83c1843db4a (commit)
       via  6d3f1c1caf1ff8bcc320684ff737ea03df921eb0 (commit)
       via  fb90f71f717e7adc39c4d6d0f6bdb100f05e4695 (commit)
       via  31878e1973caa15b309001da8754a5d134f15513 (commit)
       via  89ee1aeab745a27000f6f897e2c727391e29b851 (commit)
       via  e8240f8c2b256bca4f7b6557a788db6ae541c563 (commit)
       via  ca86375872b1cc605918c33eb6c07ef85026ad4b (commit)
       via  3c9004357d48944ce36d3964f7e6f1ba15702b71 (commit)
       via  244cfaba71223f1861e7e6efdc3ada0b8fef0af0 (commit)
       via  8e09a48e8cc38ced5263ad65d8287a8bb619e5dc (commit)
       via  400b538078f9485afcbf4c4fcc4b40e59ec644d5 (commit)
       via  31cff582d8b7403e45ad081d79ad8990372e0352 (commit)
       via  a7f23c0afca81de0b22252650a9a23c8d8b731d9 (commit)
       via  cb4b7f7c810adbb5212725e1f68e01cbed98d9e4 (commit)
       via  e0c7a42a85951de1e258c9a039f2a4a0934f49ef (commit)
       via  a46b3b4de0209f44bdd448c8669a69ba83fed23d (commit)
       via  97fa2c032e482742c87966303af8a48dd113d68a (commit)
       via  ca17512a8ed6af2a9503a366c99d5349611d7775 (commit)
       via  ccf7ae56f6ba3a4af6d3b65764449194fe657e50 (commit)
       via  1d28da41fb8c1e81cb2825b513eb2344a995f335 (commit)
       via  e95cd1b126ed7485e5d13a696f9074202a087f1a (commit)
       via  4c1a9fbd392d428e593aae36a0c57a590dacc2ae (commit)
       via  c1e384f250266a26b1638dc3077cc054c55cf602 (commit)
       via  eafeb3409765da4bb6b7ef2c1b56c94e0e5b9adc (commit)
       via  2cc293ecd6f868de7d115176fb90d6b94dc29711 (commit)
       via  ca074c9253cc1fc15165fd836e4a032ce171cd99 (commit)
       via  a6d3e31860bc7ae26c393ff2fe3b0bdde848ddee (commit)
       via  842913dfb82c95bfc0100e24ab177863cf959e15 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (f1dd178544ee37c58f2e5dcad7f6e71c2602e8dc)
            \
             N -- N -- N (2188468f926c344cafca732f1b8e8c6157aedbcd)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 2188468f926c344cafca732f1b8e8c6157aedbcd
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Mon Oct 20 10:41:13 2014 -0400

    Bug 12653: Text file clean up
    
    _README.txt has 4 newlines removed.
    _COPYING.txt has 2 empty lines at the end of the file removed.
    This was done by copying the smallest file in an existing theme
    directory.
    
    TEST PLAN
    ---------
    1) Compare files.
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt
    -- there will be differences.
    2) Apply patch
    3) Compare files again.
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt
    diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt
    -- there will be no differences.
    4) git reset --hard origin/master
    5) Apply the patch affecting the .t files.
    6) Prove things.
    prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t
    -- expecting xt/author/icondirectories.t to fail
    7) Apply this patch.
    8) Prove things.
    prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t
    -- expecting success.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    This patch fixes some issues with files on itemtypes dirs.
    No koha-qa erros.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 66c229daeb02dddf52440396666144ff98d3fff6
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Thu Oct 16 19:35:52 2014 -0300

    Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests
    
    This patch removes explicit references of themes from
    
      xt/author/icondirectories.t
      xt/author/translatable-templates.t
      xt/author/valid-templates.t
      xt/single_quotes.t
      xt/tt_valid.t
    
    For xt/author/icondirectories.t it fixes a small difference on
    two bootstrap files, previously unchecked, crystal-clear/_COPYING.txt
    and crystal-clear/_README.txt
    
    Some updates to license information
    
    To test:
    1. Apply the patch
    2. Run each test, all must pass
    prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t
    
    3. Try to fail each test
    
    a) xt/author/icondirectories.t
    create a new file on any of icon dirs, e.g.
    touch koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/newfile.png
    test must fail
    
    b) xt/author/translatable-templates.t
    change the name of 'en' dir on any theme opac or staff
    test must fail
    
    Add following line to any template file
    <span [% IF ( value ) %]name="name"[% ELSE %] js="_('">TEST [% INCLUDE 'fail.inc' %]</span>
    
    c) xt/author/valid-templates.t must fail
    d) xt/single_quotes.t must fail
    e) xt/tt_valid.t must fail
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 60d7714fcd07eaa37c67f89180d1b033fbaefef7
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 12 10:09:57 2014 -0400

    Bug 12655 [Revised] PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in XSLT
    
    Two XSL files in the bootstrap theme contain hard-coded paths to the
    prog theme directory. This patch adds a query of the opacthemes system
    preference and builds the path based on the returned value.
    
    To test in a MARC21 system:
    
    Create or locate a record which contains a subject which is linked to an
    authority record. View the detail page for that record in the bootstrap
    OPAC and confirm that there is a magnifying class icon next to the link
    for that subject heading. Inspect or right-click the image and "View
    image" [FF. "Open image in new tab" in Chrome] to verify that the image
    being shown is from the bootstrap theme directory.
    
    Also modified: The NORMARC XSL for the detail page which has been
    changed in the same way. I did not test it in a NORMARC catalog.
    
    Edit: Fixed copy-and-paste error causing duplicate image.
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 87d55bce6b0581836db6f57af0ecb1519cfaac8f
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Jul 25 16:09:49 2014 +1200

    Bug 12657 - remove references to prog and ccsr from the packages
    
    To test:
    * Build a package and install it, and verify that there are no errors.
    * Play around with koha-translate, listing, adding, and removing
      languages.
    
    Note: one reference to prog and ccsr remains in koha-translate. This is
    to allow it to remove any pre-existing translations on an upgrade.
    
    Note 2: prog translations are still being installed, I think this is due
    to the underlying translation system doing it.
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit c2a6d45bfabcc5844039f472a7557fed3c7f3d9d
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Sun Aug 3 09:41:37 2014 -0300

    Bug 12539: Follow up to fix fallback theme
    
    The is a problem in the logic, fallback must be:
    1. Requested (theme, lang, tmpl)
    a. return    (theme, lang, tmpl), if not
    b. return    (fallback, lang, tmpl), if not
    c. return    (theme, 'en', tmpl), if not as last resort
    d. return    (fallback, 'en', tmpl)
    
    Previous patch missed option 'c', worked for CCSR
    but not bootstrap, sorry.
    
    Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d3e064d1a7682e327932021890449f9c730e65f5
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Mon Jul 7 15:30:02 2014 -0300

    Bug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
    
    This patch removes hardcoded 'prog' from themelanguage on C4/Templates.pm
    It adds a new syspref OPACFallback to hold the prefferred fallback
    theme for new themes with minimal changes.
    
    This does not brake CCSR if new syspref value is 'prog',
    using 'bootstrap' works somehow, but with strange results.
    
    To test:
    1) Apply the patch
    2) Run updatedatbase.pl
    3) CCSR, prog & bootstrap must work as usual
    4) Need to test theme/language fallback
     a) translate for your preferred language (xx-YY)
     b) enable language on opac
     c) go to opac, select that language
     d) login on opac, go to personal details
     e) remove koha-tmpl/opac-tmpl/bootstrap/xx-YY/modules/opac-memberentry.tt
     d) reload page, must load in English
     f) click other member options, must load on translated language
    (can use other pages, ccsr, prog or bootstrap)
    5) Do a similar test but for a staff page, enable lang, switch to it,
    rm koha-tmpl/intranet-tmpl/prog/xx-YY/modules/admin/admin-home.tt,
    any page must be translated except for admin home.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit c2c710434dbfeab77a21214ed87f6b7318cbee65
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jul 1 11:42:30 2014 -0400

    Bug 12245 - PROG/CCSR deprecation: Remove OPACMobileUserCSS system preference
    
    With CCSR now deprecated there is no longer a need for the
    OPACMobileUserCSS system preference. This patch removes it.
    
    To test, apply the patch and run updatedatabase. Check that the
    preference can no longer be found in system preferences.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Preference removed, no koha-qa errors.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 91656421bdd991b4e159b03373fb24612a68a6e6
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jul 1 11:56:28 2014 -0400

    Bug 12246 - PROG/CCSR deprecation: Remove OpacMainUserBlockMobile system preference
    
    With CCSR having been deprecated there is no longer a use for the
    OpacMainUserBlockMobile system preference. This patch removes it.
    
    To test, apply the patch and run updatedatabase. Check that the
    preference can no longer be found in system preferences.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Preference removed, no koha-qa errors
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 70106def7186739260da0141386b51fc1a4dced8
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jul 1 12:18:12 2014 -0400

    Bug 12513 - PROG/CCSR deprecation: Remove OpacShowLibrariesPulldownMobile system preference
    
    With CCSR having been deprecated there is no longer a use for the
    OpacShowLibrariesPulldownMobile system preference. This patch removes
    it.
    
    To test, apply the patch and run updatedatabase. Check that the
    preference can no longer be found in system preferences.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Preference removed, no koha-qa errors.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Auth.pm                                         |  113 +-
 C4/Auth_with_shibboleth.pm                         |  268 ++
 C4/Charset.pm                                      |    7 +-
 C4/Circulation.pm                                  |    9 +-
 C4/ClassSortRoutine.pm                             |    2 +-
 C4/Context.pm                                      |   39 +-
 C4/Installer/PerlDependencies.pm                   |   10 +
 C4/Labels/Label.pm                                 |    2 +
 C4/Members.pm                                      |   30 +-
 C4/Reports/Guided.pm                               |  128 +-
 C4/Search.pm                                       |  197 +-
 C4/UsageStats.pm                                   |  380 ++
 Koha/Calendar.pm                                   |   21 +-
 Koha/Schema/Result/Biblioitem.pm                   |    8 +-
 Koha/Schema/Result/Deletedbiblioitem.pm            |    8 +-
 Koha/Schema/Result/Deleteditem.pm                  |    8 +-
 Koha/Schema/Result/Item.pm                         |    8 +-
 Koha/Schema/Result/SavedSql.pm                     |    9 +-
 about.pl                                           |   13 +
 admin/aqbudgets.pl                                 |   16 +-
 admin/currency.pl                                  |    7 -
 cataloguing/value_builder/dateaccessioned.pl       |    5 +-
 debian/control                                     |   16 +-
 debian/templates/koha-conf-site.xml.in             |    1 +
 debian/templates/marc21-retrieval-info-bib-dom.xml |    2 +
 .../templates/normarc-retrieval-info-bib-dom.xml   |    2 +
 .../templates/unimarc-retrieval-info-bib-dom.xml   |    2 +
 debian/templates/zebra-authorities-dom-site.cfg.in |    6 +-
 debian/templates/zebra-authorities-site.cfg.in     |    6 +-
 debian/templates/zebra-biblios-dom-site.cfg.in     |    1 +
 etc/koha-conf.xml                                  |    2 +
 etc/solr/indexes.yaml                              |   33 -
 .../marc21/biblios/biblio-koha-indexdefs.xml       |  564 +--
 .../marc21/biblios/biblio-zebra-indexdefs.xsl      |   81 +
 .../normarc/biblios/biblio-koha-indexdefs.xml      |  446 +-
 .../normarc/biblios/biblio-zebra-indexdefs.xsl     |   81 +
 .../unimarc/biblios/biblio-koha-indexdefs.xml      |  614 +--
 .../unimarc/biblios/biblio-zebra-indexdefs.xsl     |  164 +-
 etc/zebradb/marc_defs/unimarc/biblios/record.abs   |    3 -
 etc/zebradb/retrieval-info-bib-dom.xml             |    7 +
 etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl        |  102 +-
 etc/zebradb/zebra-authorities-dom.cfg              |    6 +-
 etc/zebradb/zebra-authorities.cfg                  |    6 +-
 etc/zebradb/zebra-biblios-dom.cfg                  |    1 +
 install_misc/debian.packages                       |    1 +
 install_misc/ubuntu.10.04.packages                 |    1 +
 install_misc/ubuntu.12.04.packages                 |    1 +
 install_misc/ubuntu.packages                       |    1 +
 .../mysql/de-DE/mandatory/system_preferences.sql   |    2 +-
 .../fr-FR/1-Obligatoire/authorised_values.sql      |    8 +-
 .../Obligatoire/autorites_norme_unimarc.sql        | 4554 +++++++++++++-------
 .../Obligatoire/framework_DEFAULT.sql              |  662 ++-
 .../Optionnel/cataloguage_rapide.sql               |   75 +-
 installer/data/mysql/kohastructure.sql             |   33 +-
 installer/data/mysql/sysprefs.sql                  |   10 +-
 installer/data/mysql/updatedatabase.pl             |   45 +
 .../intranet-tmpl/prog/en/css/preferences.css      |    2 +-
 .../intranet-tmpl/prog/en/css/staff-global.css     |    1 +
 .../prog/en/includes/search_indexes.inc            |   13 +-
 koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js    |  446 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |   16 +-
 .../prog/en/modules/acqui/addorderiso2709.tt       |   12 +
 .../prog/en/modules/acqui/aqbasketuser_search.tt   |    2 +-
 .../prog/en/modules/acqui/invoices.tt              |    2 +-
 .../prog/en/modules/acqui/neworderempty.tt         |    3 +
 .../prog/en/modules/admin/aqbudgetperiods.tt       |   42 +-
 .../prog/en/modules/admin/aqcontract.tt            |    2 +-
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt  |    2 +-
 .../en/modules/admin/auth_subfields_structure.tt   |    4 -
 .../prog/en/modules/admin/auth_tag_structure.tt    |   55 +-
 .../prog/en/modules/admin/authtypes.tt             |   10 +-
 .../prog/en/modules/admin/biblio_framework.tt      |    4 +-
 .../en/modules/admin/branch_transfer_limits.tt     |    2 +-
 .../prog/en/modules/admin/branches.tt              |    6 +-
 .../prog/en/modules/admin/categorie.tt             |   17 +-
 .../intranet-tmpl/prog/en/modules/admin/cities.tt  |    6 +-
 .../prog/en/modules/admin/classsources.tt          |    4 -
 .../prog/en/modules/admin/clone-rules.tt           |    2 +-
 .../prog/en/modules/admin/currency.tt              |    2 +-
 .../prog/en/modules/admin/itemtypes.tt             |    6 +-
 .../prog/en/modules/admin/koha2marclinks.tt        |    4 -
 .../en/modules/admin/marc_subfields_structure.tt   |    4 -
 .../prog/en/modules/admin/marctagstructure.tt      |    2 +-
 .../prog/en/modules/admin/preferences/admin.pref   |   34 +
 .../en/modules/admin/preferences/i18n_l10n.pref    |    4 +-
 .../prog/en/modules/admin/preferences/opac.pref    |    5 +
 .../prog/en/modules/admin/printers.tt              |    2 +-
 .../prog/en/modules/admin/smart-rules.tt           |    4 -
 .../prog/en/modules/admin/stopwords.tt             |    4 +-
 .../prog/en/modules/admin/systempreferences.tt     |    2 +-
 .../prog/en/modules/admin/z3950servers.tt          |    6 +-
 .../prog/en/modules/cataloguing/addbooks.tt        |    2 +-
 .../prog/en/modules/circ/circulation.tt            |   27 +-
 .../prog/en/modules/circ/view_holdsqueue.tt        |    5 +-
 .../intranet-tmpl/prog/en/modules/help/edithelp.tt |    2 +-
 .../prog/en/modules/members/moremember.tt          |   69 +-
 .../en/modules/reports/guided_reports_start.tt     |   14 +-
 .../prog/en/modules/tools/csv-profiles.tt          |   30 +-
 .../prog/en/modules/tools/koha-news.tt             |    4 +-
 .../modules/tools/marc_modification_templates.tt   |    5 +-
 .../prog/en/modules/tools/modborrowers.tt          |    7 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   16 +-
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |   16 +-
 .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl |   62 +
 .../img/itemtypeimg/crystal-clear/_COPYING.txt     |    2 -
 .../prog/img/itemtypeimg/crystal-clear/_README.txt |    8 +-
 .../opac-tmpl/bootstrap/en/includes/masthead.inc   |  209 +-
 .../bootstrap/en/includes/opac-bottom.inc          |    7 +-
 .../opac-tmpl/bootstrap/en/modules/opac-auth.tt    |   58 +-
 .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |    2 +-
 .../bootstrap/en/modules/sco/printslip.tt          |   12 +-
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |   16 +-
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl   |   16 +-
 .../bootstrap/en/xslt/MARC21slimUtils.xsl          |   62 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |   16 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt   |    2 +-
 .../prog/itemtypeimg/crystal-clear/_COPYING.txt    |    2 -
 .../prog/itemtypeimg/crystal-clear/_README.txt     |    8 +-
 kohaversion.pl                                     |    2 +-
 misc/cronjobs/delete_expired_opac_registrations.pl |   23 +-
 misc/cronjobs/overdue_notices.pl                   |   21 +-
 misc/cronjobs/share_usage_with_koha_community.pl   |  112 +
 opac/opac-main.pl                                  |    1 -
 opac/opac-user.pl                                  |    2 +
 svc/checkouts                                      |    2 +
 t/Auth_with_shibboleth.t                           |  244 ++
 t/Charset.t                                        |    7 +-
 t/db_dependent/Holidays.t                          |   21 +-
 t/db_dependent/Members.t                           |   16 +-
 tools/export.pl                                    |    2 +-
 xt/author/icondirectories.t                        |  103 +-
 xt/author/translatable-templates.t                 |   43 +-
 xt/author/valid-templates.t                        |  105 +-
 xt/single_quotes.t                                 |   49 +-
 xt/tt_valid.t                                      |   44 +-
 135 files changed, 7385 insertions(+), 3650 deletions(-)
 create mode 100644 C4/Auth_with_shibboleth.pm
 create mode 100644 C4/UsageStats.pm
 delete mode 100644 etc/solr/indexes.yaml
 create mode 100755 misc/cronjobs/share_usage_with_koha_community.pl
 create mode 100644 t/Auth_with_shibboleth.t


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list