]> git.koha-community.org Git - koha.git/commit
Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the...
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 16 Jun 2010 04:38:31 +0000 (16:38 +1200)
committerGalen Charlton <gmcharlt@gmail.com>
Sat, 19 Jun 2010 11:23:46 +0000 (07:23 -0400)
commitb3feb54ee073b99565a4e25fd397ff6ed5a0dc78
treee3e97982ca4af73931cae883571d6aa7d00279a0
parent9f806f2611f7f91021e776d246da960b5c2450e5
Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Conflicts:

installer/data/mysql/en/mandatory/userpermissions.sql
installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
installer/data/mysql/updatedatabase30.pl
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
serials/member-search.pl
serials/serials-edit.pl
serials/subscription-add.pl
serials/subscription-bib-search.pl
serials/subscription-detail.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
27 files changed:
installer/data/mysql/en/mandatory/userpermissions.sql
installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
kohaversion.pl
serials/acqui-search-result.pl
serials/acqui-search.pl
serials/checkexpiration.pl
serials/claims.pl
serials/member-search.pl
serials/routing-preview.pl
serials/routing.pl
serials/serial-issues.pl
serials/serials-collection.pl
serials/serials-edit.pl
serials/serials-home.pl
serials/statecollection.pl
serials/subscription-add.pl
serials/subscription-bib-search.pl
serials/subscription-detail.pl
serials/subscription-renew.pl
serials/viewalerts.pl