[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.06-20-ge5c0783

[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, 3.14.x has been updated
       via  e5c0783d20de75ca6f3599b2061ba64216b45c59 (commit)
       via  849f178cd804bd6e54f2c02deb9d7b9837f255e4 (commit)
       via  e25da1fa432ea43cede897b5b8c5adc485fa6da6 (commit)
      from  1de3d85574568b8eef769dc5d16af879b920b65f (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 e5c0783d20de75ca6f3599b2061ba64216b45c59
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri May 16 12:36:16 2014 +0200

    Bug 11415: DBRev 3.14.06.001

commit 849f178cd804bd6e54f2c02deb9d7b9837f255e4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Jan 10 09:15:25 2014 -0500

    Bug 11415 (QA Followup) fix whitespace
    
    This patch also fixes a JavaScript syntax error if the
    SelfCheckReceiptPrompt system preference is off.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 6254f5f07ab84ef7d6b6518d8f39bde9987a92e4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e25da1fa432ea43cede897b5b8c5adc485fa6da6
Author: JaTara Barnes <jendayi30 at gmail.com>
Date:   Sun Jan 5 00:33:31 2014 -0600

    Bug 11415: Add syspref to toggle SCO receipt printing
    
    This patch adds the SelfCheckReceiptPrompt to control
    whether receipts are automatically printed when a patron
    finishes a SCO session.  This is on by default during
    new installations and upgrades.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 9cc3b69a0cf1adfc7c50c25ef6d57c2e027e8950)
    
    Conflicts:
    	installer/data/mysql/updatedatabase.pl

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

Summary of changes:
 installer/data/mysql/sysprefs.sql                            |    1 +
 installer/data/mysql/updatedatabase.pl                       |    7 +++++++
 .../prog/en/modules/admin/preferences/circulation.pref       |    7 +++++++
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt     |   10 +++++++---
 koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt          |    9 ++++++---
 kohaversion.pl                                               |    2 +-
 6 files changed, 29 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository