[koha-commits] main Koha release repository branch master updated. v3.04.00-729-g1ffdbfa
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 17 22:47:16 CEST 2011
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, master has been updated
via 1ffdbfa5e9c3f4d63244f0897ac9b8f5eb1177d2 (commit)
via f2794f79342e48bc433f0d56ea8baf5ef0bba526 (commit)
via 8f75c19afdcbb7e5f266fe21eb7bec4d24e56e96 (commit)
via bc33391fc5491e0acbc9431d3a6b24c4f357ff79 (commit)
via 0fe43ac28b2a171ac07f82c38347e1b10a0a9fd2 (commit)
from 5938eb306acc2668b00178d88f319ad18c93e775 (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 1ffdbfa5e9c3f4d63244f0897ac9b8f5eb1177d2
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Oct 18 09:46:45 2011 +1300
Bumping database version
commit f2794f79342e48bc433f0d56ea8baf5ef0bba526
Merge: 8f75c19 bc33391
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Oct 18 09:45:39 2011 +1300
Merge remote-tracking branch 'kc/new/bug_6390' into kcmaster
commit 8f75c19afdcbb7e5f266fe21eb7bec4d24e56e96
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Aug 5 10:13:20 2011 +0200
Bug 6390: Implement 'see mine/my branches/all baskets'-syspref
Code written by Edgar Fuß <ef at math.uni-bonn.de>,
Mathematisches Institut der Uniersität Bonn
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
- rebased on current master, fixed a conflict in booksellers.pl
- reworked permission checks to account for general acq permissions and
superlibrarian permission
- rephrased text of system preference (Thx to Jared Camins-Esakov)
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
acqui/booksellers.pl | 28 ++++++++++++++-----
admin/systempreferences.pl | 1 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +++++
.../en/modules/admin/preferences/acquisitions.pref | 7 +++++
kohaversion.pl | 2 +-
6 files changed, 37 insertions(+), 9 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list