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, 18.11.x has been updated
       via  5dddc0e9a730b15a0a952ee4adf09a9bce4bd76b (commit)
       via  a4a3b44e84894bfb2903be80e78fa3dd1a105263 (commit)
      from  0c4881833bfa20421c62bbe74d738a84ac4e842e (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 5dddc0e9a730b15a0a952ee4adf09a9bce4bd76b
Author: Martin Renvoize <martin.renvo...@ptfs-europe.com>
Date:   Mon Jul 15 13:55:36 2019 +0100

    Bug 23192: (RM follow-up) Add missing filters to waiting_holds.inc
    
    Added a missing `html` filter to the 'tab' input which was added as part
    of bug 23192
    
    Signed-off-by: Martin Renvoize <martin.renvo...@ptfs-europe.com>
    (cherry picked from commit d4d02fbe292ab36bb966300eb0c078c3467496e5)
    Signed-off-by: Fridolin Somers <fridolin.som...@biblibre.com>
    (cherry picked from commit 1923fd376f778b9a7bbab65a7b92914522cbd3e9)
    
    Signed-off-by: Lucas Gass <lu...@bywatersolutions.com>

commit a4a3b44e84894bfb2903be80e78fa3dd1a105263
Author: Nick Clemens <n...@bywatersolutions.com>
Date:   Mon Jun 24 11:54:56 2019 +0000

    Bug 23192: Correct tab input on waiting_holds.inc
    
    To test:
     1 - Place 2 holds
     2 - Confirm the holds
     3 - In the db change the expiration date:
    UPDATE reserves SET expirationdate = '2019-01-01';
     4 - Go to Home->Circulation->Holds awaiting pickup
     5 - View your holds on the 'Holds waiting over' tab
     6 - Inspect the cancel button for one of the holds, note tab = 
"holdswaiting"
     7 - Apply patch
     8 - Refresh the page
     9 - Inspect the buttton, note tab = "holdsover"
    10 - Cancel the hold
    11 - Note you return to the holds over tab
    
    Signed-off-by: Maryse Simard <maryse.sim...@inlibro.com>
    Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
    Signed-off-by: Martin Renvoize <martin.renvo...@ptfs-europe.com>
    (cherry picked from commit f45516e73ab6ac8c2240f206bd11a88e4935359c)
    Signed-off-by: Fridolin Somers <fridolin.som...@biblibre.com>
    (cherry picked from commit d673e0387e040170830b57cba0db9ce3aa8c67b0)
    
    Signed-off-by: Lucas Gass <lu...@bywatersolutions.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc  |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt   |   11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository
_______________________________________________
koha-commits mailing list
koha-commits@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits

Reply via email to