[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-511-g7ad69f5

[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  7ad69f58e853a36b81e4b392d2904e09d23f3563 (commit)
       via  24f5525207c11401626f363faff90fa9436c1003 (commit)
       via  b1a52b29181137791784fe20313efe8bce98b1fa (commit)
       via  34d5b7de89dc394c0c71652678f5d7b7fa793e35 (commit)
       via  db0fa0eacda5a448d9406a03fc92cdaff393ea52 (commit)
       via  6587b92434512c60206044746385dbe0123993a7 (commit)
       via  218194fab0398e433651d5ba26634d79c63442f5 (commit)
       via  a935e1b1e9cba96c7e47835e11aeb665c747dbd6 (commit)
       via  b36d3bc796fd1b0a4db32729c994287425f10326 (commit)
       via  5ab2f838648da5a8b60c6bd4c971da25a6cd9656 (commit)
       via  e7571a1a1c3054b738f4fd9f37c45750143544c5 (commit)
       via  8a817147211e2543e1cf9507e344394ad6fed41a (commit)
       via  d0f93e67726ed242e1124d36ed00d1a4a3645701 (commit)
       via  b81b89b672fb699981e9d3a1fa562e719bdc6e9a (commit)
       via  8aa2bb150ae384d4195bdcf178e82f495ede6a1b (commit)
       via  029c4b334de1d5c0727ee840a91f114072c52995 (commit)
       via  5918b7c97e3bdaa73130059024a421cb95ed4181 (commit)
       via  51a1e8854830d72e42dbfe313a5082ccd5f48688 (commit)
      from  a63695e15f755b90cf8f06e25bc79cdb7c45989c (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 7ad69f58e853a36b81e4b392d2904e09d23f3563
Merge: 34d5b7d 24f5525
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Sun May 12 10:30:57 2013 -0400

    Merge branch 'bug_7593' into 3.14-master

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

Summary of changes:
 C4/Acquisition.pm                                  |   37 ++++-
 cataloguing/merge.pl                               |   12 ++
 installer/data/mysql/sysprefs.sql                  |    8 +-
 .../prog/en/modules/cataloguing/additem.tt         |   20 ++-
 .../prog/en/modules/circ/selectbranchprinter.tt    |    2 +-
 koha-tmpl/opac-tmpl/ccsr/en/css/colors.css         |    5 +
 koha-tmpl/opac-tmpl/ccsr/en/js/basket.js           |   10 +
 koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt   |   26 ---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt |    2 +-
 .../opac-tmpl/prog/en/modules/opac-downloadcart.tt |    2 +-
 .../prog/en/modules/opac-downloadshelf.tt          |    2 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |    4 +-
 .../prog/en/modules/opac-sendbasketform.tt         |    2 +-
 .../prog/en/modules/opac-sendshelfform.tt          |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    2 +-
 .../opac-tmpl/prog/en/modules/opac-userdetails.tt  |   87 ---------
 .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |  195 --------------------
 opac/opac-detail.pl                                |    5 +-
 opac/opac-patron-image.pl                          |   25 +--
 opac/opac-userdetails.pl                           |   56 ------
 opac/opac-userupdate.pl                            |  188 -------------------
 t/db_dependent/Acquisition.t                       |   19 ++-
 22 files changed, 123 insertions(+), 588 deletions(-)
 delete mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt
 delete mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
 delete mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
 delete mode 100755 opac/opac-userdetails.pl
 delete mode 100755 opac/opac-userupdate.pl


hooks/post-receive
-- 
main Koha release repository