[koha-commits] main Koha release repository branch master updated. v3.22.00-686-g4489270

[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  4489270c5157c40ab0c2b9947ab5a4b9b0b9a57a (commit)
       via  e06aa3249692667074a4d7110920cbe9b232dd64 (commit)
       via  62860d53ae9653daa07943786bb07482ea9f0bb0 (commit)
      from  3a3b0472245153c515b09a3c2c69f3e4cea80121 (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 4489270c5157c40ab0c2b9947ab5a4b9b0b9a57a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Feb 26 14:21:16 2016 +0000

    Bug 15311 [QA Followup] - Remove use of .raw method as it's use was reverted
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit e06aa3249692667074a4d7110920cbe9b232dd64
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Feb 26 14:20:39 2016 +0000

    Bug 15311 - DBRev 3.23.00.030
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 62860d53ae9653daa07943786bb07482ea9f0bb0
Author: Barry Cannon <bc at interleaf.ie>
Date:   Wed Dec 16 10:37:17 2015 +0000

    Bug 15311 - Let libraries set text to display when OpacMaintenance = on
    
    Added new systempreference OpacMaintenanceNotice.
    When OpacMaintenance is ON the HTML contents of OpacMaintenanceNotice will
    be displayed.
    Enabling OpacMaintenance is all that is required to enable this preference.
    If OpacMaintenanceNotice is undefined, the default (original) notice will
    appear when OpacMaintenance is enabled.
    
    To test:
    - Enable OpacMaintenance systempreference
    - Observe the default maintenance message when OPAC is viewed
    - Edit OpacMaintenanceNotice systempreference, adding custom HTML
    - Observe the custom HTML appear on the opac
    - Remove OpacMaintenanceNotice (mindful of orphaned spaces etc.)
    - Observe the default opac notice appears in the opac
    - Disable OpacMaintenance
    - Observce opac is back online
    
    Moving code to atomic update and fixing merge conflict
    
    NOTE: Accounted for an SQL typo and autoescaping of the template.
          If someone else could test this, then I would be fine with
          marking it signed off.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 Koha.pm                                                     |    2 +-
 .../Bug_15311-OpacMaintenanceNotice_syspref.sql             |    1 +
 installer/data/mysql/sysprefs.sql                           |    1 +
 installer/data/mysql/updatedatabase.pl                      |   11 +++++++++++
 .../prog/en/modules/admin/preferences/opac.pref             |    6 ++++++
 koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt     |    9 +++++++--
 6 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/Bug_15311-OpacMaintenanceNotice_syspref.sql


hooks/post-receive
-- 
main Koha release repository