http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623
Mason James <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |[email protected] --- Comment #8 from Mason James <[email protected]> --- (In reply to comment #7) > Created attachment 11582 [details] > Bug 8623: Move YUI out of prog > > This patch moves the YUI assets from koha-tmpl/opac-tmpl/prog/en/lib/yui > to koha-tmpl/opac-tmpl/lib/yui. > > NOTE: This was tested on Chrome, FF, and Safari on a Mac, and IE and FF > on Windows. > > To test: > 1) View a smattering of pages on the OPAC and intranet. If the move > did not work flawlessly, layout will be way off. > > Signed-off-by: Kyle M Hall <[email protected]> QA comments patch wont apply against master '322a9c7fbbcf456084d1937f48345b3cdec058ce' please resend a patch that applies against master ------------------------------------------- mason@xen1:~/git/head-clean$ gl |head -1 commit 322a9c7fbbcf456084d1937f48345b3cdec058ce mason@xen1:~/git/head-clean$ git bz apply 8623 Bug 8623 - Javascript libraries should be outside theme directories Bug 8623: Do not accept "lib" as a valid theme Apply? [yn] y Applying: Bug 8623: Do not accept "lib" as a valid theme Bug 8623: Move YUI out of prog Apply? [yn] y Applying: Bug 8623: Move YUI out of prog fatal: sha1 information is lacking or useless (C4/Templates.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8623: Move YUI out of prog 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/Bug-8623-Move-YUI-out-of-prog-DVU7vK.patch ------------------------------------------- -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
