[Koha-bugs] [Bug 12460] Search history: Combine to start a new search
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Thu Jan 17 04:31:27 CET 2019
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12460
Aleisha Amohia <aleisha at catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Failed QA |Patch doesn't apply
--- Comment #35 from Aleisha Amohia <aleisha at catalyst.net.nz> ---
Patches need rebasing!
$ git bz apply 12460
Bug 12460 - Search history: Combine to start a new search
78648 - Bug 12460: Allow to start a new search from multiple search history
lines
78649 - Bug 12460: Simplify interface to combine queries
78650 - Bug 12460: Fix query combination for anonymous users
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 12460: Allow to start a new search from multiple search history
lines
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
Failed to merge in the changes.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list