[Koha-bugs] [Bug 15883] Upgrade jQuery from v1.7.2 in the staff client

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15883

Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bgkriegel at gmail.com
             Status|Needs Signoff               |Failed QA

--- Comment #7 from Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> ---
There is a small conflict

Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
Failed to merge in the changes.

Solving that we got: 
Software error:
Template process failed: file error - searchbox-keep-text.inc: not found at
/home/bgkriegel/kohaclone/C4/Templates.pm line 119

Where is 'searchbox-keep-text.inc'?

BTW, have you an agreement on file names, i.e. jquery-ver vs. old/older?

-- 
You are receiving this mail because:
You are watching all bug changes.