[koha-commits] main Koha release repository branch MM-OPAC/theme_dep updated. v3.16.00-833-g72fc58b
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 29 21:32:37 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 2188468f926c344cafca732f1b8e8c6157aedbcd (commit)
discards 66c229daeb02dddf52440396666144ff98d3fff6 (commit)
discards 60d7714fcd07eaa37c67f89180d1b033fbaefef7 (commit)
discards 87d55bce6b0581836db6f57af0ecb1519cfaac8f (commit)
discards c2a6d45bfabcc5844039f472a7557fed3c7f3d9d (commit)
discards d3e064d1a7682e327932021890449f9c730e65f5 (commit)
discards c2c710434dbfeab77a21214ed87f6b7318cbee65 (commit)
discards 91656421bdd991b4e159b03373fb24612a68a6e6 (commit)
discards 70106def7186739260da0141386b51fc1a4dced8 (commit)
via 72fc58b15c7d53eac4cd3c7a9a1cf9c8d11cb339 (commit)
via 1852b89afed32d93b7ba89d52300954ca4fbcd2c (commit)
via b72efe9e71f9a5431da1410b3b8e2d213b202f65 (commit)
via ad3c688451df0cd3ed4dc6b4a1171a13a4af6767 (commit)
via cb1f2c60c06f6029c54acb087090aa62469554ba (commit)
via 96bfcdcb86998e93a45e1365fef3da29c34efe59 (commit)
via 075e9a64f9f04ff629afbaa7971d646d837b199c (commit)
via 0ae74e62e2b693c9c4ad1b55125ede762a5d5b2a (commit)
via 236e815b6c884918431f4614b81e69b58400771c (commit)
via 3541fc36544aa1f2993f7ebea5d2cc12e1364da7 (commit)
via c217b2c4186e3e449872ed009a11d7210b7968b9 (commit)
via e43f012af698907c58aec92933ed89d0c7fe6efb (commit)
via b108a111f61fe3fdab1c7471eeb5eff6b063c30a (commit)
via bc7224c20c2298a86ccaad7098413aee7fb1f42c (commit)
via 3d61550e22c36a02e88bfa1fbd3152b8bfc69d11 (commit)
via a781391a95cbcd15ed694c4ac0c88d25d9ee0006 (commit)
via 5382406db0255ea548758d7ce1a5f23c10b0c241 (commit)
via c4095f55ad98cad41a546654fdc8829110599575 (commit)
via 4b36d4c39734027f1749c1cddb765e04648f2216 (commit)
via b4abb244f7c0f9d460986338ee3b88ad23173b80 (commit)
via 1b695f7dd7ba3eb5b2ccc919099cd2c7b0f8c378 (commit)
via 8523a01f47cb6bb40de82a86ae67d092dbcc2b7e (commit)
via da270d9c9b199a407af59598a4ed820f311349f5 (commit)
via 9f989999b79a765cb2177c049d6f6ea547a6300c (commit)
via ab5f1d73ad872afe9b45bfae59fd9d7011d40eee (commit)
via 781659b1dedcfa069ee9788e597733901714dc83 (commit)
via 836aba0bfbf4300d85e19b96c906c5c0d092a8ea (commit)
via 0d4fee2615798aab8bdcb985480e31ffa158e87c (commit)
via 7690cd5ad17b3c92928606b72398006bdea5c1e9 (commit)
via 6b75da76622aaf1e7f5bffb85217259e364992af (commit)
via b52a24efb204ccc5b63eabf774ee6467a2f9f09b (commit)
via 5aa6953cc41534e5cf706d75145b8aed19661e00 (commit)
via a61c3a76881aca4a5910bbb0bb3683f14d916f52 (commit)
via 7690127d919cb69fab840628058aab2ba58180f3 (commit)
via ab03ad7a1896bcdad82d6609582b334d96eba8de (commit)
via 6c1e10db22ba136861052675ba6dd0a28f66aff2 (commit)
via c95a4b0f84bd110c386b9f08bfe96ecc420fe070 (commit)
via 76c904a735736ec70edb19201d23efa6982df3ba (commit)
via 2e008d86c6565d8b4322cf1e218fd2f9550fd10a (commit)
via ac4544ea472c7bf00894ff6d86317ccb046bc420 (commit)
via 55587f5c346a7b7b8f35e05d88c2112f1de46a9a (commit)
via 4bdc80312017732dfa6d21671382cdc89ef4e0ad (commit)
via 8a2d765769eb6f992034d9f3d4b68b9ac00033bd (commit)
via e6d1d8727b609bc85e8f4275e00820af81ee6907 (commit)
via dd325738d65551c09504ebd21bcfc37d368cdecb (commit)
via 49788987b29f14884a59d41602c7821fec03e491 (commit)
via 5bbe42932e6395a8cb49c880c094c21b40590fd3 (commit)
via 0dd1ac40a0df984bee6583f13f80744b539b8f37 (commit)
via cc3a535439c98d70014d08366da1b38b2aca4ed0 (commit)
via a57f4aba22dc9c738cb4093a1fbec67e45de947d (commit)
via 0a53d5e6b68c1e67ed6cea8b93090e97da9f0fae (commit)
via aa9230436d034f038ecccff7470bb3d6012d3441 (commit)
via be9dec3e13562fc8b68167b4e1d530d1465187e3 (commit)
via 2303b65d19db53b10f42f18f6dd2248e12dbcdfa (commit)
via f13eca42341ed096c92cc14d8064a39dc4a615f9 (commit)
via 65e6deb5fad8eeac8a94748c6760723769295cae (commit)
via d7f824e501a95893a8ab3db1740fe30f7ee48ed3 (commit)
via ca756f44d76df3074b4b53c97898f26ede65a711 (commit)
via 5ff9f513ed6b901099571c89cd716f9248332729 (commit)
via 42efe724f778c6db0c3147776564bf16264b2c87 (commit)
via 84be3e77091b99c60b244d8981301f18a73c0995 (commit)
via 61ad4b235777e5eaa82c265b96e90fccf472e3be (commit)
via 8c6cc211b5b3fc6140b2f82cada29565a10b4dbd (commit)
via 75a9f6a4a0e17c18f8a1bd805f9e0ed5f59ccec7 (commit)
via b99a99b45c15b06c5f0985685818c6a8d8bf65ff (commit)
via a063067b91f3d08e7e58fdc9d059fcaee4ab4225 (commit)
via a40dc1758f7566ee767cf3ffa8a67a25786db02d (commit)
via 9a2553625ec93119f4c7cec1a9a3bb9df12d7231 (commit)
via 0c161a9a66c3353a14240490471e17c816d8a5be (commit)
via 49fee3a72d22ce4982ceac7ba047fb43d547d538 (commit)
via 57c9ec4854e2bee18724a7a87151c0d019b21f21 (commit)
via 8c8fb358640b38bacb0200cd5c5c11c45affdd21 (commit)
via 2d9fbadcad7710ed7616cf0ee376812102936163 (commit)
via cf8dcf8e0c37450f98befa4f841afe1482c8c8ca (commit)
via e949eba409338efc68432fb47c8f9c9902679c78 (commit)
via 9b01fd97ea323b00629709d04f50cdd27e45dfa5 (commit)
via f918d29e38825ca2c8f69c362c61d1c8f0b517b7 (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 (2188468f926c344cafca732f1b8e8c6157aedbcd)
\
N -- N -- N (72fc58b15c7d53eac4cd3c7a9a1cf9c8d11cb339)
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 72fc58b15c7d53eac4cd3c7a9a1cf9c8d11cb339
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 1852b89afed32d93b7ba89d52300954ca4fbcd2c
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 b72efe9e71f9a5431da1410b3b8e2d213b202f65
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 ad3c688451df0cd3ed4dc6b4a1171a13a4af6767
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 cb1f2c60c06f6029c54acb087090aa62469554ba
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 96bfcdcb86998e93a45e1365fef3da29c34efe59
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 075e9a64f9f04ff629afbaa7971d646d837b199c
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 0ae74e62e2b693c9c4ad1b55125ede762a5d5b2a
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 236e815b6c884918431f4614b81e69b58400771c
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/Acquisition.pm | 100 +-
C4/Branch.pm | 10 +-
C4/ClassSortRoutine/Dewey.pm | 9 +-
C4/Context.pm | 2 +-
C4/ILSDI/Services.pm | 2 +-
C4/Installer.pm | 3 +
C4/Installer/PerlDependencies.pm | 2 +-
C4/Letters.pm | 97 +-
C4/Output.pm | 28 +-
C4/SIP/Sip.pm | 15 +-
C4/SIP/Sip/MsgType.pm | 32 +-
C4/Search.pm | 7 +-
C4/Serials.pm | 42 +-
Koha/Acquisition/Order.pm | 91 +
Koha/Email.pm | 65 +
Koha/Number/Price.pm | 90 +
Koha/Schema/Result/Aqorder.pm | 12 +-
Koha/Schema/Result/Branch.pm | 18 +-
Koha/Schema/Result/Serial.pm | 12 +-
t/AuthUtils.t => Koha/Template/Plugin/Price.pm | 19 +-
Makefile.PL | 12 +-
about.pl | 6 +
acqui/acqui-home.pl | 43 +-
acqui/addorder.pl | 8 +-
acqui/addorderiso2709.pl | 10 +-
acqui/finishreceive.pl | 3 +-
admin/aqbudgetperiods.pl | 24 +-
admin/aqbudgets.pl | 20 +-
admin/aqplan.pl | 22 -
admin/branches.pl | 2 +
authorities/blinddetail-biblio-search.pl | 2 +-
basket/sendbasket.pl | 9 +-
etc/SIPconfig.xml | 5 +-
etc/koha-conf.xml | 4 +
.../data/mysql/de-DE/mandatory/subtag_registry.txt | 4 -
.../data/mysql/en/mandatory/subtag_registry.sql | 954 -
.../data/mysql/en/mandatory/subtag_registry.txt | 5 -
.../data/mysql/es-ES/mandatory/subtag_registry.sql | 798 -
.../data/mysql/es-ES/mandatory/subtag_registry.txt | 5 -
.../marc21/mandatory/authorities_normal_marc21.sql |10639 +---
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 4891 +-
.../marc21/optional/marc21_fastadd_framework.sql | 274 +-
.../optional/marc21_simple_bib_frameworks.sql |52596 ++++++++++----------
.../mysql/fr-FR/1-Obligatoire/subtag_registry.sql | 685 -
.../mysql/fr-FR/1-Obligatoire/subtag_registry.txt | 4 -
.../Obligatoire/marc21_framework_DEFAULT.sql | 4 +-
.../Optionnel/marc21_simple_bib_frameworks.sql | 16 +-
.../data/mysql/it-IT/necessari/subtag_registry.sql | 790 -
.../data/mysql/it-IT/necessari/subtag_registry.txt | 5 -
installer/data/mysql/kohastructure.sql | 4 +-
.../{de-DE => }/mandatory/subtag_registry.sql | 0
.../mysql/nb-NO/1-Obligatorisk/subtag_registry.sql | 819 -
.../mysql/nb-NO/1-Obligatorisk/subtag_registry.txt | 1 -
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 4 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 +-
.../data/mysql/pl-PL/mandatory/subtag_registry.sql | 786 -
.../data/mysql/pl-PL/mandatory/subtag_registry.txt | 5 -
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 4 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 +-
.../data/mysql/ru-RU/mandatory/subtag_registry.sql | 786 -
.../data/mysql/ru-RU/mandatory/subtag_registry.txt | 4 -
installer/data/mysql/sysprefs.sql | 15 +-
.../data/mysql/uk-UA/mandatory/subtag_registry.sql | 786 -
.../data/mysql/uk-UA/mandatory/subtag_registry.txt | 4 -
installer/data/mysql/updatedatabase.pl | 50 +-
.../lib/jquery/plugins/jquery.treeview.pack.js | 0
.../prog/en/includes/doc-head-open.inc | 1 +
.../intranet-tmpl/prog/en/includes/header.inc | 8 +-
koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js | 2 +-
.../lib/jquery/plugins/jquery.textarea-expander.js | 95 -
.../prog/en/lib/jquery/plugins/tablednd.js | 382 -
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 34 +-
.../prog/en/modules/acqui/acqui-home.tt | 25 +-
.../prog/en/modules/admin/aqbudgetperiods.tt | 7 +-
.../prog/en/modules/admin/aqbudgets.tt | 39 +-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 5 +-
.../prog/en/modules/admin/branches.tt | 2 +
.../prog/en/modules/admin/preferences/admin.pref | 10 +
.../en/modules/admin/preferences/searching.pref | 6 +
.../cataloguing/value_builder/unimarc_field_4XX.tt | 64 +-
.../prog/en/modules/circ/reserveratios.tt | 17 +-
.../prog/en/modules/members/member-flags.tt | 2 +-
.../prog/en/modules/serials/claims.tt | 106 +-
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 29 +-
.../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 21 +
.../prog/en/xslt/NORMARCslim2intranetResults.xsl | 12 +-
.../prog/en/xslt/NORMARCslimUtils.xsl | 21 +
.../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 16 +-
.../prog/en/xslt/UNIMARCslimUtils.xsl | 21 +
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
.../bootstrap/en/includes/doc-head-open.inc | 1 +
.../en/modules/opac-registration-email-sent.tt | 2 +-
.../bootstrap/en/modules/opac-shareshelf.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 2 +-
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 2 +-
koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 8 +
kohaversion.pl | 2 +-
misc/cronjobs/runreport.pl | 26 +-
misc/migration_tools/rebuild_zebra.pl | 4 +-
opac/opac-sendbasket.pl | 18 +-
opac/opac-sendshelf.pl | 12 +-
opac/opac-tags.pl | 6 +-
rewrite-config.PL | 1 +
serials/claims.pl | 43 +-
svc/bib | 25 +-
t/ClassSortRoutine_Dewey.t | 11 +-
t/Koha_Email.t | 11 +
t/Number/Price.t | 77 +
t/db_dependent/Acquisition.t | 10 +-
t/db_dependent/Acquisition/CancelReceipt.t | 19 +-
.../Acquisition/GetBasketsInfosByBookseller.t | 16 +-
.../Acquisition/GetOrdersByBiblionumber.t | 19 +-
t/db_dependent/Acquisition/Invoices.t | 19 +-
t/db_dependent/Acquisition/NewOrder.t | 28 +-
t/db_dependent/Acquisition/OrderFromSubscription.t | 16 +-
t/db_dependent/Acquisition/TransferOrder.t | 9 +-
t/db_dependent/Acquisition/close_reopen_basket.t | 13 +-
t/db_dependent/Bookseller.t | 26 +-
t/db_dependent/Branch.t | 8 +
t/db_dependent/Budgets.t | 12 +-
t/db_dependent/Letters.t | 7 +-
t/db_dependent/Search.t | 2 +
t/db_dependent/Serials/Claims.t | 147 +
t/db_dependent/Serials_2.t | 6 +-
t/db_dependent/zebra_config.pl | 2 +-
tools/scheduler.pl | 36 +-
virtualshelves/sendshelf.pl | 54 +-
127 files changed, 32634 insertions(+), 44791 deletions(-)
create mode 100644 Koha/Acquisition/Order.pm
create mode 100644 Koha/Email.pm
create mode 100644 Koha/Number/Price.pm
copy t/AuthUtils.t => Koha/Template/Plugin/Price.pm (69%)
delete mode 100644 installer/data/mysql/de-DE/mandatory/subtag_registry.txt
delete mode 100755 installer/data/mysql/en/mandatory/subtag_registry.sql
delete mode 100644 installer/data/mysql/en/mandatory/subtag_registry.txt
delete mode 100644 installer/data/mysql/es-ES/mandatory/subtag_registry.sql
delete mode 100644 installer/data/mysql/es-ES/mandatory/subtag_registry.txt
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.txt
delete mode 100644 installer/data/mysql/it-IT/necessari/subtag_registry.sql
delete mode 100644 installer/data/mysql/it-IT/necessari/subtag_registry.txt
rename installer/data/mysql/{de-DE => }/mandatory/subtag_registry.sql (100%)
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/subtag_registry.sql
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/subtag_registry.txt
delete mode 100644 installer/data/mysql/pl-PL/mandatory/subtag_registry.sql
delete mode 100644 installer/data/mysql/pl-PL/mandatory/subtag_registry.txt
delete mode 100644 installer/data/mysql/ru-RU/mandatory/subtag_registry.sql
delete mode 100644 installer/data/mysql/ru-RU/mandatory/subtag_registry.txt
delete mode 100644 installer/data/mysql/uk-UA/mandatory/subtag_registry.sql
delete mode 100644 installer/data/mysql/uk-UA/mandatory/subtag_registry.txt
rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/plugins/jquery.treeview.pack.js (100%)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.textarea-expander.js
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/tablednd.js
create mode 100755 t/Koha_Email.t
create mode 100644 t/Number/Price.t
create mode 100644 t/db_dependent/Serials/Claims.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list