[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.17-8-g27217f2

[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.22.x has been updated
       via  27217f2b3409100f3198d70fd701252637137264 (commit)
       via  fb8f062d83539dcc67bbc753de5e4b332fb960d0 (commit)
      from  96c08a967ed4415717c075b49bf9db314229f28e (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 27217f2b3409100f3198d70fd701252637137264
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Mon Jan 23 22:32:39 2017 +0000

    Bug 17947: Searching my library first shows the branchcode by the search bar rather than branchname
    
    Test Plan
    1: Turn on SearchMyLibraryFirst and go into OPAC
    2: It should say Search (in <Branch Code> Only)
    3: Apply patch and refresh page. It should now say Search (in <Library Name> only)
    
    Sponsored-by: Catalyst IT
    
    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>
    (cherry picked from commit e8420b5d80558a8a74f7f6a1421352dcad2c9c88)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    (cherry picked from commit 0b1311ccb9f0b0a67ae94f0304ac0bd4f31a7485)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit fb8f062d83539dcc67bbc753de5e4b332fb960d0
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Fri Jan 13 00:19:48 2017 +0000

    Bug 17895: 'Re-set' typo fix
    
    To test:
    1) Log into OPAC and go to change your password
    2) Enter current password incorrectly and click Submit changes
    3) Observe error message and typo 're-set'
    4) Apply patch and refresh page
    5) May be asked to resend data - if so, click Resend, if not, repeat
    step 2
    6) Observe error message and corrected spelling of 'reset'
    
    Sponsored-by: Catalyst IT
    Signed-off-by: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
    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>
    (cherry picked from commit 86ec263b2d0994ecb53ff283ef246b529d4570e2)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    (cherry picked from commit 56938d7630ae4f90b3bcf650bbce3a6c5ad2c81e)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc  |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository