http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7647 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff Assignee|kyle.m.hall@gmail.com |srdjan@catalyst.net.nz --- Comment #1 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 8023 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8023&action=edit patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7647 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |5345 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7647 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7647 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #5 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- (In reply to comment #4)

nengard@kohavm:~/kohaclone$ git bz apply 7647 Bug 7647 - Checkout History Sort

patch Apply? [yn] y

Applying: bug_7647: Table sorter on issue history error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt:1 error: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt: patch does not apply Patch failed at 0001 bug_7647: Table sorter on issue history When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Patch left in /tmp/patch-v09mXq.patch nengard@kohavm:~/kohaclone$

Don't forget to try git am -3. The patch actually applies fine with three-way merge. If you look at the last few lines, it actually gives you a hint of what to do next. You run the following two commands: git am --abort git am -3iu /tmp/patch-v09mXq.patch There's also a patched version of git-bz that takes care of that for you which you could download (I don't recall exactly wherefrom). -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7647 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off CC| |kyle.m.hall@gmail.com -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7647 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |paul.poulain@biblibre.com Version|master |rel_3_8 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7647 Bug 7647 depends on bug 5345, which changed state. Bug 5345 Summary: DataTables in Koha http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5345 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.