Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman.
Created attachment 35168 [details] [review] Bug 13575 - Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman
Hello Brandon, See bug 7143, it is the bug report to submit history changes.
I tried to apply this patch and got the following: Applying: Bug 13575 - Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging docs/history.txt CONFLICT (content): Merge conflict in docs/history.txt Failed to merge in the changes. Patch failed at 0001 Bug 13575 - Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-13575---Names-do-not-appear-in-the-Koha-histor-aJO7vj.patch koha@koha-vm:~/kohaclone$ Maybe you should add it to the official bug instead: bug 7143
Created attachment 36429 [details] [review] Bug 13575 - Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman
One from one of the Academy students, fixed the conflict, can we just punch this one through, unless you really need me to shift the patch?
Created attachment 36443 [details] [review] Bug 13575 - Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman
Created attachment 36447 [details] [review] Bug 13575 - Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman Signed-off-by: Nicole <nicole@bywatersolutions.com>
Created attachment 36495 [details] [review] [PASSED QA] Bug 13575 - Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman Signed-off-by: Nicole <nicole@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch pushed to master. Thanks Brandon!