[koha-commits] main Koha release repository branch MM-OPAC/theme_dep updated. v3.16.00-629-g1ba6863
Git repo owner
gitmaster at git.koha-community.org
Tue Sep 23 07:06:49 CEST 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 d4e127c0dd802173ef6ef5f3e7c63208e58bca82 (commit)
discards c62454a89103e3d4a59a11a2a6aebda92574c31f (commit)
discards 9a0b5b28b630340deb39ce0a925546aa8db31b64 (commit)
discards 6fb05ea7e6ed2c79ef3c294aa87b3bb0aeee4f41 (commit)
discards d6a6f4d4adbf68f84a971eab0625d63eaaa6a9c3 (commit)
via 1ba6863ac4883fac8fe84f136a282ef20e662254 (commit)
via e4d400d34b0dfc950349c950973952b9121c9752 (commit)
via c304159fe80c2f3333ce6cb17fec8bd2fb4b241f (commit)
via ae1b048a9c1f77a54a4099da63b717eae60b9099 (commit)
via 9ccbe7af97cc53e5cf9d38a44a226b6ef7e17cec (commit)
via 2c7c74ded8234e46372a2f44449cc96e34731ed3 (commit)
via 2d4d3d1bf511bc277e1f05e34d0857cb98b9924c (commit)
via 81b9d8b8aac5c67d01dbac64a1dfa9de880e021d (commit)
via 3c1c5c04ceafb411dde1426967cb969a3969f80a (commit)
via 45f474abdf935c928b4cd20e9823c96ca82af398 (commit)
via 3ce2c0235ca8a1dc0d891e17cac5faeb6bea7caa (commit)
via bf26d347c17907878f31e4d37d9204c96b44f14b (commit)
via 2aded36d08fab552bab112fcec74247c68d45d22 (commit)
via a414f413c82c71ce6d14aa1f416ec6fdf0300f13 (commit)
via e2b0454ed43622302aac49b6dae7f3388639269e (commit)
via bb78928bef7185ead7156acd1ffc3fb278db2985 (commit)
via 5d5481ed1900322eb67029478dd474290255c734 (commit)
via 9351cde90f4be04c98a5760e203ba7db40061dfb (commit)
via 77e8cf024d4da039356db1e7e1c318d2bf4a77c2 (commit)
via 3996fa7b47c519cbb7bd9adf3e76af5fd0d7bb24 (commit)
via 781142224cde1df1c7cd08ca45f0d1ac7b763096 (commit)
via f10f88266b7af19205bcd210b060dfd656945e53 (commit)
via dbe1e920d3fd448fe5490442fb98f4a6599b71ac (commit)
via 33d7a28afa927ae190f819ffc98b578dcef4f296 (commit)
via a6da517127aeb4c89c204e3a672831e0069ed4ba (commit)
via 9d48d31130c554ee889d2ab4ff690fe9915af0ea (commit)
via 5af96e0f78d676c202f634e45dff7def31d10c4f (commit)
via 2217f98b7cf1da89ed3e4bcc2cc497fe01df724c (commit)
via 55e5c82ab593c180e0b73f1cd13bbc71ee7a39c6 (commit)
via d15cecacedd58abdafa0b0276a3002af7b266090 (commit)
via cd69768f72493d9ec2f2e8015e6f435e9cff18f4 (commit)
via eb4df0eff2960772522946bc451803a0af8fb87f (commit)
via 84548dcba952e0a32db84ea26d0a3be272e5cec2 (commit)
via 788d6bd724abf2573f699a90d0b7857e01264584 (commit)
via 6d022bd4a40358d08b3ef3f2a5fd6fdde2f1a336 (commit)
via 904b35645cb01de36ff72450decf80c55a80da08 (commit)
via d02f87a2986bd20e513e02ab299a9b66af9ea08f (commit)
via 17821c58ccbeeb719e283e7932064e6ea61d657e (commit)
via 0270b8d3b6a8974fae64340cbfc6228692369d00 (commit)
via 555d0d5898faccaf0d8c4c3c39630a23089b57c2 (commit)
via b49bcfef092b86d875749ce79501aec77d055515 (commit)
via 633f6c150ed26b3a22bdef24bf06fab9273c4eb1 (commit)
via 282aa8ffced619b17be398065ed74b3cf44146d3 (commit)
via 84b4ace746699318e16f5c7a07023dbb3af55efd (commit)
via d8ed9130593d1d83be1674de076f7f2367039d9c (commit)
via 7289214e30083ae6addb9137b0480ea5b68b8d71 (commit)
via b8fae8489f013d55fac6c660e80bbd7aed31deff (commit)
via 09c4417216c32d6af74da193933e95374b0ee7df (commit)
via 8a63c17f79d63bcdb669b74b084b83b65295d246 (commit)
via 692e0572e1a1f96412ac665d090ccb08cd4b9132 (commit)
via 3fa6bf051af4d84d78e6899ea35d18418652b79b (commit)
via cc063de044769e047e53d8afc636a22772af1d0e (commit)
via 10622af4993045afe6d64c15d9f0d7a4bc4a7fc4 (commit)
via 3e78a908f0fb7c904ab478d1c4f8ede4bab3c9ba (commit)
via e261343aac9fab0b737962fe740c9f30b0d8d41b (commit)
via d968df4743a50d6ae283977e438843340597b7ca (commit)
via 8af38d518fe4d3ef9a467b8db15a066c8ef48f9d (commit)
via bfb20c9a7e6cfae9fd841a2be5d63d3337b8ddd8 (commit)
via c8016e0a0c9efa433d9470f4dc5d209ea1553868 (commit)
via d2a51dea68c8f6ba5543e1445c7c219c016b789f (commit)
via a2786c6de70701966f53ec9087b79c9ff1185ce0 (commit)
via daede131e0f936a2cc15d486127854db7eacfdc4 (commit)
via 55ca3c5581de4b794020c8d555f3f472be641b71 (commit)
via d036b9a4d16eb1cda7c992ec54b9b36d7c86402d (commit)
via 0965dfcc15567216315ce73716abc469c0f27f53 (commit)
via d908dad443556a521127fdaea2c1999e12ed1dfe (commit)
via 6c34c8b650c1894a7696fc26de72d25ce94f2b5d (commit)
via 6405f8b53ff0fb1be38018b5ddba50fa9630bb37 (commit)
via b338a40e807dbbb064073d8cc1779a1e7ba8a021 (commit)
via f6b770686f9d7c4f3983a821a86597bd1e88e24e (commit)
via 6069ed645ff0778fd2ec1003a02e55cb2cdbcf04 (commit)
via 6af4da3695c4770e528cfe750da949e3e412658a (commit)
via b0e5e2c7494e43662867d4049c1c8ecb1afecc80 (commit)
via e86371a0aa3c024d3a60af71ab055c9415efb844 (commit)
via 25df10e4d84aee069c795f4d02a73a9fee2da7c8 (commit)
via 6f64bb2bd5aef173874b375676ce4858e9c933c5 (commit)
via 0950e44fafcd74c868ff2d8f105f500bceac5881 (commit)
via efba7b02dda5cd56cee6e1cde718980002605ff1 (commit)
via bbdcc4c92754c04f1b070ccf746727a3f0eacb3f (commit)
via ead0d88c74bd0efba2d2ca0123c51ff2b6cf25fc (commit)
via eefef42abda81e84e42d4a3951684092045886fa (commit)
via 62d3a286c16b97c288af54bfd4b64bffbb5f6090 (commit)
via abdf7194e2a9bc5e2c497e3d4d241c2e8de40ffc (commit)
via a8458630a7aa5209701f224f0d159b604af350f7 (commit)
via 36d1b3e29d89c2af04c50d4f9ae91cb18c391f97 (commit)
via f5320c4bf873c8fe328d0fdc819fa11f05f346ef (commit)
via 33db04fab8ca46168f541bc0d80eb6beced5ef82 (commit)
via 77b0dd40988ca2f19ec73eaf821472fe9adf8268 (commit)
via 38316529df82ae38dbc59344abb67f817986312c (commit)
via e0e66612cc5555ce73d71f486e3f40e0e3414d29 (commit)
via 3c1f7dae0aaefdb0041a1b3e030cbb47132f6672 (commit)
via 3b092a899fda345c95f875012ba7338f2efc6398 (commit)
via e69d6dabc475dfa747d15576f6396e77a7d71c42 (commit)
via 9a36f70e35afc3dcdba34678c3b18d960606aa16 (commit)
via 51aba41fc30f255948574e9e38d4675558258e03 (commit)
via dce2a6362ce5402f7e420f632b0e6f7b60cd5cec (commit)
via 500369d807203c9e56cec6489672a38e8ac7b1b2 (commit)
via 9e686e023f957e29ba32f84d667014a69f196706 (commit)
via db739ee578b8d8134954912e534a9686590f652e (commit)
via c6716d3e22244df153f294b351f67da9312c5053 (commit)
via c14d91fcd01e2fd240334bdf18444ffa6db6b4a9 (commit)
via 27d340959835107941e683a5d6aec64ebca782f2 (commit)
via 80086f3ffb08efd333194c83e542ea55b66a87c9 (commit)
via 56b4be28258f183eceb4664ad75550b849c809c5 (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 (d4e127c0dd802173ef6ef5f3e7c63208e58bca82)
\
N -- N -- N (1ba6863ac4883fac8fe84f136a282ef20e662254)
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 1ba6863ac4883fac8fe84f136a282ef20e662254
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 e4d400d34b0dfc950349c950973952b9121c9752
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 c304159fe80c2f3333ce6cb17fec8bd2fb4b241f
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 ae1b048a9c1f77a54a4099da63b717eae60b9099
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 9ccbe7af97cc53e5cf9d38a44a226b6ef7e17cec
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 2c7c74ded8234e46372a2f44449cc96e34731ed3
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 | 58 +++++---
C4/Breeding.pm | 2 +-
C4/Budgets.pm | 14 +-
C4/Circulation.pm | 69 ++++-----
C4/ILSDI/Services.pm | 30 ++--
C4/Items.pm | 10 +-
C4/Ratings.pm | 91 +++++++-----
C4/Reserves.pm | 116 ++++++++++------
C4/Search.pm | 132 ++++++++++++------
C4/Utils/DataTables/Members.pm | 9 ++
Koha/Schema/Result/Issue.pm | 12 +-
Koha/Schema/Result/Issuingrule.pm | 12 +-
Koha/Schema/Result/OldIssue.pm | 12 +-
about.pl | 1 +
acqui/addorder.pl | 2 +-
acqui/addorderiso2709.pl | 2 +-
admin/aqbudgetperiods.pl | 4 +
admin/checkmarc.pl | 15 ++
admin/smart-rules.pl | 9 +-
catalogue/search.pl | 2 +
circ/circulation.pl | 7 +-
circ/renew.pl | 2 +-
debian/build-git-snapshot | 2 +-
debian/control | 6 +-
debian/control.in | 2 +-
debian/koha-common.cron.daily | 1 +
debian/rules | 51 -------
debian/scripts/koha-translate | 15 +-
.../mysql/de-DE/optional/sample_z3950_servers.sql | 6 +
.../mysql/en/optional/sample_z3950_servers.sql | 6 +
.../mysql/es-ES/optional/sample_z3950_servers.sql | 6 +
installer/data/mysql/kohastructure.sql | 3 +
.../data/mysql/nb-NO/2-Valgfritt/z3950servers.sql | 6 +
installer/data/mysql/sysprefs.sql | 5 +
installer/data/mysql/updatedatabase.pl | 73 +++++++++-
.../prog/en/includes/checkouts-table-footer.inc | 2 +-
.../intranet-tmpl/prog/en/includes/strings.inc | 2 +
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 30 +++-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 13 +-
.../prog/en/modules/acqui/z3950_search.tt | 12 ++
.../prog/en/modules/admin/aqbudgetperiods.tt | 8 ++
.../prog/en/modules/admin/checkmarc.tt | 34 +++++
.../en/modules/admin/preferences/acquisitions.pref | 3 +
.../en/modules/admin/preferences/circulation.pref | 15 +-
.../prog/en/modules/admin/preferences/opac.pref | 5 +-
.../prog/en/modules/admin/smart-rules.tt | 14 ++
.../prog/en/modules/admin/z3950servers.tt | 4 +-
.../prog/en/modules/catalogue/results.tt | 13 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 12 +-
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 24 ++++
.../intranet-tmpl/prog/en/modules/help/about.tt | 3 +-
.../prog/en/modules/help/admin/z3950servers.tt | 53 ++++---
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/members/members-update.tt | 1 +
.../prog/en/modules/members/moremember.tt | 5 +-
.../prog/en/modules/reports/bor_issues_top.tt | 42 +++++-
.../en/modules/reports/guided_reports_start.tt | 2 +
.../prog/en/modules/reports/reports-home.tt | 2 +-
.../prog/en/modules/reserve/request.tt | 2 +-
.../prog/en/modules/virtualshelves/shelves.tt | 2 +-
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 21 ++-
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
.../opac-tmpl/bootstrap/en/modules/errors/404.tt | 22 ++-
koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 2 +-
.../bootstrap/en/modules/opac-advsearch.tt | 18 +--
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 10 +-
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 16 +--
.../bootstrap/en/modules/opac-results-grouped.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 3 +
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 18 ++-
koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 24 ++++
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 12 +-
.../prog/en/modules/opac-results-grouped.tt | 6 +-
.../opac-tmpl/prog/en/modules/opac-results.tt | 4 +-
kohaversion.pl | 2 +-
misc/cronjobs/automatic_renewals.pl | 60 ++++++++
misc/cronjobs/crontab.example | 3 +
opac/opac-search.pl | 20 +++
opac/opac-sendshelf.pl | 4 -
opac/opac-user.pl | 6 +-
reports/bor_issues_top.pl | 2 +-
svc/checkouts | 2 +
svc/members/search | 14 +-
t/db_dependent/Acquisition.t | 47 +------
t/db_dependent/Acquisition/CancelReceipt.t | 30 ++--
.../Acquisition/GetBasketsInfosByBookseller.t | 4 +-
.../Acquisition/GetOrdersByBiblionumber.t | 6 +-
t/db_dependent/Acquisition/Invoices.t | 6 +-
t/db_dependent/Acquisition/NewOrder.t | 86 ++++++++++++
t/db_dependent/Acquisition/OrderFromSubscription.t | 2 +-
t/db_dependent/Acquisition/TransferOrder.t | 2 +-
t/db_dependent/Acquisition/close_reopen_basket.t | 4 +-
t/db_dependent/Bookseller.t | 35 +++--
t/db_dependent/Breeding.t | 15 +-
t/db_dependent/Budgets.t | 10 +-
t/db_dependent/Circulation.t | 42 +++++-
t/db_dependent/Circulation_Issuingrule.t | 9 +-
t/db_dependent/Holds.t | 50 ++++++-
t/db_dependent/Letters.t | 2 +-
t/db_dependent/Ratings.t | 146 ++++++++++++--------
t/db_dependent/Reserves.t | 23 ++-
t/db_dependent/Search.t | 80 ++++++++++-
t/{ => db_dependent}/Templates.t | 2 +-
t/db_dependent/Utils/Datatables_Members.t | 53 +++++--
tools/import_borrowers.pl | 3 +
107 files changed, 1478 insertions(+), 560 deletions(-)
create mode 100644 misc/cronjobs/automatic_renewals.pl
create mode 100644 t/db_dependent/Acquisition/NewOrder.t
rename t/{ => db_dependent}/Templates.t (97%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list