[koha-commits] main Koha release repository branch, master, updated. v3.02.00-alpha2-207-gac5047b

[Git repo owner]

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  ac5047b8872768168db3182eca2a1a4fb7de2d5e (commit)
       via  b3feb54ee073b99565a4e25fd397ff6ed5a0dc78 (commit)
      from  9f806f2611f7f91021e776d246da960b5c2450e5 (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 ac5047b8872768168db3182eca2a1a4fb7de2d5e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Jun 16 16:42:14 2010 +1200

    Follow up patch, removing missed conflict marker
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit b3feb54ee073b99565a4e25fd397ff6ed5a0dc78
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Jun 16 16:38:31 2010 +1200

    Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module
    
    Signed-off-by: Henri-Damien LAURENT <henridamien.laurent at 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 at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 .../data/mysql/en/mandatory/userpermissions.sql    |    8 +++
 .../mysql/fr-FR/1-Obligatoire/userpermissions.sql  |    8 +++
 installer/data/mysql/updatedatabase.pl             |   18 ++++++
 .../intranet-tmpl/prog/en/includes/mainmenu.inc    |    4 ++
 .../prog/en/includes/serials-menu.inc              |   15 ++++-
 .../prog/en/includes/serials-toolbar.inc           |   56 ++++++++++++++------
 .../prog/en/modules/serials/serials-home.tmpl      |    2 +-
 .../prog/en/modules/serials/subscription-add.tmpl  |   11 +++-
 kohaversion.pl                                     |    2 +-
 serials/acqui-search-result.pl                     |    2 +-
 serials/acqui-search.pl                            |    2 +-
 serials/checkexpiration.pl                         |    2 +-
 serials/claims.pl                                  |    2 +-
 serials/member-search.pl                           |    4 +-
 serials/routing-preview.pl                         |    4 +-
 serials/routing.pl                                 |    2 +-
 serials/serial-issues.pl                           |    2 +-
 serials/serials-collection.pl                      |    2 +-
 serials/serials-edit.pl                            |   13 +++--
 serials/serials-home.pl                            |    2 +-
 serials/statecollection.pl                         |    2 +-
 serials/subscription-add.pl                        |    8 +++-
 serials/subscription-bib-search.pl                 |   17 +++++--
 serials/subscription-detail.pl                     |   22 +++++++-
 serials/subscription-renew.pl                      |    2 +-
 serials/viewalerts.pl                              |    2 +-
 26 files changed, 165 insertions(+), 49 deletions(-)


hooks/post-receive
-- 
main Koha release repository