[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-77-gf729aa5
Git repo owner
gitmaster at git.koha-community.org
Thu May 9 21:26:43 CEST 2013
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.10.x has been updated
via f729aa573775269ba88e903ca23ed985cc102a2f (commit)
via b9b573badc1e2652021a88a4f35d677090e6c367 (commit)
via 8f95f166b4b0f8591222403933e09aa38a459622 (commit)
via 6f9b6a0c8e3518e57467de4dc6f4d36472e6f557 (commit)
via db418b2011ce6091c79129e47c8dc354de45474b (commit)
via c4c8642a69cfa6629d87503714ca65f1a5cfd1ee (commit)
via 9110f1c1ff3ce0f363a34be0cb8b9ed474fa1ba7 (commit)
via 5d450fe315e1ab1e406abcf4c6ac4c0c6f097964 (commit)
via 4af1b0835e46aa0a904c3061eee5d44df1ca4cad (commit)
via 53d05eac9893ee6b9e70087529f427582275d2e6 (commit)
via eeca0831442fa47ba5447f1cdc8a7298becad3aa (commit)
from 60465fc463618be1bb07e948ab79aaee71e14e9c (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 f729aa573775269ba88e903ca23ed985cc102a2f
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Apr 29 12:29:40 2013 -0300
Bug 10150 - koha-email-disable error handling
koha-email-disable now
- Checks the instance exists.
- Checks if email is already disabled.
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 31b43ac1fe6830426c80988b93bc15d0fa88e79a)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 72961866afc155327dee10d1a2c4dfbac9075159)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit b9b573badc1e2652021a88a4f35d677090e6c367
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Apr 26 13:59:18 2013 +0200
Bug 10044: Remove duplicate pagination on the pending orders page.
Test plan:
Check that there is just one pagination on the pending orders page.
Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works and deletes the old pagination that was replaced by
datatables.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 7b0b6e32d1462fab10257769c417f014b0819135)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit e61c1e0810528cdaf1db99a4ec70bd96e607021a)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 8f95f166b4b0f8591222403933e09aa38a459622
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 5 13:49:11 2013 +0100
Bug 9250 - Followup to add koha-*-sip commands to koha-common.xml
The original patch for Bug 9250 did not add the new commands to
debian/docs/koha-common.xml, which functions as a sort of table
of contents for the real commands. This patch adds them.
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Simple documentation patch
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 38b1fd99c4e3a2ae3a944c5ba0b17189da3feef5)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit cdfca5bb6b6a25619216e579f2cdf5bdaa14f990)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 6f9b6a0c8e3518e57467de4dc6f4d36472e6f557
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Mon Dec 10 18:57:04 2012 +1300
Bug 9250 - [SIGNED-OFF] provide commands to manage the SIP server
This adds commands required to control the SIP server. These commands
are:
* koha-enable-sip - copies the SIP config to the sites directory
* koha-start-sip - starts the SIP server processes
* koha-stop-sip - stops the SIP server processes
It also calls these as appropriate from the koha-common init script.
To use:
1) sudo koha-enable-sip instancename
2) sudo vim /etc/koha/sites/instancename/SIPconfig.xml
Do whatever is needed for your site's SIP configuration
3) sudo koha-start-sip instancename
To test:
1) Build packages with this patch
2) Ensure that sudo koha-start-sip instancename doesn't do anything
3) Run sudo koha-enable-sip instancename
4) Edit /etc/koha/sites/instancename/SIPconfig.xml if needed (probably
not required for testing)
5) Run sudo koha-start-sip instancename
6) Note that the sip processes are now running
7) Run sudo koha-stop-sip instancename
8) Note that the sip processes have gone
9) Reboot your Koha server
10) Note that the sip processes are back
Sponsored-By: Waitaki District Council Libraries
Sponsored-By: South Taranaki District Council Libraries
Sponsored-By: Horowhenua District Council Libraries
Sponsored-By: Rangitikei District Council Libraries
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Works as advertised. koha-start-sip without a prior koha-enable-sip
does nothing. koha-enable-sip copies the SIP config file to the
instance directory. After koha-enable-sip, koha-start-sip and
koha-stop-sip works as expected. After a reboot, the SIP processes are
still running. I have not actually tested the SIP servers after they
have been started, but assume they work the same as always.
The man pages look good.
The new commands should also have been added to the man page for
koha-common. I'll do a followup for that.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 3dc22e7fb27162b3a461477bc40f5c38a1739516)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit c70fb0fcd625701d0f3d01f0c8faa17468bba54c)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit db418b2011ce6091c79129e47c8dc354de45474b
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sat Apr 13 21:10:33 2013 -0300
Bug 10041 - Provide a koha-translate script to aid package users on installing translations
Until we have solved the packaging of koha template translations, provide a command that manages the installed translations in a proper way.
To test, build a Debian package of current master+the patches from this bug :-D and try the many options running koha-translate --help provide.
The command itself can be grabbed from a git checkout with this patch applied to test the script's funcionality. If it (and its docs) fits the package building stuff, I'll test on monday when I can be back on my workstation.
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: Good adition. Work as described. No errors.
Copied to /usr/local/bin. No errors on install, update, remove, list and check.
Passed-QA-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 2cd5afa9741ef432a9f3ecac939c98e20d5ebfc5)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit cb321e5b10fc944d65d5b274e97e3506bd034396)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit c4c8642a69cfa6629d87503714ca65f1a5cfd1ee
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Apr 29 15:18:17 2013 -0300
Bug 10101 - Follwup: fix param check
As Mason noted, there was an error on that line.
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 7d09198659c92eda7046dee0f93e4caf2ec37096)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit a4a270be68b7047ec6359847c1a462b7a82f6b67)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 9110f1c1ff3ce0f363a34be0cb8b9ed474fa1ba7
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Apr 23 11:03:44 2013 -0300
Bug 10101 - make koha-enable more robust
koha-enable now:
- checks for the existence of the instance before any other action on it.
- checks if the instance is already enabled before changing stuff in the config files.
- only reloads apache if it is needed!
- handles more than one instance name as parameter (the code was there, a check for the cardinality of the args prevented it from working).
- documents this behaviour change in the docs
- doesn't break if the provided (invalid) instance name is a prefix/suffix of a real one (added -x to the relevant grep command).
To test:
- Aplpy the patch, build your packages
- Run koha-enable on
- Non existent instance (try using a prefix or a suffix of an already created one too).
- Already enabled existent instance name.
- Disabled instance.
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 3bca90eb0c0fc91f64f3e479ac6ab25e54d4f1aa)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 97bf5b40c9da1ba4bca114185fb0770edfaf65f1)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 5d450fe315e1ab1e406abcf4c6ac4c0c6f097964
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Apr 29 15:22:09 2013 -0300
Bug 10104 - Followup: fix param check
As noted by Mason on bug 10101, the check was not working for zero arguments.
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit ca118d57db383f5efebc4d53cba11ccc8af5c9a9)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 605d0a99b7d0fa91ed321c72c27111b1af7ceef4)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 4af1b0835e46aa0a904c3061eee5d44df1ca4cad
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Apr 23 13:29:02 2013 -0300
Bug 10104 - make koha-disable more robust
koha-disable now:
- checks for the existence of the instance before any actions on it.
- checks if the instance is already disabled before touching anything (warns otherwise)
- only reloads apache if needed
- handles more than one instance name.
- changed the docs to acknowledge the previous item.
To test:
- Apply the patch, build your package
- Run koha-disable on
- Non existent instance (try names that are prefix and suffix of a valid one too please)
- Already disabled instance name.
- Enabled instance name.
It should work as expected and warn the user on the expected wrong cases.
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit b055f7d86c7772cf52c4a20d04a7e1cb0c8c19c9)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 3f03c2699062d399f3f7392acfd3e32b50cdf81a)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 53d05eac9893ee6b9e70087529f427582275d2e6
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Apr 29 10:30:08 2013 -0300
Bug 10144 - koha-start-zebra error handling
koha-start-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 98bde26d2571b43ecee07e017e36f45e1aa6e680)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 6f40e7ebd667fbaf850046b8b4c3246e2dd3e170)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit eeca0831442fa47ba5447f1cdc8a7298becad3aa
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Apr 29 11:54:27 2013 -0300
Bug 10149 - koha-restart-zebra error handling (rewording)
koha-restart-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.
Regards
To+
Edit:
- changed some wording problems.
- fixed an error in parameter validation
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit cee6909c8a5c10cc534a1ebe35ec5b8cda522eab)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 6ee0d799bb9e1f08625503a1e5b4505791985d3d)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
acqui/parcel.pl | 40 +---
debian/docs/koha-common.xml | 26 ++
debian/docs/koha-disable.xml | 6 +-
debian/docs/koha-email-disable.xml | 4 +-
debian/docs/koha-enable-sip.xml | 57 +++++
debian/docs/koha-enable.xml | 6 +-
debian/docs/koha-start-sip.xml | 53 ++++
debian/docs/koha-stop-sip.xml | 52 ++++
debian/docs/koha-translate.xml | 79 ++++++
debian/koha-common.init | 4 +
debian/koha-common.install | 4 +
debian/scripts/koha-disable | 82 ++++++-
debian/scripts/koha-email-disable | 81 ++++++-
debian/scripts/koha-enable | 80 ++++++-
debian/scripts/koha-enable-sip | 38 +++
debian/scripts/koha-restart-zebra | 158 +++++++++++--
debian/scripts/koha-start-sip | 49 ++++
debian/scripts/koha-start-zebra | 126 +++++++++--
debian/scripts/koha-stop-sip | 52 ++++
debian/scripts/koha-translate | 256 ++++++++++++++++++++
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 19 +--
21 files changed, 1154 insertions(+), 118 deletions(-)
create mode 100644 debian/docs/koha-enable-sip.xml
create mode 100644 debian/docs/koha-start-sip.xml
create mode 100644 debian/docs/koha-stop-sip.xml
create mode 100644 debian/docs/koha-translate.xml
create mode 100755 debian/scripts/koha-enable-sip
create mode 100755 debian/scripts/koha-start-sip
create mode 100755 debian/scripts/koha-stop-sip
create mode 100755 debian/scripts/koha-translate
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list